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

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

Issue 2866733002: Remove owning_id from EffectNode and replace it by an opaque stable_id (Closed)
Patch Set: none Created 3 years, 7 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 ab4e692dba4db42f630a0660bfc8f025455fb260..11220dee2b75623aef6639a47bc4e4e3aff46339 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp
@@ -127,12 +127,10 @@ void PropertyTreeManager::SetupRootEffectNode() {
cc::EffectNode& effect_node =
*effect_tree.Node(effect_tree.Insert(cc::EffectNode(), kInvalidNodeId));
DCHECK_EQ(effect_node.id, kSecondaryRootNodeId);
- effect_node.owning_layer_id = root_layer_->id();
+ effect_node.stable_id = root_layer_->id();
effect_node.transform_id = kRealRootNodeId;
effect_node.clip_id = kSecondaryRootNodeId;
effect_node.has_render_surface = true;
- effect_tree.SetOwningLayerIdForNode(&effect_node,
- effect_node.owning_layer_id);
effect_stack_.push_back(
BlinkEffectAndCcIdPair{EffectPaintPropertyNode::Root(), effect_node.id});
@@ -418,7 +416,7 @@ void PropertyTreeManager::BuildEffectNodesRecursively(
cc::EffectNode& effect_node = *GetEffectTree().Node(GetEffectTree().Insert(
cc::EffectNode(), GetCurrentCompositorEffectNodeIndex()));
- effect_node.owning_layer_id = dummy_layer->id();
+ effect_node.stable_id = dummy_layer->id();
effect_node.clip_id = output_clip_id;
// Every effect is supposed to have render surface enabled for grouping,
// but we can get away without one if the effect is opacity-only and has only
@@ -446,8 +444,6 @@ void PropertyTreeManager::BuildEffectNodesRecursively(
effect_node.filters = next_effect->Filter().AsCcFilterOperations();
}
effect_node.blend_mode = next_effect->BlendMode();
- GetEffectTree().SetOwningLayerIdForNode(&effect_node,
- effect_node.owning_layer_id);
CompositorElementId compositor_element_id =
next_effect->GetCompositorElementId();
if (compositor_element_id) {

Powered by Google App Engine
This is Rietveld 408576698