Title: [241779] trunk/Source/WebKit
- Revision
- 241779
- Author
- an...@apple.com
- Date
- 2019-02-19 14:57:11 -0800 (Tue, 19 Feb 2019)
Log Message
Pass rootContentsLayer to Mac remote layer tree
https://bugs.webkit.org/show_bug.cgi?id=194828
Reviewed by Simon Fraser.
Make this code path work again.
* Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
(ArgumentCoder<ScrollingStateFrameScrollingNode>::encode):
(ArgumentCoder<ScrollingStateFrameScrollingNode>::decode):
* UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (241778 => 241779)
--- trunk/Source/WebKit/ChangeLog 2019-02-19 22:51:29 UTC (rev 241778)
+++ trunk/Source/WebKit/ChangeLog 2019-02-19 22:57:11 UTC (rev 241779)
@@ -1,3 +1,18 @@
+2019-02-19 Antti Koivisto <an...@apple.com>
+
+ Pass rootContentsLayer to Mac remote layer tree
+ https://bugs.webkit.org/show_bug.cgi?id=194828
+
+ Reviewed by Simon Fraser.
+
+ 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 Alex Christensen <achristen...@webkit.org>
Reduce use of LegacySync IPC messages
Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp (241778 => 241779)
--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp 2019-02-19 22:51:29 UTC (rev 241778)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp 2019-02-19 22:57:11 UTC (rev 241779)
@@ -179,6 +179,9 @@
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 @@
node.setHorizontalScrollbarLayer(layerID);
}
+ if (node.hasChangedProperty(ScrollingStateFrameScrollingNode::RootContentsLayer)) {
+ GraphicsLayer::PlatformLayerID layerID;
+ if (!decoder.decode(layerID))
+ return false;
+ node.setRootContentsLayer(layerID);
+ }
+
return true;
}
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp (241778 => 241779)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp 2019-02-19 22:51:29 UTC (rev 241778)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp 2019-02-19 22:57:11 UTC (rev 241779)
@@ -134,6 +134,9 @@
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: {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
