Attachment 372893 Details for Bug 199218 – Patch

[patch] Patch

bug-199218-20190625185546.patch (text/plain), 2.28 KB, created by Simon Fraser (smfr) on 2019-06-25 18:55:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-06-25 18:55:47 PDT

Size: 2.28 KB

patch

obsolete

>Subversion Revision: 246821
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c939e7662778cc2b3c75b642691a109fc47c2e81..9a058d7a4820bbf1d7f3f5541cd4b0b7eda2f9f2 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+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 NOBODY (OOPS!).
>+
>+        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>
> 
>         Non-editable text selections should be modifiable with hardware keyboard
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>index 2714ae4672a4b0ade9150be5b845048ad818c9ca..f979065aa50eb7a50332348446f7196c5da14b68 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>@@ -159,10 +159,9 @@ void RemoteScrollingCoordinatorProxy::establishLayerTreeScrollingRelations(const
>         } else if (is<ScrollingTreeOverflowScrollProxyNode>(*node)) {
>             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());
>             behavior = ScrollPositioningBehavior::Moves;

Flags:

zalan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199218: 372893