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_impl.h" | 5 #include "cc/layers/layer_impl.h" |
6 | 6 |
| 7 #include "cc/base/filter_operation.h" |
| 8 #include "cc/base/filter_operations.h" |
7 #include "cc/layers/painted_scrollbar_layer_impl.h" | 9 #include "cc/layers/painted_scrollbar_layer_impl.h" |
8 #include "cc/layers/solid_color_scrollbar_layer_impl.h" | 10 #include "cc/layers/solid_color_scrollbar_layer_impl.h" |
9 #include "cc/output/filter_operation.h" | |
10 #include "cc/output/filter_operations.h" | |
11 #include "cc/test/animation_test_common.h" | 11 #include "cc/test/animation_test_common.h" |
12 #include "cc/test/fake_compositor_frame_sink.h" | 12 #include "cc/test/fake_compositor_frame_sink.h" |
13 #include "cc/test/fake_impl_task_runner_provider.h" | 13 #include "cc/test/fake_impl_task_runner_provider.h" |
14 #include "cc/test/fake_layer_tree_host_impl.h" | 14 #include "cc/test/fake_layer_tree_host_impl.h" |
15 #include "cc/test/geometry_test_utils.h" | 15 #include "cc/test/geometry_test_utils.h" |
16 #include "cc/test/test_task_graph_runner.h" | 16 #include "cc/test/test_task_graph_runner.h" |
17 #include "cc/trees/layer_tree_impl.h" | 17 #include "cc/trees/layer_tree_impl.h" |
18 #include "cc/trees/mutable_properties.h" | 18 #include "cc/trees/mutable_properties.h" |
19 #include "cc/trees/single_thread_proxy.h" | 19 #include "cc/trees/single_thread_proxy.h" |
20 #include "cc/trees/tree_synchronizer.h" | 20 #include "cc/trees/tree_synchronizer.h" |
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
580 | 580 |
581 pending_layer->PushPropertiesTo(layer()); | 581 pending_layer->PushPropertiesTo(layer()); |
582 | 582 |
583 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); | 583 EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset()); |
584 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), | 584 EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(), |
585 pending_layer->CurrentScrollOffset()); | 585 pending_layer->CurrentScrollOffset()); |
586 } | 586 } |
587 | 587 |
588 } // namespace | 588 } // namespace |
589 } // namespace cc | 589 } // namespace cc |
OLD | NEW |