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_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_ | 5 #ifndef CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_ |
6 #define CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_ | 6 #define CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "cc/base/filter_operations.h" | 12 #include "cc/base/filter_operations.h" |
13 #include "cc/input/scroll_boundary_behavior.h" | |
13 #include "cc/layers/layer_collections.h" | 14 #include "cc/layers/layer_collections.h" |
14 #include "cc/layers/layer_position_constraint.h" | 15 #include "cc/layers/layer_position_constraint.h" |
15 #include "cc/layers/layer_sticky_position_constraint.h" | 16 #include "cc/layers/layer_sticky_position_constraint.h" |
16 #include "third_party/skia/include/core/SkBlendMode.h" | 17 #include "third_party/skia/include/core/SkBlendMode.h" |
17 #include "ui/gfx/geometry/point3_f.h" | 18 #include "ui/gfx/geometry/point3_f.h" |
18 #include "ui/gfx/transform.h" | 19 #include "ui/gfx/transform.h" |
19 | 20 |
20 namespace cc { | 21 namespace cc { |
21 | 22 |
22 class CopyOutputRequest; | 23 class CopyOutputRequest; |
(...skipping 28 matching lines...) Expand all Loading... | |
51 LayerImpl* scroll_parent; | 52 LayerImpl* scroll_parent; |
52 std::unique_ptr<std::set<LayerImpl*>> scroll_children; | 53 std::unique_ptr<std::set<LayerImpl*>> scroll_children; |
53 LayerImpl* clip_parent; | 54 LayerImpl* clip_parent; |
54 std::unique_ptr<std::set<LayerImpl*>> clip_children; | 55 std::unique_ptr<std::set<LayerImpl*>> clip_children; |
55 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests; | 56 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests; |
56 LayerImplList children; | 57 LayerImplList children; |
57 LayerImpl* mask_layer; | 58 LayerImpl* mask_layer; |
58 LayerImpl* parent; | 59 LayerImpl* parent; |
59 bool user_scrollable_horizontal = true; | 60 bool user_scrollable_horizontal = true; |
60 bool user_scrollable_vertical = true; | 61 bool user_scrollable_vertical = true; |
62 ScrollBoundaryBehavior scroll_boundary_behavior; | |
ajuma
2017/07/14 15:04:48
This needs to be initialized.
sunyunjia
2017/07/14 22:07:23
Done.
| |
61 }; | 63 }; |
62 | 64 |
63 } // namespace cc | 65 } // namespace cc |
64 | 66 |
65 #endif // CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_ | 67 #endif // CC_LAYERS_LAYER_IMPL_TEST_PROPERTIES_H_ |
OLD | NEW |