Changeset 238549 in webkit

Timestamp:

Nov 27, 2018, 4:39:27 AM (8 years ago)

Author:

Antti Koivisto

Message:

Stop collecting related layers in RemoteLayerTreeHost::updateLayerTree
​https://bugs.webkit.org/show_bug.cgi?id=192003

Reviewed by Tim Horton.

We can pass the node hash directly to RemoteLayerTreePropertyApplier. The collection step doesn't seem
to add anything except an extra hash lookup.

• Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h:
• UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:

(WebKit::RemoteLayerTreeHost::updateLayerTree):

Pass m_nodes directly.
Some random cleanups.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h (modified) (1 diff)
• UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-27  Antti Koivisto  <antti@apple.com>
+
+        Stop collecting related layers in RemoteLayerTreeHost::updateLayerTree
+        https://bugs.webkit.org/show_bug.cgi?id=192003
+
+        Reviewed by Tim Horton.
+
+        We can pass the node hash directly to RemoteLayerTreePropertyApplier. The collection step doesn't seem
+        to add anything except an extra hash lookup.
+
+        * Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h:
+        * UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm:
+        (WebKit::RemoteLayerTreeHost::updateLayerTree):
+
+        Pass m_nodes directly.
+        Some random cleanups.
+
 2018-11-27  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteLayerTreePropertyApplier.h

@@ -36 +36 @@
 class RemoteLayerTreePropertyApplier {
 public:
-    using RelatedLayerMap = HashMap<WebCore::GraphicsLayer::PlatformLayerID, RemoteLayerTreeNode*>;
+    using RelatedLayerMap = HashMap<WebCore::GraphicsLayer::PlatformLayerID, std::unique_ptr<RemoteLayerTreeNode>>;
     static void applyProperties(RemoteLayerTreeNode&, RemoteLayerTreeHost*, const RemoteLayerTreeTransaction::LayerProperties&, const RelatedLayerMap&, RemoteLayerBackingStore::LayerContentsType);
     static void applyPropertiesToLayer(CALayer *, RemoteLayerTreeHost*, const RemoteLayerTreeTransaction::LayerProperties&, RemoteLayerBackingStore::LayerContentsType);

trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeHost.mm

@@ -83 +83 @@
     }
 
-    typedef std::pair<GraphicsLayer::PlatformLayerID, GraphicsLayer::PlatformLayerID> LayerIDPair;
-    Vector<LayerIDPair> clonesToUpdate;
+    struct LayerAndClone {
+        GraphicsLayer::PlatformLayerID layerID;
+        GraphicsLayer::PlatformLayerID cloneLayerID;
+    };
+    Vector<LayerAndClone> clonesToUpdate;
 
 #if PLATFORM(MAC) || PLATFORM(IOSMAC)
@@ -100 +103 @@
         ASSERT(node);
 
-        RemoteLayerTreePropertyApplier::RelatedLayerMap relatedLayers;
-        if (properties.changedProperties & RemoteLayerTreeTransaction::ChildrenChanged) {
-            for (auto& child : properties.children)
-                relatedLayers.set(child, nodeForID(child));
-        }
-
-        if (properties.changedProperties & RemoteLayerTreeTransaction::MaskLayerChanged && properties.maskLayerID)
-            relatedLayers.set(properties.maskLayerID, nodeForID(properties.maskLayerID));
-
-        if (properties.changedProperties & RemoteLayerTreeTransaction::ClonedContentsChanged && properties.clonedLayerID)
-            clonesToUpdate.append(LayerIDPair(layerID, properties.clonedLayerID));
+        if (properties.changedProperties.contains(RemoteLayerTreeTransaction::ClonedContentsChanged) && properties.clonedLayerID)
+            clonesToUpdate.append({ layerID, properties.clonedLayerID });
+
+        RemoteLayerTreePropertyApplier::applyProperties(*node, this, properties, m_nodes, layerContentsType);
 
         if (m_isDebugLayerTreeHost) {
-            RemoteLayerTreePropertyApplier::applyProperties(*node, this, properties, relatedLayers, layerContentsType);
-
-            if (properties.changedProperties & RemoteLayerTreeTransaction::BorderWidthChanged)
+            if (properties.changedProperties.contains(RemoteLayerTreeTransaction::BorderWidthChanged))
                 node->layer().borderWidth = properties.borderWidth / indicatorScaleFactor;
             node->layer().masksToBounds = false;
-        } else
-            RemoteLayerTreePropertyApplier::applyProperties(*node, this, properties, relatedLayers, layerContentsType);
+        }
     }
     
-    for (const auto& layerPair : clonesToUpdate) {
-        auto* layer = layerForID(layerPair.first);
-        auto* clonedLayer = layerForID(layerPair.second);
-        layer.contents = clonedLayer.contents;
-    }
+    for (const auto& layerAndClone : clonesToUpdate)
+        layerForID(layerAndClone.layerID).contents = layerForID(layerAndClone.cloneLayerID).contents;
 
     for (auto& destroyedLayer : transaction.destroyedLayers())