| 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/run_loop.h" |
| 10 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 11 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
| 12 #include "cc/animation/animation.h" | 13 #include "cc/animation/animation.h" |
| 13 #include "cc/animation/animation_host.h" | 14 #include "cc/animation/animation_host.h" |
| 14 #include "cc/animation/element_animations.h" | 15 #include "cc/animation/element_animations.h" |
| 15 #include "cc/animation/timing_function.h" | 16 #include "cc/animation/timing_function.h" |
| 16 #include "cc/base/switches.h" | 17 #include "cc/base/switches.h" |
| 17 #include "cc/input/input_handler.h" | 18 #include "cc/input/input_handler.h" |
| 18 #include "cc/layers/layer.h" | 19 #include "cc/layers/layer.h" |
| 19 #include "cc/layers/layer_impl.h" | 20 #include "cc/layers/layer_impl.h" |
| (...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 881 base::Bind(&LayerTreeTest::DoBeginTest, base::Unretained(this))); | 882 base::Bind(&LayerTreeTest::DoBeginTest, base::Unretained(this))); |
| 882 | 883 |
| 883 if (timeout_seconds_) { | 884 if (timeout_seconds_) { |
| 884 timeout_.Reset(base::Bind(&LayerTreeTest::Timeout, base::Unretained(this))); | 885 timeout_.Reset(base::Bind(&LayerTreeTest::Timeout, base::Unretained(this))); |
| 885 main_task_runner_->PostDelayedTask( | 886 main_task_runner_->PostDelayedTask( |
| 886 FROM_HERE, | 887 FROM_HERE, |
| 887 timeout_.callback(), | 888 timeout_.callback(), |
| 888 base::TimeDelta::FromSeconds(timeout_seconds_)); | 889 base::TimeDelta::FromSeconds(timeout_seconds_)); |
| 889 } | 890 } |
| 890 | 891 |
| 891 base::MessageLoop::current()->Run(); | 892 base::RunLoop().Run(); |
| 892 DestroyLayerTreeHost(); | 893 DestroyLayerTreeHost(); |
| 893 | 894 |
| 894 timeout_.Cancel(); | 895 timeout_.Cancel(); |
| 895 | 896 |
| 896 ASSERT_FALSE(layer_tree_host_.get()); | 897 ASSERT_FALSE(layer_tree_host_.get()); |
| 897 client_ = nullptr; | 898 client_ = nullptr; |
| 898 if (timed_out_) { | 899 if (timed_out_) { |
| 899 FAIL() << "Test timed out"; | 900 FAIL() << "Test timed out"; |
| 900 return; | 901 return; |
| 901 } | 902 } |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1037 | 1038 |
| 1038 RemoteChannelImplForTest* LayerTreeTest::GetRemoteChannelImplForTest() const { | 1039 RemoteChannelImplForTest* LayerTreeTest::GetRemoteChannelImplForTest() const { |
| 1039 DCHECK(IsRemoteTest()); | 1040 DCHECK(IsRemoteTest()); |
| 1040 DCHECK(remote_client_layer_tree_host_); | 1041 DCHECK(remote_client_layer_tree_host_); |
| 1041 | 1042 |
| 1042 return static_cast<RemoteChannelImplForTest*>( | 1043 return static_cast<RemoteChannelImplForTest*>( |
| 1043 remote_client_layer_tree_host_->proxy()); | 1044 remote_client_layer_tree_host_->proxy()); |
| 1044 } | 1045 } |
| 1045 | 1046 |
| 1046 } // namespace cc | 1047 } // namespace cc |
| OLD | NEW |