Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1743)

Unified Diff: third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp

Issue 2655233006: cc : Clean up cc clip tree (Closed)
Patch Set: blink_tests Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
index e8e0b2ebf8437faca34781c33f23b80ba62ddbf9..d0d49449e659fa84b3e27f254d2f68f72ec4221c 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
@@ -104,14 +104,11 @@ void PropertyTreeManager::setupRootClipNode() {
*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;
m_propertyTrees.layer_id_to_clip_node_index[clipNode.owning_layer_id] =
clipNode.id;
@@ -236,11 +233,7 @@ int PropertyTreeManager::ensureCompositorClipNode(
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);

Powered by Google App Engine
This is Rietveld 408576698