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 "base/location.h" | 8 #include "base/location.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/message_loop/message_loop.h" |
10 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
11 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
12 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
13 #include "cc/animation/animation.h" | 14 #include "cc/animation/animation.h" |
14 #include "cc/animation/animation_host.h" | 15 #include "cc/animation/animation_host.h" |
15 #include "cc/animation/animation_player.h" | 16 #include "cc/animation/animation_player.h" |
16 #include "cc/animation/timing_function.h" | 17 #include "cc/animation/timing_function.h" |
17 #include "cc/base/switches.h" | 18 #include "cc/base/switches.h" |
18 #include "cc/input/input_handler.h" | 19 #include "cc/input/input_handler.h" |
19 #include "cc/layers/layer.h" | 20 #include "cc/layers/layer.h" |
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
899 DCHECK(task_runner_provider()->IsMainThread() || | 900 DCHECK(task_runner_provider()->IsMainThread() || |
900 task_runner_provider()->IsMainThreadBlocked()); | 901 task_runner_provider()->IsMainThreadBlocked()); |
901 return layer_tree_host_.get(); | 902 return layer_tree_host_.get(); |
902 } | 903 } |
903 | 904 |
904 Proxy* LayerTreeTest::proxy() { | 905 Proxy* LayerTreeTest::proxy() { |
905 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; | 906 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; |
906 } | 907 } |
907 | 908 |
908 } // namespace cc | 909 } // namespace cc |
OLD | NEW |