| 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" |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 | 573 |
| 574 ASSERT_FALSE(layer_tree_host_.get()); | 574 ASSERT_FALSE(layer_tree_host_.get()); |
| 575 client_.reset(); | 575 client_.reset(); |
| 576 if (timed_out_) { | 576 if (timed_out_) { |
| 577 FAIL() << "Test timed out"; | 577 FAIL() << "Test timed out"; |
| 578 return; | 578 return; |
| 579 } | 579 } |
| 580 AfterTest(); | 580 AfterTest(); |
| 581 } | 581 } |
| 582 | 582 |
| 583 LayerTreeHost* LayerTreeTest::layer_tree_host() { |
| 584 DCHECK(proxy()->IsMainThread() || proxy()->IsMainThreadBlocked()); |
| 585 return layer_tree_host_.get(); |
| 586 } |
| 587 |
| 583 } // namespace cc | 588 } // namespace cc |
| OLD | NEW |