| Index: cc/trees/effect_node.cc
|
| diff --git a/cc/trees/effect_node.cc b/cc/trees/effect_node.cc
|
| index 89a2d00dbb45d0ff816c0ebadb14980b141ba6c1..fa5ce22837a9000730aacd637304dfff2d66b2f2 100644
|
| --- a/cc/trees/effect_node.cc
|
| +++ b/cc/trees/effect_node.cc
|
| @@ -12,7 +12,7 @@ namespace cc {
|
| EffectNode::EffectNode()
|
| : id(-1),
|
| parent_id(-1),
|
| - owner_id(-1),
|
| + owning_layer_id(-1),
|
| opacity(1.f),
|
| screen_space_opacity(1.f),
|
| blend_mode(SkBlendMode::kSrcOver),
|
| @@ -40,7 +40,7 @@ EffectNode::EffectNode(const EffectNode& other) = default;
|
|
|
| bool EffectNode::operator==(const EffectNode& other) const {
|
| return id == other.id && parent_id == other.parent_id &&
|
| - owner_id == other.owner_id && opacity == other.opacity &&
|
| + owning_layer_id == other.owning_layer_id && opacity == other.opacity &&
|
| screen_space_opacity == other.screen_space_opacity &&
|
| has_render_surface == other.has_render_surface &&
|
| surface_is_clipped == other.surface_is_clipped &&
|
| @@ -70,7 +70,7 @@ bool EffectNode::operator==(const EffectNode& other) const {
|
| void EffectNode::AsValueInto(base::trace_event::TracedValue* value) const {
|
| value->SetInteger("id", id);
|
| value->SetInteger("parent_id", parent_id);
|
| - value->SetInteger("owner_id", owner_id);
|
| + value->SetInteger("owning_layer_id", owning_layer_id);
|
| value->SetDouble("opacity", opacity);
|
| value->SetBoolean("has_render_surface", has_render_surface);
|
| value->SetBoolean("surface_is_clipped", surface_is_clipped);
|
|
|