Title: [108395] trunk/Source/WebCore
- Revision
- 108395
- Author
- [email protected]
- Date
- 2012-02-21 13:57:06 -0800 (Tue, 21 Feb 2012)
Log Message
Unreviewed windows build fix - avoid return statement after return if USE(ACCELERATED_COMPOSITING) is set.
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108394 => 108395)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 21:46:23 UTC (rev 108394)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 21:57:06 UTC (rev 108395)
@@ -1,5 +1,12 @@
2012-02-21 James Robinson <[email protected]>
+ Unreviewed windows build fix - avoid return statement after return if USE(ACCELERATED_COMPOSITING) is set.
+
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView):
+
+2012-02-21 James Robinson <[email protected]>
+
ScrollingCoordinator::coordinatesScrollingForFrameView should be conditional on compositing being active
https://bugs.webkit.org/show_bug.cgi?id=79126
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (108394 => 108395)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2012-02-21 21:46:23 UTC (rev 108394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2012-02-21 21:57:06 UTC (rev 108395)
@@ -105,9 +105,9 @@
if (!renderView)
return false;
return renderView->usesCompositing();
+#else
+ return false;
#endif
-
- return false;
}
static Region computeNonFastScrollableRegion(FrameView* frameView)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
