| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 is_drawn = data.is_drawn(); | 464 is_drawn = data.is_drawn(); |
| 465 screen_space_opacity_is_animating = data.screen_space_opacity_is_animating(); | 465 screen_space_opacity_is_animating = data.screen_space_opacity_is_animating(); |
| 466 num_copy_requests_in_subtree = data.num_copy_requests_in_subtree(); | 466 num_copy_requests_in_subtree = data.num_copy_requests_in_subtree(); |
| 467 transform_id = data.transform_id(); | 467 transform_id = data.transform_id(); |
| 468 clip_id = data.clip_id(); | 468 clip_id = data.clip_id(); |
| 469 } | 469 } |
| 470 | 470 |
| 471 ScrollNodeData::ScrollNodeData() | 471 ScrollNodeData::ScrollNodeData() |
| 472 : scrollable(false), | 472 : scrollable(false), |
| 473 should_scroll_on_main_thread(false), | 473 should_scroll_on_main_thread(false), |
| 474 scroll_blocks_on(ScrollBlocksOn::SCROLL_BLOCKS_ON_NONE), | |
| 475 contains_non_fast_scrollable_region(false), | 474 contains_non_fast_scrollable_region(false), |
| 476 transform_id(0) {} | 475 transform_id(0) {} |
| 477 | 476 |
| 478 bool ScrollNodeData::operator==(const ScrollNodeData& other) const { | 477 bool ScrollNodeData::operator==(const ScrollNodeData& other) const { |
| 479 return scrollable == other.scrollable && | 478 return scrollable == other.scrollable && |
| 480 should_scroll_on_main_thread == other.should_scroll_on_main_thread && | 479 should_scroll_on_main_thread == other.should_scroll_on_main_thread && |
| 481 scroll_blocks_on == other.scroll_blocks_on && | |
| 482 contains_non_fast_scrollable_region == | 480 contains_non_fast_scrollable_region == |
| 483 other.contains_non_fast_scrollable_region && | 481 other.contains_non_fast_scrollable_region && |
| 484 transform_id == other.transform_id; | 482 transform_id == other.transform_id; |
| 485 } | 483 } |
| 486 | 484 |
| 487 void ScrollNodeData::ToProtobuf(proto::TreeNode* proto) const { | 485 void ScrollNodeData::ToProtobuf(proto::TreeNode* proto) const { |
| 488 DCHECK(!proto->has_scroll_node_data()); | 486 DCHECK(!proto->has_scroll_node_data()); |
| 489 proto::ScrollNodeData* data = proto->mutable_scroll_node_data(); | 487 proto::ScrollNodeData* data = proto->mutable_scroll_node_data(); |
| 490 data->set_scrollable(scrollable); | 488 data->set_scrollable(scrollable); |
| 491 data->set_should_scroll_on_main_thread(should_scroll_on_main_thread); | 489 data->set_should_scroll_on_main_thread(should_scroll_on_main_thread); |
| 492 data->set_scroll_blocks_on(scroll_blocks_on); | |
| 493 data->set_contains_non_fast_scrollable_region( | 490 data->set_contains_non_fast_scrollable_region( |
| 494 contains_non_fast_scrollable_region); | 491 contains_non_fast_scrollable_region); |
| 495 data->set_transform_id(transform_id); | 492 data->set_transform_id(transform_id); |
| 496 } | 493 } |
| 497 | 494 |
| 498 void ScrollNodeData::FromProtobuf(const proto::TreeNode& proto) { | 495 void ScrollNodeData::FromProtobuf(const proto::TreeNode& proto) { |
| 499 DCHECK(proto.has_scroll_node_data()); | 496 DCHECK(proto.has_scroll_node_data()); |
| 500 const proto::ScrollNodeData& data = proto.scroll_node_data(); | 497 const proto::ScrollNodeData& data = proto.scroll_node_data(); |
| 501 | 498 |
| 502 scrollable = data.scrollable(); | 499 scrollable = data.scrollable(); |
| 503 should_scroll_on_main_thread = data.should_scroll_on_main_thread(); | 500 should_scroll_on_main_thread = data.should_scroll_on_main_thread(); |
| 504 scroll_blocks_on = (ScrollBlocksOn)data.scroll_blocks_on(); | |
| 505 contains_non_fast_scrollable_region = | 501 contains_non_fast_scrollable_region = |
| 506 data.contains_non_fast_scrollable_region(); | 502 data.contains_non_fast_scrollable_region(); |
| 507 transform_id = data.transform_id(); | 503 transform_id = data.transform_id(); |
| 508 } | 504 } |
| 509 | 505 |
| 510 void TransformTree::clear() { | 506 void TransformTree::clear() { |
| 511 PropertyTree<TransformNode>::clear(); | 507 PropertyTree<TransformNode>::clear(); |
| 512 | 508 |
| 513 nodes_affected_by_inner_viewport_bounds_delta_.clear(); | 509 nodes_affected_by_inner_viewport_bounds_delta_.clear(); |
| 514 nodes_affected_by_outer_viewport_bounds_delta_.clear(); | 510 nodes_affected_by_outer_viewport_bounds_delta_.clear(); |
| (...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1261 effect_tree.FromProtobuf(proto.effect_tree()); | 1257 effect_tree.FromProtobuf(proto.effect_tree()); |
| 1262 clip_tree.FromProtobuf(proto.clip_tree()); | 1258 clip_tree.FromProtobuf(proto.clip_tree()); |
| 1263 scroll_tree.FromProtobuf(proto.scroll_tree()); | 1259 scroll_tree.FromProtobuf(proto.scroll_tree()); |
| 1264 | 1260 |
| 1265 needs_rebuild = proto.needs_rebuild(); | 1261 needs_rebuild = proto.needs_rebuild(); |
| 1266 non_root_surfaces_enabled = proto.non_root_surfaces_enabled(); | 1262 non_root_surfaces_enabled = proto.non_root_surfaces_enabled(); |
| 1267 sequence_number = proto.sequence_number(); | 1263 sequence_number = proto.sequence_number(); |
| 1268 } | 1264 } |
| 1269 | 1265 |
| 1270 } // namespace cc | 1266 } // namespace cc |
| OLD | NEW |