Title: [101306] trunk/Source/WebKit/chromium
- Revision
- 101306
- Author
- bda...@apple.com
- Date
- 2011-11-28 17:00:05 -0800 (Mon, 28 Nov 2011)
Log Message
Speculative Chromium build fix.
* src/ScrollbarGroup.cpp:
(WebKit::ScrollbarGroup::scrollbarStyleChanged):
* src/ScrollbarGroup.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101305 => 101306)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-29 00:52:42 UTC (rev 101305)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-29 01:00:05 UTC (rev 101306)
@@ -1,3 +1,11 @@
+2011-11-28 Beth Dakin <bda...@apple.com>
+
+ Speculative Chromium build fix.
+
+ * src/ScrollbarGroup.cpp:
+ (WebKit::ScrollbarGroup::scrollbarStyleChanged):
+ * src/ScrollbarGroup.h:
+
2011-11-28 Dana Jansens <dan...@chromium.org>
FloatQuad::isRectilinear() returns false for 180degree rotations
Modified: trunk/Source/WebKit/chromium/src/ScrollbarGroup.cpp (101305 => 101306)
--- trunk/Source/WebKit/chromium/src/ScrollbarGroup.cpp 2011-11-29 00:52:42 UTC (rev 101305)
+++ trunk/Source/WebKit/chromium/src/ScrollbarGroup.cpp 2011-11-29 01:00:05 UTC (rev 101306)
@@ -233,8 +233,11 @@
return false;
}
-void ScrollbarGroup::scrollbarStyleChanged()
+void ScrollbarGroup::scrollbarStyleChanged(int, bool forceUpdate)
{
+ if (!forceUpdate)
+ return;
+
if (m_horizontalScrollbar)
m_horizontalScrollbar->scrollbarStyleChanged();
if (m_verticalScrollbar)
Modified: trunk/Source/WebKit/chromium/src/ScrollbarGroup.h (101305 => 101306)
--- trunk/Source/WebKit/chromium/src/ScrollbarGroup.h 2011-11-29 00:52:42 UTC (rev 101305)
+++ trunk/Source/WebKit/chromium/src/ScrollbarGroup.h 2011-11-29 01:00:05 UTC (rev 101306)
@@ -70,7 +70,7 @@
virtual WebCore::IntSize overhangAmount() const;
virtual WebCore::IntPoint currentMousePosition() const;
virtual bool shouldSuspendScrollAnimations() const;
- virtual void scrollbarStyleChanged();
+ virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate);
virtual bool isOnActivePage() const;
virtual void disconnectFromPage();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
