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 #ifndef CC_TREES_SCROLL_NODE_H_ | 5 #ifndef CC_TREES_SCROLL_NODE_H_ |
6 #define CC_TREES_SCROLL_NODE_H_ | 6 #define CC_TREES_SCROLL_NODE_H_ |
7 | 7 |
8 #include "cc/base/filter_operations.h" | 8 #include "cc/base/filter_operations.h" |
9 #include "cc/base/region.h" | 9 #include "cc/base/region.h" |
10 #include "cc/cc_export.h" | 10 #include "cc/cc_export.h" |
| 11 #include "cc/input/scroll_boundary_behavior.h" |
11 #include "ui/gfx/geometry/size.h" | 12 #include "ui/gfx/geometry/size.h" |
12 | 13 |
13 namespace base { | 14 namespace base { |
14 namespace trace_event { | 15 namespace trace_event { |
15 class TracedValue; | 16 class TracedValue; |
16 } // namespace trace_event | 17 } // namespace trace_event |
17 } // namespace base | 18 } // namespace base |
18 | 19 |
19 namespace cc { | 20 namespace cc { |
20 | 21 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 bool user_scrollable_horizontal : 1; | 57 bool user_scrollable_horizontal : 1; |
57 bool user_scrollable_vertical : 1; | 58 bool user_scrollable_vertical : 1; |
58 | 59 |
59 // This offset is used when |scrollable| is false and there isn't a transform | 60 // This offset is used when |scrollable| is false and there isn't a transform |
60 // node already present that covers this offset. | 61 // node already present that covers this offset. |
61 gfx::Vector2dF offset_to_transform_parent; | 62 gfx::Vector2dF offset_to_transform_parent; |
62 | 63 |
63 ElementId element_id; | 64 ElementId element_id; |
64 int transform_id; | 65 int transform_id; |
65 | 66 |
| 67 ScrollBoundaryBehavior scroll_boundary_behavior; |
| 68 |
66 bool operator==(const ScrollNode& other) const; | 69 bool operator==(const ScrollNode& other) const; |
67 void AsValueInto(base::trace_event::TracedValue* value) const; | 70 void AsValueInto(base::trace_event::TracedValue* value) const; |
68 }; | 71 }; |
69 | 72 |
70 } // namespace cc | 73 } // namespace cc |
71 | 74 |
72 #endif // CC_TREES_SCROLL_NODE_H_ | 75 #endif // CC_TREES_SCROLL_NODE_H_ |
OLD | NEW |