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/trees/property_tree.cc | |
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/trees/property_tree.cc')
-rw-r--r-- | cc/trees/property_tree.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc index aae88ae..54d885e 100644 --- a/cc/trees/property_tree.cc +++ b/cc/trees/property_tree.cc @@ -471,14 +471,12 @@ void EffectNodeData::FromProtobuf(const proto::TreeNode& proto) { ScrollNodeData::ScrollNodeData() : scrollable(false), should_scroll_on_main_thread(false), - scroll_blocks_on(ScrollBlocksOn::SCROLL_BLOCKS_ON_NONE), contains_non_fast_scrollable_region(false), transform_id(0) {} bool ScrollNodeData::operator==(const ScrollNodeData& other) const { return scrollable == other.scrollable && should_scroll_on_main_thread == other.should_scroll_on_main_thread && - scroll_blocks_on == other.scroll_blocks_on && contains_non_fast_scrollable_region == other.contains_non_fast_scrollable_region && transform_id == other.transform_id; @@ -489,7 +487,6 @@ void ScrollNodeData::ToProtobuf(proto::TreeNode* proto) const { proto::ScrollNodeData* data = proto->mutable_scroll_node_data(); data->set_scrollable(scrollable); data->set_should_scroll_on_main_thread(should_scroll_on_main_thread); - data->set_scroll_blocks_on(scroll_blocks_on); data->set_contains_non_fast_scrollable_region( contains_non_fast_scrollable_region); data->set_transform_id(transform_id); @@ -501,7 +498,6 @@ void ScrollNodeData::FromProtobuf(const proto::TreeNode& proto) { scrollable = data.scrollable(); should_scroll_on_main_thread = data.should_scroll_on_main_thread(); - scroll_blocks_on = (ScrollBlocksOn)data.scroll_blocks_on(); contains_non_fast_scrollable_region = data.contains_non_fast_scrollable_region(); transform_id = data.transform_id(); |