Attachment 362423 Details for Bug 194828 – patch

[patch] patch

rootContentsLayer-remote.patch (text/plain), 3.17 KB, created by Antti Koivisto on 2019-02-19 13:48:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2019-02-19 13:48:16 PST

Size: 3.17 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 241770)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-02-19  Antti Koivisto  <antti@apple.com>
>+
>+        Pass rootContentsLayer to Mac remote layer tree
>+        https://bugs.webkit.org/show_bug.cgi?id=194828
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make this code path work again.
>+
>+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
>+        (ArgumentCoder<ScrollingStateFrameScrollingNode>::encode):
>+        (ArgumentCoder<ScrollingStateFrameScrollingNode>::decode):
>+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
>+        (WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
>+
> 2019-02-19  Antoine Quint  <graouts@apple.com>
> 
>         [iOS] "touch-action: none" should not prevent text selection or tapping on a link
>Index: Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>===================================================================
>--- Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp	(revision 241761)
>+++ Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp	(working copy)
>@@ -179,6 +179,9 @@ void ArgumentCoder<ScrollingStateFrameSc
> 
>     if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::HorizontalScrollbarLayer))
>         encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.horizontalScrollbarLayer());
>+
>+    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::RootContentsLayer))
>+        encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.rootContentsLayer());
> }
> 
> void ArgumentCoder<ScrollingStateFrameHostingNode>::encode(Encoder& encoder, const ScrollingStateFrameHostingNode& node)
>@@ -311,6 +314,13 @@ bool ArgumentCoder<ScrollingStateFrameSc
>         node.setHorizontalScrollbarLayer(layerID);
>     }
> 
>+    if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::RootContentsLayer)) {
>+        GraphicsLayer::PlatformLayerID layerID;
>+        if (!decoder.decode(layerID))
>+            return false;
>+        node.setRootContentsLayer(layerID);
>+    }
>+
>     return true;
> }
> 
>Index: Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp	(revision 241761)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp	(working copy)
>@@ -134,6 +134,9 @@ void RemoteScrollingCoordinatorProxy::co
> 
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::HorizontalScrollbarLayer))
>                 scrollingStateNode.setHorizontalScrollbarLayer(layerTreeHost.layerForID(scrollingStateNode.horizontalScrollbarLayer()));
>+
>+            if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::RootContentsLayer))
>+                scrollingStateNode.setRootContentsLayer(layerTreeHost.layerForID(scrollingStateNode.rootContentsLayer()));
>             break;
>         }
>         case ScrollingNodeType::Overflow: {

Actions: View | Formatted Diff | Diff

Attachments on bug 194828: 362423