Changeset 246828 in webkit

Timestamp:

Jun 25, 2019 7:59:02 PM (5 years ago)

Author:

Simon Fraser

Message:

[iOS WK2 Debug] scrollingcoordinator/scrolling-tree/scroller-with-negative-z-child.html asserts
​https://bugs.webkit.org/show_bug.cgi?id=199218

Reviewed by Zalan Bujtas.

Followup to r246766; don't assert in the UI process if a ScrollingTreeOverflowScrollProxyNode
doesn't have a related overflow node; this is currently expected behavior with negative z-order
children of a scroller.

• UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:

(WebKit::RemoteScrollingCoordinatorProxy::establishLayerTreeScrollingRelations):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-25  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2 Debug] scrollingcoordinator/scrolling-tree/scroller-with-negative-z-child.html asserts
+        https://bugs.webkit.org/show_bug.cgi?id=199218
+
+        Reviewed by Zalan Bujtas.
+
+        Followup to r246766; don't assert in the UI process if a ScrollingTreeOverflowScrollProxyNode
+        doesn't have a related overflow node; this is currently expected behavior with negative z-order
+        children of a scroller.
+
+        * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
+        (WebKit::RemoteScrollingCoordinatorProxy::establishLayerTreeScrollingRelations):
+
 2019-06-25  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm

@@ -160 +160 @@
             auto& scrollProxyNode = downcast<ScrollingTreeOverflowScrollProxyNode>(*node);
             auto* overflowNode = downcast<ScrollingTreeOverflowScrollingNode>(m_scrollingTree->nodeForID(scrollProxyNode.overflowScrollingNodeID()));
-            if (!overflowNode) {
-                ASSERT_NOT_REACHED();
+            if (!overflowNode)
                 continue;
-            }
+
             scrollContainerLayerIDs.append(RemoteLayerTreeNode::layerID(overflowNode->scrollContainerLayer()));
             layerNode = RemoteLayerTreeNode::forCALayer(scrollProxyNode.layer());