Detemplatize cc property nodes

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/playback/display_item_list.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/playback/transform_display_item.h"
+#include "cc/trees/clip_node.h"
+#include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/property_tree.h"
+#include "cc/trees/transform_node.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/paint/ClipPaintPropertyNode.h"
 #include "platform/graphics/paint/DisplayItem.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/ForeignLayerDisplayItem.h"
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/graphics/paint/PropertyTreeState.h"
 #include "platform/graphics/paint/TransformPaintPropertyNode.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
@@ skipping 203 matching lines @@
 constexpr int kPropertyTreeSequenceNumber = 1;
 
 // Creates a minimal set of property trees for the compositor.
 void setMinimalPropertyTrees(cc::PropertyTrees* propertyTrees, int ownerId)
 {
     // cc is hardcoded to use transform node index 1 for device scale and transform.
     cc::TransformTree& transformTree = propertyTrees->transform_tree;
     transformTree.clear();
     cc::TransformNode& transformNode = *transformTree.Node(transformTree.Insert(cc::TransformNode(), kRealRootNodeId));
     DCHECK_EQ(transformNode.id, kSecondaryRootNodeId);
-    transformNode.data.source_node_id = transformNode.parent_id;
+    transformNode.source_node_id = transformNode.parent_id;
     transformTree.SetTargetId(transformNode.id, kRealRootNodeId);
     transformTree.SetContentTargetId(transformNode.id, kRealRootNodeId);
 
     // cc is hardcoded to use clip node index 1 for viewport clip.
     cc::ClipTree& clipTree = propertyTrees->clip_tree;
     clipTree.clear();
     cc::ClipNode& clipNode = *clipTree.Node(clipTree.Insert(cc::ClipNode(), kRealRootNodeId));
     DCHECK_EQ(clipNode.id, kSecondaryRootNodeId);
     clipNode.owner_id = ownerId;
 
     // cc is hardcoded to use effect node index 1 for root render surface.
     cc::EffectTree& effectTree = propertyTrees->effect_tree;
     effectTree.clear();
     cc::EffectNode& effectNode = *effectTree.Node(effectTree.Insert(cc::EffectNode(), kRealRootNodeId));
     DCHECK_EQ(effectNode.id, kSecondaryRootNodeId);
     effectNode.owner_id = ownerId;
-    effectNode.data.clip_id = clipNode.id;
-    effectNode.data.has_render_surface = true;
+    effectNode.clip_id = clipNode.id;
+    effectNode.has_render_surface = true;
 
     cc::ScrollTree& scrollTree = propertyTrees->scroll_tree;
     scrollTree.clear();
 }
 
 } // namespace
 
 void PaintArtifactCompositor::update(const PaintArtifact& paintArtifact)
 {
     DCHECK(m_rootLayer);
@@ skipping 104 matching lines @@
     if (it != m_transformNodeMap.end())
         return it->value;
 
     scoped_refptr<cc::Layer> dummyLayer = cc::Layer::Create();
     int parentId = compositorIdForTransformNode(transformNode->parent());
     int id = transformTree().Insert(cc::TransformNode(), parentId);
 
     cc::TransformNode& compositorNode = *transformTree().Node(id);
     transformTree().SetTargetId(id, kRealRootNodeId);
     transformTree().SetContentTargetId(id, kRealRootNodeId);
-    compositorNode.data.source_node_id = parentId;
+    compositorNode.source_node_id = parentId;
 
     FloatPoint3D origin = transformNode->origin();
-    compositorNode.data.pre_local.matrix().setTranslate(
+    compositorNode.pre_local.matrix().setTranslate(
         -origin.x(), -origin.y(), -origin.z());
-    compositorNode.data.local.matrix() = TransformationMatrix::toSkMatrix44(transformNode->matrix());
-    compositorNode.data.post_local.matrix().setTranslate(
+    compositorNode.local.matrix() = TransformationMatrix::toSkMatrix44(transformNode->matrix());
+    compositorNode.post_local.matrix().setTranslate(
         origin.x(), origin.y(), origin.z());
-    compositorNode.data.needs_local_transform_update = true;
+    compositorNode.needs_local_transform_update = true;
 
     m_rootLayer->AddChild(dummyLayer);
     dummyLayer->SetTransformTreeIndex(id);
     dummyLayer->SetClipTreeIndex(kSecondaryRootNodeId);
     dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
     dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
     dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
 
     auto result = m_transformNodeMap.set(transformNode, id);
     DCHECK(result.isNewEntry);
@@ skipping 11 matching lines @@
         return it->value;
 
     scoped_refptr<cc::Layer> dummyLayer = cc::Layer::Create();
     int parentId = compositorIdForClipNode(clipNode->parent());
     int id = clipTree().Insert(cc::ClipNode(), parentId);
 
     cc::ClipNode& compositorNode = *clipTree().Node(id);
     compositorNode.owner_id = dummyLayer->id();
 
     // TODO(jbroman): Don't discard rounded corners.
-    compositorNode.data.clip = clipNode->clipRect().rect();
-    compositorNode.data.transform_id = compositorIdForTransformNode(clipNode->localTransformSpace());
-    compositorNode.data.target_id = kRealRootNodeId;
-    compositorNode.data.applies_local_clip = true;
-    compositorNode.data.layers_are_clipped = true;
-    compositorNode.data.layers_are_clipped_when_surfaces_disabled = true;
+    compositorNode.clip = clipNode->clipRect().rect();
+    compositorNode.transform_id = compositorIdForTransformNode(clipNode->localTransformSpace());
+    compositorNode.target_id = kRealRootNodeId;
+    compositorNode.applies_local_clip = true;
+    compositorNode.layers_are_clipped = true;
+    compositorNode.layers_are_clipped_when_surfaces_disabled = true;
 
     m_rootLayer->AddChild(dummyLayer);
-    dummyLayer->SetTransformTreeIndex(compositorNode.data.transform_id);
+    dummyLayer->SetTransformTreeIndex(compositorNode.transform_id);
     dummyLayer->SetClipTreeIndex(id);
     dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
     dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
     dummyLayer->set_property_tree_sequence_number(kPropertyTreeSequenceNumber);
 
     auto result = m_clipNodeMap.set(clipNode, id);
     DCHECK(result.isNewEntry);
     clipTree().set_needs_update(true);
     return id;
 }
@@ skipping 34 matching lines @@
         if (m_extraDataForTestingEnabled)
             m_extraDataForTesting->contentLayers.append(layer);
     }
 
     // Mark the property trees as having been rebuilt.
     host->property_trees()->sequence_number = kPropertyTreeSequenceNumber;
     host->property_trees()->needs_rebuild = false;
 }
 
 } // namespace blink