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 <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "cc/animation/layer_animation_controller.h" | 13 #include "cc/animation/layer_animation_controller.h" |
14 #include "cc/layers/layer.h" | 14 #include "cc/layers/layer.h" |
15 #include "cc/layers/layer_impl.h" | 15 #include "cc/layers/layer_impl.h" |
16 #include "cc/test/animation_test_common.h" | 16 #include "cc/test/animation_test_common.h" |
17 #include "cc/test/fake_impl_proxy.h" | 17 #include "cc/test/fake_impl_proxy.h" |
18 #include "cc/test/fake_layer_tree_host.h" | 18 #include "cc/test/fake_layer_tree_host.h" |
| 19 #include "cc/test/fake_rendering_stats_instrumentation.h" |
19 #include "cc/test/test_shared_bitmap_manager.h" | 20 #include "cc/test/test_shared_bitmap_manager.h" |
20 #include "cc/trees/proxy.h" | 21 #include "cc/trees/proxy.h" |
21 #include "cc/trees/single_thread_proxy.h" | 22 #include "cc/trees/single_thread_proxy.h" |
22 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
23 | 24 |
24 namespace cc { | 25 namespace cc { |
25 namespace { | 26 namespace { |
26 | 27 |
27 class MockLayerImpl : public LayerImpl { | 28 class MockLayerImpl : public LayerImpl { |
28 public: | 29 public: |
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
742 host_impl->active_tree()); | 743 host_impl->active_tree()); |
743 | 744 |
744 // The clip children should have been unhooked. | 745 // The clip children should have been unhooked. |
745 EXPECT_EQ(2u, intervening->children().size()); | 746 EXPECT_EQ(2u, intervening->children().size()); |
746 EXPECT_FALSE(clip_child2->clip_parent()); | 747 EXPECT_FALSE(clip_child2->clip_parent()); |
747 EXPECT_FALSE(additional_clip_child->clip_parent()); | 748 EXPECT_FALSE(additional_clip_child->clip_parent()); |
748 } | 749 } |
749 | 750 |
750 } // namespace | 751 } // namespace |
751 } // namespace cc | 752 } // namespace cc |
OLD | NEW |