| Index: cc/proto/property_tree.proto
|
| diff --git a/cc/proto/property_tree.proto b/cc/proto/property_tree.proto
|
| index 77f30f28707af36b9ad52c8df12761cd1f1beafd..32d749697d3f85c88f1a144b47baa50611ccc794 100644
|
| --- a/cc/proto/property_tree.proto
|
| +++ b/cc/proto/property_tree.proto
|
| @@ -7,6 +7,7 @@ syntax = "proto2";
|
| import "rectf.proto";
|
| import "scroll_offset.proto";
|
| import "size.proto";
|
| +import "synced_property.proto";
|
| import "transform.proto";
|
| import "vector2df.proto";
|
|
|
| @@ -156,9 +157,15 @@ message PropertyTree {
|
| optional ScrollTreeData scroll_tree_data = 1001;
|
| }
|
|
|
| +message ScrollOffsetMapEntry {
|
| + required int64 layer_id = 1;
|
| + optional SyncedProperty scroll_offset = 2;
|
| +}
|
| +
|
| // Proto for data members of class ScrollTree
|
| message ScrollTreeData {
|
| optional int64 currently_scrolling_node_id = 1;
|
| + repeated ScrollOffsetMapEntry layer_id_to_scroll_offset_map = 2;
|
| }
|
|
|
| // Proto for data members of class TransformTree.
|
| @@ -174,7 +181,7 @@ message TransformTreeData {
|
| }
|
|
|
| // Proto for class PropertyTrees.
|
| -// NEXT ID: 12
|
| +// NEXT ID: 14
|
| message PropertyTrees {
|
| optional PropertyTree transform_tree = 1;
|
| optional PropertyTree effect_tree = 2;
|
| @@ -185,6 +192,8 @@ message PropertyTrees {
|
| optional bool non_root_surfaces_enabled = 5;
|
| optional bool changed = 11;
|
| optional int64 sequence_number = 6;
|
| + optional bool is_main_thread = 12;
|
| + optional bool is_active = 13;
|
|
|
| optional Vector2dF inner_viewport_container_bounds_delta = 8;
|
| optional Vector2dF outer_viewport_container_bounds_delta = 9;
|
|
|