cc : Clean up cc clip tree

third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.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/PropertyTreeManager.h"
 
 #include "cc/layers/layer.h"
 #include "cc/trees/clip_node.h"
 #include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host.h"
@@ skipping 85 matching lines @@
 }
 
 void PropertyTreeManager::setupRootClipNode() {
   // cc is hardcoded to use clip node index 1 for viewport clip.
   cc::ClipTree& clipTree = m_propertyTrees.clip_tree;
   clipTree.clear();
   cc::ClipNode& clipNode =
       *clipTree.Node(clipTree.Insert(cc::ClipNode(), kRealRootNodeId));
   DCHECK_EQ(clipNode.id, kSecondaryRootNodeId);
 
-  clipNode.resets_clip = true;
   clipNode.owning_layer_id = m_rootLayer->id();
   clipNode.clip_type = cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP;
   clipNode.clip = gfx::RectF(
       gfx::SizeF(m_rootLayer->layer_tree_host()->device_viewport_size()));
   clipNode.transform_id = kRealRootNodeId;
-  clipNode.target_transform_id = kRealRootNodeId;
-  clipNode.target_effect_id = kSecondaryRootNodeId;
   clipTree.SetOwningLayerIdForNode(&clipNode, clipNode.owning_layer_id);
 
   m_clipNodeMap.set(ClipPaintPropertyNode::root(), clipNode.id);
   m_rootLayer->SetClipTreeIndex(clipNode.id);
 }
 
 void PropertyTreeManager::setupRootEffectNode() {
   // cc is hardcoded to use effect node index 1 for root render surface.
   cc::EffectTree& effectTree = m_propertyTrees.effect_tree;
   effectTree.clear();
@@ skipping 99 matching lines @@
 
   cc::ClipNode& compositorNode = *clipTree().Node(id);
   compositorNode.owning_layer_id = dummyLayer->id();
   clipTree().SetOwningLayerIdForNode(&compositorNode,
                                      compositorNode.owning_layer_id);
 
   // TODO(jbroman): Don't discard rounded corners.
   compositorNode.clip = clipNode->clipRect().rect();
   compositorNode.transform_id =
       ensureCompositorTransformNode(clipNode->localTransformSpace());
-  compositorNode.target_transform_id = kRealRootNodeId;
-  compositorNode.target_effect_id = kSecondaryRootNodeId;
   compositorNode.clip_type = cc::ClipNode::ClipType::APPLIES_LOCAL_CLIP;
-  compositorNode.layers_are_clipped = true;
-  compositorNode.layers_are_clipped_when_surfaces_disabled = true;
 
   m_rootLayer->AddChild(dummyLayer);
   dummyLayer->SetTransformTreeIndex(compositorNode.transform_id);
   dummyLayer->SetClipTreeIndex(id);
   dummyLayer->SetEffectTreeIndex(kSecondaryRootNodeId);
   dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
   dummyLayer->set_property_tree_sequence_number(m_sequenceNumber);
 
   auto result = m_clipNodeMap.set(clipNode, id);
   DCHECK(result.isNewEntry);
@@ skipping 202 matching lines @@
   m_effectStack.push_back(BlinkEffectAndCcIdPair{nextEffect, effectNode.id});
 
   dummyLayer->set_property_tree_sequence_number(m_sequenceNumber);
   dummyLayer->SetTransformTreeIndex(kSecondaryRootNodeId);
   dummyLayer->SetClipTreeIndex(outputClipId);
   dummyLayer->SetEffectTreeIndex(effectNode.id);
   dummyLayer->SetScrollTreeIndex(kRealRootNodeId);
 }
 
 }  // namespace blink