OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "base/trace_event/trace_event_argument.h" | 5 #include "base/trace_event/trace_event_argument.h" |
6 #include "cc/base/math_util.h" | 6 #include "cc/base/math_util.h" |
7 #include "cc/input/main_thread_scrolling_reason.h" | 7 #include "cc/input/main_thread_scrolling_reason.h" |
8 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
9 #include "cc/trees/element_id.h" | 9 #include "cc/trees/element_id.h" |
10 #include "cc/trees/property_tree.h" | 10 #include "cc/trees/property_tree.h" |
11 #include "cc/trees/scroll_node.h" | 11 #include "cc/trees/scroll_node.h" |
12 | 12 |
13 namespace cc { | 13 namespace cc { |
14 | 14 |
15 ScrollNode::ScrollNode() | 15 ScrollNode::ScrollNode() |
16 : id(ScrollTree::kInvalidNodeId), | 16 : id(ScrollTree::kInvalidNodeId), |
17 parent_id(ScrollTree::kInvalidNodeId), | 17 parent_id(ScrollTree::kInvalidNodeId), |
18 owning_layer_id(Layer::INVALID_ID), | 18 owning_layer_id(Layer::INVALID_ID), |
19 main_thread_scrolling_reasons( | 19 main_thread_scrolling_reasons( |
20 MainThreadScrollingReason::kNotScrollingOnMain), | 20 MainThreadScrollingReason::kNotScrollingOnMain), |
21 scrollable(false), | 21 scrollable(false), |
22 max_scroll_offset_affected_by_page_scale(false), | 22 max_scroll_offset_affected_by_page_scale(false), |
23 scrolls_inner_viewport(false), | 23 scrolls_inner_viewport(false), |
24 scrolls_outer_viewport(false), | 24 scrolls_outer_viewport(false), |
25 should_flatten(false), | 25 should_flatten(false), |
26 user_scrollable_horizontal(false), | 26 user_scrollable_horizontal(false), |
27 user_scrollable_vertical(false), | 27 user_scrollable_vertical(false), |
28 transform_id(0) {} | 28 transform_id(0), |
| 29 scroll_boundary_behavior( |
| 30 ScrollBoundaryBehavior::kScrollBoundaryBehaviorTypeAuto) {} |
29 | 31 |
30 ScrollNode::ScrollNode(const ScrollNode& other) = default; | 32 ScrollNode::ScrollNode(const ScrollNode& other) = default; |
31 | 33 |
32 bool ScrollNode::operator==(const ScrollNode& other) const { | 34 bool ScrollNode::operator==(const ScrollNode& other) const { |
33 return id == other.id && parent_id == other.parent_id && | 35 return id == other.id && parent_id == other.parent_id && |
34 owning_layer_id == other.owning_layer_id && | 36 owning_layer_id == other.owning_layer_id && |
35 scrollable == other.scrollable && | 37 scrollable == other.scrollable && |
36 main_thread_scrolling_reasons == other.main_thread_scrolling_reasons && | 38 main_thread_scrolling_reasons == other.main_thread_scrolling_reasons && |
37 non_fast_scrollable_region == other.non_fast_scrollable_region && | 39 non_fast_scrollable_region == other.non_fast_scrollable_region && |
38 scroll_clip_layer_bounds == other.scroll_clip_layer_bounds && | 40 scroll_clip_layer_bounds == other.scroll_clip_layer_bounds && |
39 bounds == other.bounds && | 41 bounds == other.bounds && |
40 max_scroll_offset_affected_by_page_scale == | 42 max_scroll_offset_affected_by_page_scale == |
41 other.max_scroll_offset_affected_by_page_scale && | 43 other.max_scroll_offset_affected_by_page_scale && |
42 scrolls_inner_viewport == other.scrolls_inner_viewport && | 44 scrolls_inner_viewport == other.scrolls_inner_viewport && |
43 scrolls_outer_viewport == other.scrolls_outer_viewport && | 45 scrolls_outer_viewport == other.scrolls_outer_viewport && |
44 offset_to_transform_parent == other.offset_to_transform_parent && | 46 offset_to_transform_parent == other.offset_to_transform_parent && |
45 should_flatten == other.should_flatten && | 47 should_flatten == other.should_flatten && |
46 user_scrollable_horizontal == other.user_scrollable_horizontal && | 48 user_scrollable_horizontal == other.user_scrollable_horizontal && |
47 user_scrollable_vertical == other.user_scrollable_vertical && | 49 user_scrollable_vertical == other.user_scrollable_vertical && |
48 element_id == other.element_id && transform_id == other.transform_id; | 50 element_id == other.element_id && transform_id == other.transform_id && |
| 51 scroll_boundary_behavior == other.scroll_boundary_behavior; |
49 } | 52 } |
50 | 53 |
51 void ScrollNode::AsValueInto(base::trace_event::TracedValue* value) const { | 54 void ScrollNode::AsValueInto(base::trace_event::TracedValue* value) const { |
52 value->SetInteger("id", id); | 55 value->SetInteger("id", id); |
53 value->SetInteger("parent_id", parent_id); | 56 value->SetInteger("parent_id", parent_id); |
54 value->SetInteger("owning_layer_id", owning_layer_id); | 57 value->SetInteger("owning_layer_id", owning_layer_id); |
55 value->SetBoolean("scrollable", scrollable); | 58 value->SetBoolean("scrollable", scrollable); |
56 MathUtil::AddToTracedValue("scroll_clip_layer_bounds", | 59 MathUtil::AddToTracedValue("scroll_clip_layer_bounds", |
57 scroll_clip_layer_bounds, value); | 60 scroll_clip_layer_bounds, value); |
58 MathUtil::AddToTracedValue("bounds", bounds, value); | 61 MathUtil::AddToTracedValue("bounds", bounds, value); |
59 MathUtil::AddToTracedValue("offset_to_transform_parent", | 62 MathUtil::AddToTracedValue("offset_to_transform_parent", |
60 offset_to_transform_parent, value); | 63 offset_to_transform_parent, value); |
61 value->SetBoolean("should_flatten", should_flatten); | 64 value->SetBoolean("should_flatten", should_flatten); |
62 value->SetBoolean("user_scrollable_horizontal", user_scrollable_horizontal); | 65 value->SetBoolean("user_scrollable_horizontal", user_scrollable_horizontal); |
63 value->SetBoolean("user_scrollable_vertical", user_scrollable_vertical); | 66 value->SetBoolean("user_scrollable_vertical", user_scrollable_vertical); |
64 | 67 |
65 element_id.AddToTracedValue(value); | 68 element_id.AddToTracedValue(value); |
66 value->SetInteger("transform_id", transform_id); | 69 value->SetInteger("transform_id", transform_id); |
| 70 value->SetInteger("scroll_boundary_behavior_x", scroll_boundary_behavior.x); |
| 71 value->SetInteger("scroll_boundary_behavior_y", scroll_boundary_behavior.y); |
67 } | 72 } |
68 | 73 |
69 } // namespace cc | 74 } // namespace cc |
OLD | NEW |