Changeset 163158 in webkit


Ignore:
Timestamp:
Jan 30, 2014 9:42:27 PM (10 years ago)
Author:
Simon Fraser
Message:

Remove ScrollingCoordinator::setLayerIsContainerForFixedPositionLayers() which is no longer used
https://bugs.webkit.org/show_bug.cgi?id=127981

Reviewed by Andreas Kling.

setLayerIsContainerForFixedPositionLayers() was only used by Chromium and Blackberry,
so remove it.

This allows the removal of RenderLayerBacking::registerScrollingLayers(),
moving the single useful line of code to the caller.

  • page/scrolling/ScrollingCoordinator.h:
  • rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):

  • rendering/RenderLayerBacking.h:
  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::ensureRootLayer):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r163157 r163158  
     12014-01-30  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Remove ScrollingCoordinator::setLayerIsContainerForFixedPositionLayers() which is no longer used
     4        https://bugs.webkit.org/show_bug.cgi?id=127981
     5
     6        Reviewed by Andreas Kling.
     7
     8        setLayerIsContainerForFixedPositionLayers() was only used by Chromium and Blackberry,
     9        so remove it.
     10       
     11        This allows the removal of RenderLayerBacking::registerScrollingLayers(),
     12        moving the single useful line of code to the caller.
     13
     14        * page/scrolling/ScrollingCoordinator.h:
     15        * rendering/RenderLayerBacking.cpp:
     16        (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
     17        * rendering/RenderLayerBacking.h:
     18        * rendering/RenderLayerCompositor.cpp:
     19        (WebCore::RenderLayerCompositor::ensureRootLayer):
     20
    1212014-01-30  Simon Fraser  <simon.fraser@apple.com>
    222
  • trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h

    r163079 r163158  
    173173    virtual void scrollableAreaScrollLayerDidChange(ScrollableArea*) { }
    174174    virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea*, ScrollbarOrientation) { }
    175     virtual void setLayerIsContainerForFixedPositionLayers(GraphicsLayer*, bool) { }
    176175
    177176    static String synchronousScrollingReasonsAsText(SynchronousScrollingReasons);
  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r163146 r163158  
    959959    updateDrawsContent(isSimpleContainer);
    960960    updateAfterWidgetResize();
    961     registerScrollingLayers();
     961
     962    compositor().updateViewportConstraintStatus(m_owningLayer);
    962963}
    963964
     
    10161017    updateDirectlyCompositedBackgroundColor(isSimpleContainer, didUpdateContentsRect);
    10171018    updateDirectlyCompositedBackgroundImage(isSimpleContainer, didUpdateContentsRect);
    1018 }
    1019 
    1020 void RenderLayerBacking::registerScrollingLayers()
    1021 {
    1022 #if PLATFORM(IOS)
    1023     compositor().updateViewportConstraintStatus(m_owningLayer);
    1024 #else
    1025     // Register fixed position layers and their containers with the scrolling coordinator.
    1026     ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m_owningLayer);
    1027     if (!scrollingCoordinator)
    1028         return;
    1029 
    1030     compositor().updateViewportConstraintStatus(m_owningLayer);
    1031 
    1032     if (!scrollingCoordinator->supportsFixedPositionLayers())
    1033         return;
    1034 
    1035     // Page scale is applied as a transform on the root render view layer. Because the scroll
    1036     // layer is further up in the hierarchy, we need to avoid marking the root render view
    1037     // layer as a container.
    1038     bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLayer();
    1039     scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(childForSuperlayers(), isContainer);
    1040 #endif
    10411019}
    10421020
  • trunk/Source/WebCore/rendering/RenderLayerBacking.h

    r163104 r163158  
    234234    bool updateScrollingLayers(bool scrollingLayers);
    235235    void updateDrawsContent(bool isSimpleContainer);
    236     void registerScrollingLayers();
    237236   
    238237    void updateRootLayerConfiguration();
  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r163157 r163158  
    31183118            m_scrollLayer->setName("frame scrolling");
    31193119#endif
    3120             if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
    3121                 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_scrollLayer.get(), true);
    3122 
    31233120            // Hook them up
    31243121            m_overflowControlsHostLayer->addChild(m_clipLayer.get());
Note: See TracChangeset for help on using the changeset viewer.