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/trees/tree_synchronizer.h" | 5 #include "cc/trees/tree_synchronizer.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <set> | 10 #include <set> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
13 #include "base/format_macros.h" | 13 #include "base/format_macros.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "base/strings/stringprintf.h" | 15 #include "base/strings/stringprintf.h" |
| 16 #include "base/threading/thread_task_runner_handle.h" |
16 #include "cc/animation/animation_host.h" | 17 #include "cc/animation/animation_host.h" |
17 #include "cc/layers/layer.h" | 18 #include "cc/layers/layer.h" |
18 #include "cc/layers/layer_impl.h" | 19 #include "cc/layers/layer_impl.h" |
19 #include "cc/test/animation_test_common.h" | 20 #include "cc/test/animation_test_common.h" |
20 #include "cc/test/fake_impl_task_runner_provider.h" | 21 #include "cc/test/fake_impl_task_runner_provider.h" |
21 #include "cc/test/fake_layer_tree_host.h" | 22 #include "cc/test/fake_layer_tree_host.h" |
22 #include "cc/test/fake_rendering_stats_instrumentation.h" | 23 #include "cc/test/fake_rendering_stats_instrumentation.h" |
23 #include "cc/test/stub_layer_tree_host_single_thread_client.h" | 24 #include "cc/test/stub_layer_tree_host_single_thread_client.h" |
24 #include "cc/test/test_task_graph_runner.h" | 25 #include "cc/test/test_task_graph_runner.h" |
25 #include "cc/trees/effect_node.h" | 26 #include "cc/trees/effect_node.h" |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 host_->CommitAndCreatePendingTree(); | 663 host_->CommitAndCreatePendingTree(); |
663 host_impl->ActivateSyncTree(); | 664 host_impl->ActivateSyncTree(); |
664 EXPECT_EQ( | 665 EXPECT_EQ( |
665 CombinedAnimationScale(0.f, 0.f), | 666 CombinedAnimationScale(0.f, 0.f), |
666 host_impl->active_tree()->property_trees()->GetAnimationScales( | 667 host_impl->active_tree()->property_trees()->GetAnimationScales( |
667 transform_layer->transform_tree_index(), host_impl->active_tree())); | 668 transform_layer->transform_tree_index(), host_impl->active_tree())); |
668 } | 669 } |
669 | 670 |
670 } // namespace | 671 } // namespace |
671 } // namespace cc | 672 } // namespace cc |
OLD | NEW |