diff options
| author | sunxd <sunxd@chromium.org> | 2016-01-27 16:12:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 00:14:45 +0000 |
| commit | ea1df789e1afcf57a69769b4c4a1d9ef09d112ed (patch) | |
| tree | d0faa83c94803701baacd06af91947d733d4be90 /cc/proto | |
| parent | f999944b9fe2e1e55f125095663d145b4008b8b1 (diff) | |
| download | chromium_src-ea1df789e1afcf57a69769b4c4a1d9ef09d112ed.zip chromium_src-ea1df789e1afcf57a69769b4c4a1d9ef09d112ed.tar.gz chromium_src-ea1df789e1afcf57a69769b4c4a1d9ef09d112ed.tar.bz2 | |
Add ScrollTree builder and unit test
Remove ScrollBlocksOn from ScrollTree:
It will be moved from the code base soon, will work
to integrate the "passive event handler" if that
depends on layer tree hierarchy.
BUG=568830
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1626513003
Cr-Commit-Position: refs/heads/master@{#371914}
Diffstat (limited to 'cc/proto')
| -rw-r--r-- | cc/proto/layer.proto | 2 | ||||
| -rw-r--r-- | cc/proto/property_tree.proto | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/cc/proto/layer.proto b/cc/proto/layer.proto index 4c8ba31..84ec3b7 100644 --- a/cc/proto/layer.proto +++ b/cc/proto/layer.proto @@ -69,6 +69,7 @@ message LayerProperties { optional PictureLayerProperties picture = 6; } +// NEXT ID: 51 message BaseLayerProperties { optional Point3F transform_origin = 1; optional uint32 background_color = 2; @@ -76,6 +77,7 @@ message BaseLayerProperties { optional int64 transform_free_index = 4; optional int64 effect_tree_index = 5; optional int64 clip_tree_index = 6; + optional int64 scroll_tree_index = 50; optional Vector2dF offset_to_transform_parent = 7; optional bool double_sided = 8; optional bool draws_content = 9; diff --git a/cc/proto/property_tree.proto b/cc/proto/property_tree.proto index d35f264..d7d74b2 100644 --- a/cc/proto/property_tree.proto +++ b/cc/proto/property_tree.proto @@ -93,9 +93,8 @@ message EffectNodeData { message ScrollNodeData { optional bool scrollable = 1; optional bool should_scroll_on_main_thread = 2; - optional int32 scroll_blocks_on = 3; - optional bool contains_non_fast_scrollable_region = 4; - optional int64 transform_id = 5; + optional bool contains_non_fast_scrollable_region = 3; + optional int64 transform_id = 4; } // This defines the proto used for all types of struct TreeNode. @@ -156,9 +155,9 @@ message PropertyTrees { optional PropertyTree transform_tree = 1; optional PropertyTree effect_tree = 2; optional PropertyTree clip_tree = 3; - optional PropertyTree scroll_tree = 4; + optional PropertyTree scroll_tree = 7; - optional bool needs_rebuild = 5; - optional bool non_root_surfaces_enabled = 6; - optional int64 sequence_number = 7; + optional bool needs_rebuild = 4; + optional bool non_root_surfaces_enabled = 5; + optional int64 sequence_number = 6; } |