OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "cc/layers/layer.h" | 5 #include "cc/layers/layer.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
10 #include "cc/animation/animation_host.h" | 11 #include "cc/animation/animation_host.h" |
11 #include "cc/animation/animation_id_provider.h" | 12 #include "cc/animation/animation_id_provider.h" |
12 #include "cc/animation/keyframed_animation_curve.h" | 13 #include "cc/animation/keyframed_animation_curve.h" |
13 #include "cc/base/math_util.h" | 14 #include "cc/base/math_util.h" |
14 #include "cc/input/main_thread_scrolling_reason.h" | 15 #include "cc/input/main_thread_scrolling_reason.h" |
15 #include "cc/layers/layer_impl.h" | 16 #include "cc/layers/layer_impl.h" |
16 #include "cc/layers/solid_color_scrollbar_layer.h" | 17 #include "cc/layers/solid_color_scrollbar_layer.h" |
17 #include "cc/output/copy_output_request.h" | 18 #include "cc/output/copy_output_request.h" |
18 #include "cc/output/copy_output_result.h" | 19 #include "cc/output/copy_output_result.h" |
(...skipping 1406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1425 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); | 1426 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); |
1426 | 1427 |
1427 test_layer->PushPropertiesTo(impl_layer.get()); | 1428 test_layer->PushPropertiesTo(impl_layer.get()); |
1428 | 1429 |
1429 EXPECT_EQ(ElementId(2, 0), impl_layer->element_id()); | 1430 EXPECT_EQ(ElementId(2, 0), impl_layer->element_id()); |
1430 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); | 1431 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); |
1431 } | 1432 } |
1432 | 1433 |
1433 } // namespace | 1434 } // namespace |
1434 } // namespace cc | 1435 } // namespace cc |
OLD | NEW |