| Index: cc/trees/transform_node.cc
|
| diff --git a/cc/trees/transform_node.cc b/cc/trees/transform_node.cc
|
| index b0655785c1054155aebd0a6edb7bbb1ed48a21be..97b5cf9f1b273a6a02804ca6028b04b2fc579ca8 100644
|
| --- a/cc/trees/transform_node.cc
|
| +++ b/cc/trees/transform_node.cc
|
| @@ -13,7 +13,7 @@ namespace cc {
|
| TransformNode::TransformNode()
|
| : id(-1),
|
| parent_id(-1),
|
| - owner_id(-1),
|
| + owning_layer_id(-1),
|
| sticky_position_constraint_id(-1),
|
| source_node_id(-1),
|
| sorting_context_id(0),
|
| @@ -42,9 +42,9 @@ TransformNode::TransformNode(const TransformNode&) = default;
|
|
|
| bool TransformNode::operator==(const TransformNode& other) const {
|
| return id == other.id && parent_id == other.parent_id &&
|
| - owner_id == other.owner_id && pre_local == other.pre_local &&
|
| - local == other.local && post_local == other.post_local &&
|
| - to_parent == other.to_parent &&
|
| + owning_layer_id == other.owning_layer_id &&
|
| + pre_local == other.pre_local && local == other.local &&
|
| + post_local == other.post_local && to_parent == other.to_parent &&
|
| source_node_id == other.source_node_id &&
|
| sorting_context_id == other.sorting_context_id &&
|
| needs_local_transform_update == other.needs_local_transform_update &&
|
| @@ -103,7 +103,7 @@ void TransformNode::update_post_local_transform(
|
| void TransformNode::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);
|
| MathUtil::AddToTracedValue("pre_local", pre_local, value);
|
| MathUtil::AddToTracedValue("local", local, value);
|
| MathUtil::AddToTracedValue("post_local", post_local, value);
|
|
|