From 542070e02eeacba7512d7642dcecfe9df03306bd Mon Sep 17 00:00:00 2001 From: "jamesr@google.com" Date: Tue, 21 Feb 2012 21:57:06 +0000 Subject: [PATCH] Unreviewed windows build fix - avoid return statement after return if USE(ACCELERATED_COMPOSITING) is set. * page/scrolling/ScrollingCoordinator.cpp: (WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108395 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 7 +++++++ Source/WebCore/page/scrolling/ScrollingCoordinator.cpp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index cf14314..e524556 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,12 @@ 2012-02-21 James Robinson + 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 + 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 --- 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) -- 2.7.4