Changeset 145041 in webkit


Ignore:
Timestamp:
Mar 6, 2013 10:47:21 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

WebKit does not build without accelerated compositing after Changeset 144823
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):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r145040 r145041  
     12013-03-06  Paweł Forysiuk  <tuxator@o2.pl>
     2
     3        WebKit does not build without accelerated compositing after Changeset 144823
     4        https://bugs.webkit.org/show_bug.cgi?id=111597
     5
     6        Reviewed by Kentaro Hara.
     7
     8        Properly guard functions ifdefed in ScrollingCoordinator.h.
     9        Remove redundant checks and fallback code inside those functions.
     10
     11        * page/scrolling/ScrollingCoordinator.cpp:
     12        (WebCore::ScrollingCoordinator::scrollLayerForScrollableArea):
     13        (WebCore::ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea):
     14        (WebCore::ScrollingCoordinator::verticalScrollbarLayerForScrollableArea):
     15        (WebCore):
     16
    1172013-03-06  Hajime Morrita  <morrita@google.com>
    218
  • trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

    r144823 r145041  
    276276GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea* scrollableArea)
    277277{
    278 #if USE(ACCELERATED_COMPOSITING)
    279278    return scrollableArea->layerForScrolling();
    280 #else
    281     UNUSED_PARAM(scrollableArea);
    282     return 0;
    283 #endif
    284279}
    285280
    286281GraphicsLayer* ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea(ScrollableArea* scrollableArea)
    287282{
    288 #if USE(ACCELERATED_COMPOSITING)
    289283    return scrollableArea->layerForHorizontalScrollbar();
    290 #else
    291     UNUSED_PARAM(scrollableArea);
    292     return 0;
    293 #endif
    294 }
    295 #endif
     284}
    296285
    297286GraphicsLayer* ScrollingCoordinator::verticalScrollbarLayerForScrollableArea(ScrollableArea* scrollableArea)
    298287{
    299 #if USE(ACCELERATED_COMPOSITING)
    300288    return scrollableArea->layerForVerticalScrollbar();
    301 #else
    302     UNUSED_PARAM(scrollableArea);
    303     return 0;
    304 #endif
    305 }
     289}
     290#endif
    306291
    307292GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView* frameView)
Note: See TracChangeset for help on using the changeset viewer.