Unreviewed windows build fix - avoid return statement after return if USE(ACCELERATED...

* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cf14314..e524556 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2012-02-21  James Robinson  <jamesr@chromium.org>
 
+        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  <jamesr@chromium.org>
+
         ScrollingCoordinator::coordinatesScrollingForFrameView should be conditional on compositing being active
         https://bugs.webkit.org/show_bug.cgi?id=79126
 

diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
index 83aa87a..d05fe83 100644 (file)
--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
@@ -105,9 +105,9 @@ bool ScrollingCoordinator::coordinatesScrollingForFrameView(FrameView* frameView
     if (!renderView)
         return false;
     return renderView->usesCompositing();
-#endif
-
+#else
     return false;
+#endif
 }
 
 static Region computeNonFastScrollableRegion(FrameView* frameView)