Title: [163158] trunk/Source/WebCore
- Revision
- 163158
- Author
- [email protected]
- Date
- 2014-01-30 21:42:27 -0800 (Thu, 30 Jan 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163157 => 163158)
--- trunk/Source/WebCore/ChangeLog 2014-01-31 05:42:25 UTC (rev 163157)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 05:42:27 UTC (rev 163158)
@@ -1,5 +1,25 @@
2014-01-30 Simon Fraser <[email protected]>
+ 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):
+
+2014-01-30 Simon Fraser <[email protected]>
+
Some fixed position elements disappear in WK2 on iOS
https://bugs.webkit.org/show_bug.cgi?id=127977
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (163157 => 163158)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-01-31 05:42:25 UTC (rev 163157)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-01-31 05:42:27 UTC (rev 163158)
@@ -172,7 +172,6 @@
virtual void willDestroyScrollableArea(ScrollableArea*) { }
virtual void scrollableAreaScrollLayerDidChange(ScrollableArea*) { }
virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea*, ScrollbarOrientation) { }
- virtual void setLayerIsContainerForFixedPositionLayers(GraphicsLayer*, bool) { }
static String synchronousScrollingReasonsAsText(SynchronousScrollingReasons);
String synchronousScrollingReasonsAsText() const;
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (163157 => 163158)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-31 05:42:25 UTC (rev 163157)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-31 05:42:27 UTC (rev 163158)
@@ -958,7 +958,8 @@
updateDrawsContent(isSimpleContainer);
updateAfterWidgetResize();
- registerScrollingLayers();
+
+ compositor().updateViewportConstraintStatus(m_owningLayer);
}
void RenderLayerBacking::adjustAncestorCompositingBoundsForFlowThread(IntRect& ancestorCompositingBounds, const RenderLayer* compositingAncestor) const
@@ -1017,29 +1018,6 @@
updateDirectlyCompositedBackgroundImage(isSimpleContainer, didUpdateContentsRect);
}
-void RenderLayerBacking::registerScrollingLayers()
-{
-#if PLATFORM(IOS)
- compositor().updateViewportConstraintStatus(m_owningLayer);
-#else
- // Register fixed position layers and their containers with the scrolling coordinator.
- ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m_owningLayer);
- if (!scrollingCoordinator)
- return;
-
- compositor().updateViewportConstraintStatus(m_owningLayer);
-
- if (!scrollingCoordinator->supportsFixedPositionLayers())
- return;
-
- // Page scale is applied as a transform on the root render view layer. Because the scroll
- // layer is further up in the hierarchy, we need to avoid marking the root render view
- // layer as a container.
- bool isContainer = m_owningLayer.hasTransform() && !m_owningLayer.isRootLayer();
- scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(childForSuperlayers(), isContainer);
-#endif
-}
-
void RenderLayerBacking::updateInternalHierarchy()
{
// m_foregroundLayer has to be inserted in the correct order with child layers,
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (163157 => 163158)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-01-31 05:42:25 UTC (rev 163157)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-01-31 05:42:27 UTC (rev 163158)
@@ -233,7 +233,6 @@
bool requiresScrollCornerLayer() const;
bool updateScrollingLayers(bool scrollingLayers);
void updateDrawsContent(bool isSimpleContainer);
- void registerScrollingLayers();
void updateRootLayerConfiguration();
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (163157 => 163158)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-31 05:42:25 UTC (rev 163157)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-31 05:42:27 UTC (rev 163158)
@@ -3117,9 +3117,6 @@
#ifndef NDEBUG
m_scrollLayer->setName("frame scrolling");
#endif
- if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
- scrollingCoordinator->setLayerIsContainerForFixedPositionLayers(m_scrollLayer.get(), true);
-
// Hook them up
m_overflowControlsHostLayer->addChild(m_clipLayer.get());
m_clipLayer->addChild(m_scrollLayer.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
