Attachment 372367 Details for Bug 198967 – Patch

[patch] Patch

bug-198967-20190618130239.patch (text/plain), 26.84 KB, created by Simon Fraser (smfr) on 2019-06-18 13:02:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-06-18 13:02:40 PDT

Size: 26.84 KB

patch

obsolete

>Subversion Revision: 246549
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c11f61a37726c091a808006dffa1c3f68b4d6477..98d13ad960fe74dd10f7d64236d592a1abdc218c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,44 @@
>+2019-06-18  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Remove references to insetClipLayer
>+        https://bugs.webkit.org/show_bug.cgi?id=198967
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        With current state of the code, insetClipLayer is the same as the scrollContainerLayer.
>+        We seem to have lost some behavior added in r168244 (relating to the visibility of
>+        margin tiles and rubber-banding), but this patch does not change behavior.
>+
>+        * page/FrameView.cpp:
>+        (WebCore::FrameView::yPositionForScrollContainerLayer):
>+        (WebCore::FrameView::yPositionForInsetClipLayer): Deleted.
>+        * page/FrameView.h:
>+        * page/scrolling/AsyncScrollingCoordinator.cpp:
>+        (WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
>+        (WebCore::AsyncScrollingCoordinator::reconcileScrollingState):
>+        (WebCore::AsyncScrollingCoordinator::setNodeLayers):
>+        * page/scrolling/ScrollingCoordinator.cpp:
>+        (WebCore::ScrollingCoordinator::insetClipLayerForFrameView): Deleted.
>+        * page/scrolling/ScrollingCoordinator.h:
>+        * page/scrolling/ScrollingStateFrameScrollingNode.cpp:
>+        (WebCore::ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode):
>+        (WebCore::ScrollingStateFrameScrollingNode::setAllPropertiesChanged):
>+        (WebCore::ScrollingStateFrameScrollingNode::setScrollContainerLayer):
>+        (WebCore::ScrollingStateFrameScrollingNode::setCounterScrollingLayer):
>+        (WebCore::ScrollingStateFrameScrollingNode::dumpProperties const):
>+        (WebCore::ScrollingStateFrameScrollingNode::setInsetClipLayer): Deleted.
>+        * page/scrolling/ScrollingStateFrameScrollingNode.h:
>+        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
>+        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
>+        (WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren):
>+        (WebCore::ScrollingTreeFrameScrollingNodeMac::repositionRelatedLayers):
>+        * rendering/RenderLayerCompositor.cpp:
>+        (WebCore::RenderLayerCompositor::updateScrollContainerGeometry):
>+        (WebCore::RenderLayerCompositor::positionForScrollContainerLayer const):
>+        (WebCore::RenderLayerCompositor::updateScrollingNodeLayers):
>+        (WebCore::RenderLayerCompositor::positionForClipLayer const): Deleted.
>+        * rendering/RenderLayerCompositor.h:
>+
> 2019-06-18  Truitt Savell  <tsavell@apple.com>
> 
>         Unreviewed, rolling out r246524.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f4d8755efb0797419557e265e45e96a870b31523..735eb67a16ebe1ca89c9493808f5363f603d3e68 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-18  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Remove references to insetClipLayer
>+        https://bugs.webkit.org/show_bug.cgi?id=198967
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
>+        (ArgumentCoder<ScrollingStateFrameScrollingNode>::encode):
>+        (ArgumentCoder<ScrollingStateFrameScrollingNode>::decode):
>+        (WebKit::dump):
>+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
>+        (WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
>+
> 2019-06-18  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.25.1 release
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index c02645ba5b8608404cf9076e7d2e9c3eec8619ec..205e10ba666d969390ac562d547eaa8a23873a84 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -1807,12 +1807,13 @@ LayoutPoint FrameView::scrollPositionForFixedPosition(const LayoutRect& visibleC
>     return LayoutPoint(position.x() * dragFactorX / frameScaleFactor, position.y() * dragFactorY / frameScaleFactor);
> }
> 
>-float FrameView::yPositionForInsetClipLayer(const FloatPoint& scrollPosition, float topContentInset)
>+float FrameView::yPositionForScrollContainerLayer(const FloatPoint& scrollPosition, float topContentInset)
> {
>     if (!topContentInset)
>         return 0;
> 
>-    // The insetClipLayer should not move for negative scroll values.
>+    // The scrollContainerLayer should not move for negative scroll values.
>+    // FIXME: We seem to have lost some of the behavior added in r168244.
>     float scrollY = std::max<float>(0, scrollPosition.y());
> 
>     if (scrollY >= topContentInset)
>diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h
>index bf94012f2ff2a5a0b788ef31595038413dfd08da..bc3e5e1f63cb1c5a6f84736f25dc51cb56a1ddb0 100644
>--- a/Source/WebCore/page/FrameView.h
>+++ b/Source/WebCore/page/FrameView.h
>@@ -316,7 +316,7 @@ public:
> 
>     // These layers are positioned differently when there is a topContentInset, a header, or a footer. These value need to be computed
>     // on both the main thread and the scrolling thread.
>-    static float yPositionForInsetClipLayer(const FloatPoint& scrollPosition, float topContentInset);
>+    static float yPositionForScrollContainerLayer(const FloatPoint& scrollPosition, float topContentInset);
>     WEBCORE_EXPORT static FloatPoint positionForRootContentLayer(const FloatPoint& scrollPosition, const FloatPoint& scrollOrigin, float topContentInset, float headerHeight);
>     WEBCORE_EXPORT FloatPoint positionForRootContentLayer() const;
> 
>diff --git a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
>index 77fc58335e843f1537475a65ed66ce74c44cd537..58bd6d159834a71b81ec75b5bd560a7d8c7dfdcf 100644
>--- a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
>+++ b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
>@@ -195,7 +195,6 @@ void AsyncScrollingCoordinator::frameViewRootLayerDidChange(FrameView& frameView
>     node->setScrolledContentsLayer(scrolledContentsLayerForFrameView(frameView));
>     node->setRootContentsLayer(rootContentsLayerForFrameView(frameView));
>     node->setCounterScrollingLayer(counterScrollingLayerForFrameView(frameView));
>-    node->setInsetClipLayer(insetClipLayerForFrameView(frameView));
>     node->setContentShadowLayer(contentShadowLayerForFrameView(frameView));
>     node->setHeaderLayer(headerLayerForFrameView(frameView));
>     node->setFooterLayer(footerLayerForFrameView(frameView));
>@@ -392,7 +391,7 @@ void AsyncScrollingCoordinator::reconcileScrollingState(FrameView& frameView, co
>         return;
> 
>     auto* counterScrollingLayer = counterScrollingLayerForFrameView(frameView);
>-    auto* insetClipLayer = insetClipLayerForFrameView(frameView);
>+    auto* scrollContainerLayer = scrollContainerLayerForFrameView(frameView);
>     auto* contentShadowLayer = contentShadowLayerForFrameView(frameView);
>     auto* rootContentsLayer = rootContentsLayerForFrameView(frameView);
>     auto* headerLayer = headerLayerForFrameView(frameView);
>@@ -402,9 +401,9 @@ void AsyncScrollingCoordinator::reconcileScrollingState(FrameView& frameView, co
>     LayoutPoint scrollPositionForFixed = frameView.scrollPositionForFixedPosition();
>     float topContentInset = frameView.topContentInset();
> 
>-    FloatPoint positionForInsetClipLayer;
>-    if (insetClipLayer)
>-        positionForInsetClipLayer = FloatPoint(insetClipLayer->position().x(), FrameView::yPositionForInsetClipLayer(scrollPosition, topContentInset));
>+    FloatPoint positionForScrollContainerLayer;
>+    if (scrollContainerLayer)
>+        positionForScrollContainerLayer = FloatPoint(scrollContainerLayer->position().x(), FrameView::yPositionForScrollContainerLayer(scrollPosition, topContentInset));
>     FloatPoint positionForContentsLayer = frameView.positionForRootContentLayer();
>     
>     FloatPoint positionForHeaderLayer = FloatPoint(scrollPositionForFixed.x(), FrameView::yPositionForHeaderLayer(scrollPosition, topContentInset));
>@@ -416,8 +415,8 @@ void AsyncScrollingCoordinator::reconcileScrollingState(FrameView& frameView, co
> 
>         if (counterScrollingLayer)
>             counterScrollingLayer->setPosition(scrollPositionForFixed);
>-        if (insetClipLayer)
>-            insetClipLayer->setPosition(positionForInsetClipLayer);
>+        if (scrollContainerLayer)
>+            scrollContainerLayer->setPosition(positionForScrollContainerLayer);
>         if (contentShadowLayer)
>             contentShadowLayer->setPosition(positionForContentsLayer);
>         if (rootContentsLayer)
>@@ -431,8 +430,8 @@ void AsyncScrollingCoordinator::reconcileScrollingState(FrameView& frameView, co
> 
>         if (counterScrollingLayer)
>             counterScrollingLayer->syncPosition(scrollPositionForFixed);
>-        if (insetClipLayer)
>-            insetClipLayer->syncPosition(positionForInsetClipLayer);
>+        if (scrollContainerLayer)
>+            scrollContainerLayer->syncPosition(positionForScrollContainerLayer);
>         if (contentShadowLayer)
>             contentShadowLayer->syncPosition(positionForContentsLayer);
>         if (rootContentsLayer)
>@@ -573,7 +572,6 @@ void AsyncScrollingCoordinator::setNodeLayers(ScrollingNodeID nodeID, const Node
> 
>         if (is<ScrollingStateFrameScrollingNode>(node)) {
>             auto& frameScrollingNode = downcast<ScrollingStateFrameScrollingNode>(*node);
>-            frameScrollingNode.setInsetClipLayer(nodeLayers.insetClipLayer);
>             frameScrollingNode.setCounterScrollingLayer(nodeLayers.counterScrollingLayer);
>             frameScrollingNode.setRootContentsLayer(nodeLayers.rootContentsLayer);
>         }
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>index c0685e2ff506872ac60013e4aa34bc1cb15c5eb4..17cef532a7491897fa8ed4a2850008a53e382902 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>@@ -269,13 +269,6 @@ GraphicsLayer* ScrollingCoordinator::counterScrollingLayerForFrameView(FrameView
>     return nullptr;
> }
> 
>-GraphicsLayer* ScrollingCoordinator::insetClipLayerForFrameView(FrameView& frameView)
>-{
>-    if (auto* renderView = frameView.frame().contentRenderer())
>-        return renderView->compositor().scrollContainerLayer();
>-    return nullptr;
>-}
>-
> GraphicsLayer* ScrollingCoordinator::contentShadowLayerForFrameView(FrameView& frameView)
> {
> #if ENABLE(RUBBER_BANDING)
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.h b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>index 65c625828538de5d4fd568b47049bc0bbc32d73b..79820887ee735b0908d079ccd4db9da3f7b31b66 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>@@ -138,7 +138,6 @@ public:
>         GraphicsLayer* scrollContainerLayer { nullptr };
>         GraphicsLayer* scrolledContentsLayer { nullptr };
>         GraphicsLayer* counterScrollingLayer { nullptr };
>-        GraphicsLayer* insetClipLayer { nullptr };
>         GraphicsLayer* rootContentsLayer { nullptr };
>         GraphicsLayer* horizontalScrollbarLayer { nullptr };
>         GraphicsLayer* verticalScrollbarLayer { nullptr };
>@@ -188,7 +187,6 @@ protected:
>     GraphicsLayer* scrollContainerLayerForFrameView(FrameView&);
>     GraphicsLayer* scrolledContentsLayerForFrameView(FrameView&);
>     GraphicsLayer* counterScrollingLayerForFrameView(FrameView&);
>-    GraphicsLayer* insetClipLayerForFrameView(FrameView&);
>     GraphicsLayer* rootContentsLayerForFrameView(FrameView&);
>     GraphicsLayer* contentShadowLayerForFrameView(FrameView&);
>     GraphicsLayer* headerLayerForFrameView(FrameView&);
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
>index 46ef674c5bf5058da3da5e2bedabd2f34f1be3d1..56b2725f0804d1103482a306f462260cf2cc8888 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
>@@ -65,9 +65,6 @@ ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode(const Scrolli
>     if (hasChangedProperty(CounterScrollingLayer))
>         setCounterScrollingLayer(stateNode.counterScrollingLayer().toRepresentation(adoptiveTree.preferredLayerRepresentation()));
> 
>-    if (hasChangedProperty(InsetClipLayer))
>-        setInsetClipLayer(stateNode.insetClipLayer().toRepresentation(adoptiveTree.preferredLayerRepresentation()));
>-
>     if (hasChangedProperty(ContentShadowLayer))
>         setContentShadowLayer(stateNode.contentShadowLayer().toRepresentation(adoptiveTree.preferredLayerRepresentation()));
> 
>@@ -91,9 +88,7 @@ void ScrollingStateFrameScrollingNode::setAllPropertiesChanged()
>     setPropertyChangedBit(EventTrackingRegion);
>     setPropertyChangedBit(ReasonsForSynchronousScrolling);
>     setPropertyChangedBit(RootContentsLayer);
>-    setPropertyChangedBit(ScrolledContentsLayer);
>     setPropertyChangedBit(CounterScrollingLayer);
>-    setPropertyChangedBit(InsetClipLayer);
>     setPropertyChangedBit(ContentShadowLayer);
>     setPropertyChangedBit(HeaderHeight);
>     setPropertyChangedBit(FooterHeight);
>@@ -219,15 +214,6 @@ void ScrollingStateFrameScrollingNode::setCounterScrollingLayer(const LayerRepre
>     setPropertyChanged(CounterScrollingLayer);
> }
> 
>-void ScrollingStateFrameScrollingNode::setInsetClipLayer(const LayerRepresentation& layerRepresentation)
>-{
>-    if (layerRepresentation == m_insetClipLayer)
>-        return;
>-    
>-    m_insetClipLayer = layerRepresentation;
>-    setPropertyChanged(InsetClipLayer);
>-}
>-
> void ScrollingStateFrameScrollingNode::setContentShadowLayer(const LayerRepresentation& layerRepresentation)
> {
>     if (layerRepresentation == m_contentShadowLayer)
>@@ -282,7 +268,6 @@ void ScrollingStateFrameScrollingNode::dumpProperties(TextStream& ts, ScrollingS
>     if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerIDs) {
>         ts.dumpProperty("root contents layer ID", m_rootContentsLayer.layerID());
>         ts.dumpProperty("counter scrolling layer ID", m_counterScrollingLayer.layerID());
>-        ts.dumpProperty("inset clip layer ID", m_insetClipLayer.layerID());
>         ts.dumpProperty("content shadow layer ID", m_contentShadowLayer.layerID());
>         ts.dumpProperty("header layer ID", m_headerLayer.layerID());
>         ts.dumpProperty("footer layer ID", m_footerLayer.layerID());
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
>index 13c650f09e89d40a2fee94bb26d4b404bb5cb696..0faeb291240c1d84e30e4696599035480fbf2469 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
>@@ -50,9 +50,7 @@ public:
>         EventTrackingRegion,
>         ReasonsForSynchronousScrolling,
>         RootContentsLayer,
>-        ScrolledContentsLayer,
>         CounterScrollingLayer,
>-        InsetClipLayer,
>         ContentShadowLayer,
>         HeaderHeight,
>         FooterHeight,
>@@ -104,13 +102,6 @@ public:
>     const LayerRepresentation& counterScrollingLayer() const { return m_counterScrollingLayer; }
>     WEBCORE_EXPORT void setCounterScrollingLayer(const LayerRepresentation&);
> 
>-    // This is a clipping layer that will scroll with the page for all y-delta scroll values between 0
>-    // and topContentInset(). Once the y-deltas get beyond the content inset point, this layer no longer
>-    // needs to move. If the topContentInset() is 0, this layer does not need to move at all. This is
>-    // only used on the Mac.
>-    const LayerRepresentation& insetClipLayer() const { return m_insetClipLayer; }
>-    WEBCORE_EXPORT void setInsetClipLayer(const LayerRepresentation&);
>-
>     const LayerRepresentation& contentShadowLayer() const { return m_contentShadowLayer; }
>     WEBCORE_EXPORT void setContentShadowLayer(const LayerRepresentation&);
> 
>@@ -139,7 +130,6 @@ private:
> 
>     LayerRepresentation m_rootContentsLayer;
>     LayerRepresentation m_counterScrollingLayer;
>-    LayerRepresentation m_insetClipLayer;
>     LayerRepresentation m_contentShadowLayer;
>     LayerRepresentation m_headerLayer;
>     LayerRepresentation m_footerLayer;
>diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
>index b0ec2112e1d9d6c435194270ce671e122d025d91..70ad067b92d55ff5a862029ab764310a41206583 100644
>--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
>+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h
>@@ -70,7 +70,6 @@ private:
> 
>     RetainPtr<CALayer> m_rootContentsLayer;
>     RetainPtr<CALayer> m_counterScrollingLayer;
>-    RetainPtr<CALayer> m_insetClipLayer;
>     RetainPtr<CALayer> m_contentShadowLayer;
>     RetainPtr<CALayer> m_headerLayer;
>     RetainPtr<CALayer> m_footerLayer;
>diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
>index cf6d06d8574ee08453086377d63e726acccd94f9..cf072f0d5dce0d56b47470dab98a699481845902 100644
>--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
>+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
>@@ -91,9 +91,6 @@ void ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren(const Scrolli
>     if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer))
>         m_counterScrollingLayer = scrollingStateNode.counterScrollingLayer();
> 
>-    if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer))
>-        m_insetClipLayer = scrollingStateNode.insetClipLayer();
>-
>     if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer))
>         m_contentShadowLayer = scrollingStateNode.contentShadowLayer();
> 
>@@ -214,8 +211,8 @@ void ScrollingTreeFrameScrollingNodeMac::repositionRelatedLayers()
>         m_counterScrollingLayer.get().position = layoutViewport.location();
> 
>     float topContentInset = this->topContentInset();
>-    if (m_insetClipLayer && m_rootContentsLayer) {
>-        m_insetClipLayer.get().position = FloatPoint(m_insetClipLayer.get().position.x, FrameView::yPositionForInsetClipLayer(scrollPosition, topContentInset));
>+    if (scrollContainerLayer() && m_rootContentsLayer) {
>+        scrollContainerLayer().position = FloatPoint(scrollContainerLayer().position.x, FrameView::yPositionForScrollContainerLayer(scrollPosition, topContentInset));
>         m_rootContentsLayer.get().position = FrameView::positionForRootContentLayer(scrollPosition, scrollOrigin(), topContentInset, headerHeight());
>         if (m_contentShadowLayer)
>             m_contentShadowLayer.get().position = m_rootContentsLayer.get().position;
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>index ab0d72c0d2451beee0158fed5c9cacac8bd06494..23206221a231b357453c3e11eeee3cd99302cb1b 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>@@ -2007,16 +2007,16 @@ void RenderLayerCompositor::updateScrollContainerGeometry()
>         return;
> 
>     m_scrollContainerLayer->setSize(m_renderView.frameView().sizeForVisibleContent());
>-    m_scrollContainerLayer->setPosition(positionForClipLayer());
>+    m_scrollContainerLayer->setPosition(positionForScrollContainerLayer());
> }
> 
>-FloatPoint RenderLayerCompositor::positionForClipLayer() const
>+FloatPoint RenderLayerCompositor::positionForScrollContainerLayer() const
> {
>     auto& frameView = m_renderView.frameView();
> 
>     return FloatPoint(
>         frameView.shouldPlaceBlockDirectionScrollbarOnLeft() ? frameView.horizontalScrollbarIntrusion() : 0,
>-        FrameView::yPositionForInsetClipLayer(frameView.scrollPosition(), frameView.topContentInset()));
>+        FrameView::yPositionForScrollContainerLayer(frameView.scrollPosition(), frameView.topContentInset()));
> }
> 
> void RenderLayerCompositor::frameViewDidScroll()
>@@ -4299,13 +4299,13 @@ void RenderLayerCompositor::updateScrollingNodeLayers(ScrollingNodeID nodeID, Re
>         FrameView& frameView = m_renderView.frameView();
>         scrollingCoordinator.setNodeLayers(nodeID, { nullptr,
>             scrollContainerLayer(), scrolledContentsLayer(),
>-            fixedRootBackgroundLayer(), nullptr, rootContentsLayer(),
>+            fixedRootBackgroundLayer(), rootContentsLayer(),
>             frameView.layerForHorizontalScrollbar(), frameView.layerForVerticalScrollbar() });
>     } else {
>         auto& backing = *layer.backing();
>         scrollingCoordinator.setNodeLayers(nodeID, { backing.graphicsLayer(),
>             backing.scrollContainerLayer(), backing.scrolledContentsLayer(),
>-            nullptr, nullptr, nullptr,
>+            nullptr, nullptr,
>             layer.layerForHorizontalScrollbar(), layer.layerForVerticalScrollbar() });
>     }
> }
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h
>index fe8d75c44a56ddf522783d26e708c85d83a5fac0..e0db400e7e919726feae639288ebc7d25593c9c0 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.h
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.h
>@@ -440,7 +440,7 @@ private:
>     void updateLayersForScrollPosition();
>     void updateScrollContainerGeometry();
> 
>-    FloatPoint positionForClipLayer() const;
>+    FloatPoint positionForScrollContainerLayer() const;
> 
>     void notifyIFramesOfCompositingChange();
> 
>diff --git a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>index 35437c7a3562e3896a647da1e2f5dce6778e1e28..dff677c676498e248c0c8bb79a08a69b87d21cb4 100644
>--- a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>+++ b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>@@ -177,12 +177,12 @@ void ArgumentCoder<ScrollingStateFrameScrollingNode>::encode(Encoder& encoder, c
>     SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::MinLayoutViewportOrigin, minLayoutViewportOrigin)
>     SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::MaxLayoutViewportOrigin, maxLayoutViewportOrigin)
> 
>+    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::ScrollContainerLayer))
>+        encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.scrollContainerLayer());
>+
>     if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer))
>         encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.counterScrollingLayer());
> 
>-    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer))
>-        encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.insetClipLayer());
>-
>     if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer))
>         encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.contentShadowLayer());
> 
>@@ -298,18 +298,18 @@ bool ArgumentCoder<ScrollingStateFrameScrollingNode>::decode(Decoder& decoder, S
>     SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::MinLayoutViewportOrigin, FloatPoint, setMinLayoutViewportOrigin)
>     SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::MaxLayoutViewportOrigin, FloatPoint, setMaxLayoutViewportOrigin)
> 
>-    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer)) {
>+    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::ScrollContainerLayer)) {
>         GraphicsLayer::PlatformLayerID layerID;
>         if (!decoder.decode(layerID))
>             return false;
>-        node.setCounterScrollingLayer(layerID);
>+        node.setScrollContainerLayer(layerID);
>     }
> 
>-    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer)) {
>+    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer)) {
>         GraphicsLayer::PlatformLayerID layerID;
>         if (!decoder.decode(layerID))
>             return false;
>-        node.setInsetClipLayer(layerID);
>+        node.setCounterScrollingLayer(layerID);
>     }
> 
>     if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer)) {
>@@ -634,8 +634,8 @@ static void dump(TextStream& ts, const ScrollingStateFrameScrollingNode& node, b
>     if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
>         ts.dumpProperty("frame-scale-factor", node.frameScaleFactor());
> 
>-    if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer))
>-        ts.dumpProperty("clip-inset-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.insetClipLayer()));
>+    if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::ScrollContainerLayer))
>+        ts.dumpProperty("scroll-container-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.scrollContainerLayer()));
> 
>     if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer))
>         ts.dumpProperty("content-shadow-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.contentShadowLayer()));
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>index d59d9c1bdf79cdb7339805cda7788832927e548f..fb5c455c9e9792d47cb051ac6ec6356440f0e9fd 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>@@ -115,12 +115,12 @@ void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree&
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrolledContentsLayer))
>                 scrollingStateNode.setScrolledContentsLayer(layerTreeHost.layerForID(scrollingStateNode.scrolledContentsLayer()));
> 
>+            if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::ScrollContainerLayer))
>+                scrollingStateNode.setScrollContainerLayer(layerTreeHost.layerForID(scrollingStateNode.scrollContainerLayer()));
>+
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::CounterScrollingLayer))
>                 scrollingStateNode.setCounterScrollingLayer(layerTreeHost.layerForID(scrollingStateNode.counterScrollingLayer()));
> 
>-            if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer))
>-                scrollingStateNode.setInsetClipLayer(layerTreeHost.layerForID(scrollingStateNode.insetClipLayer()));
>-
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer))
>                 scrollingStateNode.setContentShadowLayer(layerTreeHost.layerForID(scrollingStateNode.contentShadowLayer()));
>

Actions: View | Formatted Diff | Diff

Attachments on bug 198967: 372342 | 372352 | 372367