WebKit does not build without accelerated compositing after Changeset 144823
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Mar 2013 06:47:21 +0000 (06:47 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Mar 2013 06:47:21 +0000 (06:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=111597

Patch by Paweł Forysiuk <tuxator@o2.pl> on 2013-03-06
Reviewed by Kentaro Hara.

Properly guard functions ifdefed in ScrollingCoordinator.h.
Remove redundant checks and fallback code inside those functions.

* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::scrollLayerForScrollableArea):
(WebCore::ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea):
(WebCore::ScrollingCoordinator::verticalScrollbarLayerForScrollableArea):
(WebCore):

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

Source/WebCore/ChangeLog
Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

index 978eed3..244ca6a 100644 (file)
@@ -1,3 +1,19 @@
+2013-03-06  Paweł Forysiuk  <tuxator@o2.pl>
+
+        WebKit does not build without accelerated compositing after Changeset 144823
+        https://bugs.webkit.org/show_bug.cgi?id=111597
+
+        Reviewed by Kentaro Hara.
+
+        Properly guard functions ifdefed in ScrollingCoordinator.h.
+        Remove redundant checks and fallback code inside those functions.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::scrollLayerForScrollableArea):
+        (WebCore::ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea):
+        (WebCore::ScrollingCoordinator::verticalScrollbarLayerForScrollableArea):
+        (WebCore):
+
 2013-03-06  Hajime Morrita  <morrita@google.com>
 
         Custom Elements Refactoring: CustomElementConstructor API shouldn't bound to HTMLElement
index b655705..e196572 100644 (file)
@@ -275,34 +275,19 @@ void ScrollingCoordinator::frameViewFixedObjectsDidChange(FrameView* frameView)
 #if USE(ACCELERATED_COMPOSITING)
 GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea* scrollableArea)
 {
-#if USE(ACCELERATED_COMPOSITING)
     return scrollableArea->layerForScrolling();
-#else
-    UNUSED_PARAM(scrollableArea);
-    return 0;
-#endif
 }
 
 GraphicsLayer* ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea(ScrollableArea* scrollableArea)
 {
-#if USE(ACCELERATED_COMPOSITING)
     return scrollableArea->layerForHorizontalScrollbar();
-#else
-    UNUSED_PARAM(scrollableArea);
-    return 0;
-#endif
 }
-#endif
 
 GraphicsLayer* ScrollingCoordinator::verticalScrollbarLayerForScrollableArea(ScrollableArea* scrollableArea)
 {
-#if USE(ACCELERATED_COMPOSITING)
     return scrollableArea->layerForVerticalScrollbar();
-#else
-    UNUSED_PARAM(scrollableArea);
-    return 0;
-#endif
 }
+#endif
 
 GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView* frameView)
 {