Changeset 163158 in webkit
- Timestamp:
- Jan 30, 2014 9:42:27 PM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r163157 r163158 1 2014-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 1 21 2014-01-30 Simon Fraser <simon.fraser@apple.com> 2 22 -
trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h
r163079 r163158 173 173 virtual void scrollableAreaScrollLayerDidChange(ScrollableArea*) { } 174 174 virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea*, ScrollbarOrientation) { } 175 virtual void setLayerIsContainerForFixedPositionLayers(GraphicsLayer*, bool) { }176 175 177 176 static String synchronousScrollingReasonsAsText(SynchronousScrollingReasons); -
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
r163146 r163158 959 959 updateDrawsContent(isSimpleContainer); 960 960 updateAfterWidgetResize(); 961 registerScrollingLayers(); 961 962 compositor().updateViewportConstraintStatus(m_owningLayer); 962 963 } 963 964 … … 1016 1017 updateDirectlyCompositedBackgroundColor(isSimpleContainer, didUpdateContentsRect); 1017 1018 updateDirectlyCompositedBackgroundImage(isSimpleContainer, didUpdateContentsRect); 1018 }1019 1020 void RenderLayerBacking::registerScrollingLayers()1021 {1022 #if PLATFORM(IOS)1023 compositor().updateViewportConstraintStatus(m_owningLayer);1024 #else1025 // 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 scroll1036 // layer is further up in the hierarchy, we need to avoid marking the root render view1037 // layer as a container.1038 bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLayer();1039 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(childForSuperlayers(), isContainer);1040 #endif1041 1019 } 1042 1020 -
trunk/Source/WebCore/rendering/RenderLayerBacking.h
r163104 r163158 234 234 bool updateScrollingLayers(bool scrollingLayers); 235 235 void updateDrawsContent(bool isSimpleContainer); 236 void registerScrollingLayers();237 236 238 237 void updateRootLayerConfiguration(); -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r163157 r163158 3118 3118 m_scrollLayer->setName("frame scrolling"); 3119 3119 #endif 3120 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())3121 scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_scrollLayer.get(), true);3122 3123 3120 // Hook them up 3124 3121 m_overflowControlsHostLayer->addChild(m_clipLayer.get());
Note: See TracChangeset
for help on using the changeset viewer.