Title: [130960] trunk/Source/WebCore
- Revision
- 130960
- Author
- rwlb...@webkit.org
- Date
- 2012-10-10 14:20:39 -0700 (Wed, 10 Oct 2012)
Log Message
[BlackBerry] Adapt to new image for search-cancel
https://bugs.webkit.org/show_bug.cgi?id=98954
Reviewed by Antonio Gomes.
The new image for search-cancel is bigger than the old one, so invert the scaling.
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::RenderThemeBlackBerry::adjustSearchFieldCancelButtonStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (130959 => 130960)
--- trunk/Source/WebCore/ChangeLog 2012-10-10 21:18:37 UTC (rev 130959)
+++ trunk/Source/WebCore/ChangeLog 2012-10-10 21:20:39 UTC (rev 130960)
@@ -1,3 +1,15 @@
+2012-10-10 Rob Buis <rb...@rim.com>
+
+ [BlackBerry] Adapt to new image for search-cancel
+ https://bugs.webkit.org/show_bug.cgi?id=98954
+
+ Reviewed by Antonio Gomes.
+
+ The new image for search-cancel is bigger than the old one, so invert the scaling.
+
+ * platform/blackberry/RenderThemeBlackBerry.cpp:
+ (WebCore::RenderThemeBlackBerry::adjustSearchFieldCancelButtonStyle):
+
2012-10-10 Tony Chang <t...@chromium.org>
Unreviewed, another speculative fix for Qt Win.
Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (130959 => 130960)
--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-10-10 21:18:37 UTC (rev 130959)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2012-10-10 21:20:39 UTC (rev 130960)
@@ -314,14 +314,13 @@
void RenderThemeBlackBerry::adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle* style, Element*) const
{
- static const float defaultControlFontPixelSize = 13;
- static const float defaultCancelButtonSize = 9;
+ static const float defaultControlFontPixelSize = 10;
+ static const float defaultCancelButtonSize = 13;
static const float minCancelButtonSize = 5;
- static const float maxCancelButtonSize = 21;
// Scale the button size based on the font size
float fontScale = style->fontSize() / defaultControlFontPixelSize;
- int cancelButtonSize = lroundf(std::min(std::max(minCancelButtonSize, defaultCancelButtonSize * fontScale), maxCancelButtonSize));
+ int cancelButtonSize = lroundf(std::max(minCancelButtonSize, defaultCancelButtonSize * fontScale));
Length length(cancelButtonSize, Fixed);
style->setWidth(length);
style->setHeight(length);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
