| Index: cc/trees/property_tree.cc
|
| diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
|
| index 89b8cea7b73672e2e48c315628d41d4c8a22a2e6..894b2d5da469a38121fc404424b943c810b494e4 100644
|
| --- a/cc/trees/property_tree.cc
|
| +++ b/cc/trees/property_tree.cc
|
| @@ -608,6 +608,7 @@
|
| should_flatten(false),
|
| user_scrollable_horizontal(false),
|
| user_scrollable_vertical(false),
|
| + element_id(0),
|
| transform_id(0),
|
| num_drawn_descendants(0) {}
|
|
|
| @@ -652,7 +653,7 @@
|
| data->set_should_flatten(should_flatten);
|
| data->set_user_scrollable_horizontal(user_scrollable_horizontal);
|
| data->set_user_scrollable_vertical(user_scrollable_vertical);
|
| - element_id.ToProtobuf(data->mutable_element_id());
|
| + data->set_element_id(element_id);
|
| data->set_transform_id(transform_id);
|
| }
|
|
|
| @@ -675,7 +676,7 @@
|
| should_flatten = data.should_flatten();
|
| user_scrollable_horizontal = data.user_scrollable_horizontal();
|
| user_scrollable_vertical = data.user_scrollable_vertical();
|
| - element_id.FromProtobuf(data.element_id());
|
| + element_id = data.element_id();
|
| transform_id = data.transform_id();
|
| }
|
|
|
| @@ -689,8 +690,7 @@
|
| value->SetBoolean("should_flatten", should_flatten);
|
| value->SetBoolean("user_scrollable_horizontal", user_scrollable_horizontal);
|
| value->SetBoolean("user_scrollable_vertical", user_scrollable_vertical);
|
| -
|
| - element_id.AddToTracedValue(value);
|
| + value->SetInteger("element_id", element_id);
|
| value->SetInteger("transform_id", transform_id);
|
| }
|
|
|
|
|