| 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/test/layer_tree_test.h" | 5 #include "cc/test/layer_tree_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
| 9 #include "cc/animation/animation_registrar.h" | 9 #include "cc/animation/animation_registrar.h" |
| 10 #include "cc/animation/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
| 11 #include "cc/animation/timing_function.h" | 11 #include "cc/animation/timing_function.h" |
| 12 #include "cc/base/switches.h" | 12 #include "cc/base/switches.h" |
| 13 #include "cc/input/input_handler.h" | 13 #include "cc/input/input_handler.h" |
| 14 #include "cc/layers/content_layer.h" | 14 #include "cc/layers/content_layer.h" |
| 15 #include "cc/layers/layer.h" | 15 #include "cc/layers/layer.h" |
| 16 #include "cc/layers/layer_impl.h" | 16 #include "cc/layers/layer_impl.h" |
| 17 #include "cc/test/animation_test_common.h" | 17 #include "cc/test/animation_test_common.h" |
| 18 #include "cc/test/fake_layer_tree_host_client.h" | 18 #include "cc/test/fake_layer_tree_host_client.h" |
| 19 #include "cc/test/fake_output_surface.h" | 19 #include "cc/test/fake_output_surface.h" |
| 20 #include "cc/test/occlusion_tracker_test_common.h" | |
| 21 #include "cc/test/test_context_provider.h" | 20 #include "cc/test/test_context_provider.h" |
| 22 #include "cc/test/tiled_layer_test_common.h" | 21 #include "cc/test/tiled_layer_test_common.h" |
| 23 #include "cc/trees/layer_tree_host_client.h" | 22 #include "cc/trees/layer_tree_host_client.h" |
| 24 #include "cc/trees/layer_tree_host_impl.h" | 23 #include "cc/trees/layer_tree_host_impl.h" |
| 25 #include "cc/trees/layer_tree_host_single_thread_client.h" | 24 #include "cc/trees/layer_tree_host_single_thread_client.h" |
| 26 #include "cc/trees/layer_tree_impl.h" | 25 #include "cc/trees/layer_tree_impl.h" |
| 27 #include "cc/trees/single_thread_proxy.h" | 26 #include "cc/trees/single_thread_proxy.h" |
| 28 #include "testing/gmock/include/gmock/gmock.h" | 27 #include "testing/gmock/include/gmock/gmock.h" |
| 29 #include "ui/gfx/frame_time.h" | 28 #include "ui/gfx/frame_time.h" |
| 30 #include "ui/gfx/size_conversions.h" | 29 #include "ui/gfx/size_conversions.h" |
| (...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 return -1; | 707 return -1; |
| 709 } | 708 } |
| 710 | 709 |
| 711 void LayerTreeTest::DestroyLayerTreeHost() { | 710 void LayerTreeTest::DestroyLayerTreeHost() { |
| 712 if (layer_tree_host_ && layer_tree_host_->root_layer()) | 711 if (layer_tree_host_ && layer_tree_host_->root_layer()) |
| 713 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); | 712 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); |
| 714 layer_tree_host_.reset(); | 713 layer_tree_host_.reset(); |
| 715 } | 714 } |
| 716 | 715 |
| 717 } // namespace cc | 716 } // namespace cc |
| OLD | NEW |