Title: [88364] trunk/Source/WebCore
- Revision
- 88364
- Author
- [email protected]
- Date
- 2011-06-08 11:20:16 -0700 (Wed, 08 Jun 2011)
Log Message
2011-06-08 Nico Weber <[email protected]>
Reviewed by Darin Adler.
Fix a ?: precedence error in ScrollbarThemeMac and ScrollbarThemeChromium
https://bugs.webkit.org/show_bug.cgi?id=62295
This was found by a new warning recently added to clang's -Wparentheses
* platform/chromium/ScrollbarThemeChromiumMac.mm:
(WebCore::ScrollbarThemeChromiumMac::backButtonRect):
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::backButtonRect):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (88363 => 88364)
--- trunk/Source/WebCore/ChangeLog 2011-06-08 18:19:53 UTC (rev 88363)
+++ trunk/Source/WebCore/ChangeLog 2011-06-08 18:20:16 UTC (rev 88364)
@@ -1,3 +1,17 @@
+2011-06-08 Nico Weber <[email protected]>
+
+ Reviewed by Darin Adler.
+
+ Fix a ?: precedence error in ScrollbarThemeMac and ScrollbarThemeChromium
+ https://bugs.webkit.org/show_bug.cgi?id=62295
+
+ This was found by a new warning recently added to clang's -Wparentheses
+
+ * platform/chromium/ScrollbarThemeChromiumMac.mm:
+ (WebCore::ScrollbarThemeChromiumMac::backButtonRect):
+ * platform/mac/ScrollbarThemeMac.mm:
+ (WebCore::ScrollbarThemeMac::backButtonRect):
+
2011-06-08 Caio Marcelo de Oliveira Filho <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm (88363 => 88364)
--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm 2011-06-08 18:19:53 UTC (rev 88363)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm 2011-06-08 18:20:16 UTC (rev 88364)
@@ -245,9 +245,9 @@
bool outerButton = part == BackButtonStartPart && (buttonsPlacement() == ScrollbarButtonsDoubleStart || buttonsPlacement() == ScrollbarButtonsDoubleBoth);
if (outerButton) {
if (scrollbar->orientation() == HorizontalScrollbar)
- result = IntRect(scrollbar->x(), scrollbar->y(), cOuterButtonLength[scrollbar->controlSize()] + painting ? cOuterButtonOverlap : 0, thickness);
+ result = IntRect(scrollbar->x(), scrollbar->y(), cOuterButtonLength[scrollbar->controlSize()] + (painting ? cOuterButtonOverlap : 0), thickness);
else
- result = IntRect(scrollbar->x(), scrollbar->y(), thickness, cOuterButtonLength[scrollbar->controlSize()] + painting ? cOuterButtonOverlap : 0);
+ result = IntRect(scrollbar->x(), scrollbar->y(), thickness, cOuterButtonLength[scrollbar->controlSize()] + (painting ? cOuterButtonOverlap : 0));
return result;
}
Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (88363 => 88364)
--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2011-06-08 18:19:53 UTC (rev 88363)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm 2011-06-08 18:20:16 UTC (rev 88364)
@@ -292,9 +292,9 @@
bool outerButton = part == BackButtonStartPart && (buttonsPlacement() == ScrollbarButtonsDoubleStart || buttonsPlacement() == ScrollbarButtonsDoubleBoth);
if (outerButton) {
if (scrollbar->orientation() == HorizontalScrollbar)
- result = IntRect(scrollbar->x(), scrollbar->y(), cOuterButtonLength[scrollbar->controlSize()] + painting ? cOuterButtonOverlap : 0, thickness);
+ result = IntRect(scrollbar->x(), scrollbar->y(), cOuterButtonLength[scrollbar->controlSize()] + (painting ? cOuterButtonOverlap : 0), thickness);
else
- result = IntRect(scrollbar->x(), scrollbar->y(), thickness, cOuterButtonLength[scrollbar->controlSize()] + painting ? cOuterButtonOverlap : 0);
+ result = IntRect(scrollbar->x(), scrollbar->y(), thickness, cOuterButtonLength[scrollbar->controlSize()] + (painting ? cOuterButtonOverlap : 0));
return result;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
