| 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> |
| 8 |
| 7 #include "base/thread_task_runner_handle.h" | 9 #include "base/thread_task_runner_handle.h" |
| 8 #include "cc/animation/keyframed_animation_curve.h" | 10 #include "cc/animation/keyframed_animation_curve.h" |
| 9 #include "cc/animation/mutable_properties.h" | 11 #include "cc/animation/mutable_properties.h" |
| 10 #include "cc/base/math_util.h" | 12 #include "cc/base/math_util.h" |
| 11 #include "cc/layers/layer_impl.h" | 13 #include "cc/layers/layer_impl.h" |
| 12 #include "cc/layers/layer_settings.h" | 14 #include "cc/layers/layer_settings.h" |
| 13 #include "cc/output/copy_output_request.h" | 15 #include "cc/output/copy_output_request.h" |
| 14 #include "cc/output/copy_output_result.h" | 16 #include "cc/output/copy_output_result.h" |
| 15 #include "cc/proto/layer.pb.h" | 17 #include "cc/proto/layer.pb.h" |
| 16 #include "cc/test/animation_test_common.h" | 18 #include "cc/test/animation_test_common.h" |
| (...skipping 2049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2066 EXPECT_EQ(kMutablePropertyNone, impl_layer->mutable_properties()); | 2068 EXPECT_EQ(kMutablePropertyNone, impl_layer->mutable_properties()); |
| 2067 | 2069 |
| 2068 test_layer->PushPropertiesTo(impl_layer.get()); | 2070 test_layer->PushPropertiesTo(impl_layer.get()); |
| 2069 | 2071 |
| 2070 EXPECT_EQ(2lu, impl_layer->element_id()); | 2072 EXPECT_EQ(2lu, impl_layer->element_id()); |
| 2071 EXPECT_EQ(kMutablePropertyTransform, impl_layer->mutable_properties()); | 2073 EXPECT_EQ(kMutablePropertyTransform, impl_layer->mutable_properties()); |
| 2072 } | 2074 } |
| 2073 | 2075 |
| 2074 } // namespace | 2076 } // namespace |
| 2075 } // namespace cc | 2077 } // namespace cc |
| OLD | NEW |