Changeset 243145 in webkit

Timestamp:

Mar 19, 2019, 10:37:35 AM (8 years ago)

Author:

Simon Fraser

Message:

[Async overflow] Handle positioned nodes in a few more places
​https://bugs.webkit.org/show_bug.cgi?id=195946

Reviewed by Zalan Bujtas.

When I added support for positioned nodes in the scrolling tree I missed handling
the ScrollCoordinationRole::Positioning in a few places.

I wasn't able to come up with a test for this; when a positioned node toggles between
tiled and non-tiled, hitting the code in didChangePlatformLayerForLayer(), we already
update the node with the new layer.

• rendering/RenderLayer.cpp:

(WebCore::outputPaintOrderTreeRecursive): Logging.

• rendering/RenderLayerBacking.cpp:

(WebCore::operator<<): Logging.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::didChangePlatformLayerForLayer): Update the node's layer.
(WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Handle detaching of this node type.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-19  Simon Fraser  <simon.fraser@apple.com>
+
+        [Async overflow] Handle positioned nodes in a few more places
+        https://bugs.webkit.org/show_bug.cgi?id=195946
+
+        Reviewed by Zalan Bujtas.
+
+        When I added support for positioned nodes in the scrolling tree I missed handling
+        the ScrollCoordinationRole::Positioning in a few places.
+
+        I wasn't able to come up with a test for this; when a positioned node toggles between
+        tiled and non-tiled, hitting the code in didChangePlatformLayerForLayer(), we already
+        update the node with the new layer.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::outputPaintOrderTreeRecursive): Logging.
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::operator<<): Logging.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::didChangePlatformLayerForLayer): Update the node's layer.
+        (WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Handle detaching of this node type.
+
 2019-03-19  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6745 +6745 @@
         auto frameHostingNodeID = backing.scrollingNodeIDForRole(WebCore::ScrollCoordinationRole::FrameHosting);
         auto viewportConstrainedNodeID = backing.scrollingNodeIDForRole(WebCore::ScrollCoordinationRole::ViewportConstrained);
+        auto positionedNodeID = backing.scrollingNodeIDForRole(WebCore::ScrollCoordinationRole::Positioning);
 
         if (scrollingNodeID || frameHostingNodeID || viewportConstrainedNodeID) {
@@ -6767 +6768 @@
             }
 
+            if (positionedNodeID) {
+                if (!first)
+                    stream << ", ";
+                stream << "pos " << positionedNodeID;
+            }
+
             stream << "}";
         }

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -3136 +3136 @@
     if (auto nodeID = backing.scrollingNodeIDForRole(ScrollCoordinationRole::FrameHosting))
         ts << " frame hosting node " << nodeID;
+    if (auto nodeID = backing.scrollingNodeIDForRole(ScrollCoordinationRole::Positioning))
+        ts << " positioning node " << nodeID;
     return ts;
 }

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -553 +553 @@
     if (auto nodeID = backing->scrollingNodeIDForRole(ScrollCoordinationRole::FrameHosting))
         scrollingCoordinator->setNodeLayers(nodeID, { backing->graphicsLayer() });
+
+    if (auto nodeID = backing->scrollingNodeIDForRole(ScrollCoordinationRole::Positioning))
+        scrollingCoordinator->setNodeLayers(nodeID, { backing->graphicsLayer() });
 }
 
@@ -3960 +3963 @@
         detachScrollCoordinatedLayerWithRole(layer, *scrollingCoordinator, ScrollCoordinationRole::ViewportConstrained);
 
+    if (roles.contains(ScrollCoordinationRole::Positioning))
+        detachScrollCoordinatedLayerWithRole(layer, *scrollingCoordinator, ScrollCoordinationRole::Positioning);
+
     backing->detachFromScrollingCoordinator(roles);
 }