| 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_common.h" | 5 #include "cc/test/layer_tree_test_common.h" |
| 6 | 6 |
| 7 #include "cc/active_animation.h" | 7 #include "cc/active_animation.h" |
| 8 #include "cc/content_layer.h" | 8 #include "cc/content_layer.h" |
| 9 #include "cc/font_atlas.h" | 9 #include "cc/font_atlas.h" |
| 10 #include "cc/input_handler.h" | 10 #include "cc/input_handler.h" |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 | 296 |
| 297 m_started = true; | 297 m_started = true; |
| 298 m_beginning = true; | 298 m_beginning = true; |
| 299 setupTree(); | 299 setupTree(); |
| 300 m_layerTreeHost->setSurfaceReady(); | 300 m_layerTreeHost->setSurfaceReady(); |
| 301 beginTest(); | 301 beginTest(); |
| 302 m_beginning = false; | 302 m_beginning = false; |
| 303 if (m_endWhenBeginReturns) | 303 if (m_endWhenBeginReturns) |
| 304 realEndTest(); | 304 realEndTest(); |
| 305 | 305 |
| 306 LayerTreeHost::setNeedsFilterContext(false); |
| 307 |
| 306 // Allow commits to happen once beginTest() has had a chance to post tasks | 308 // Allow commits to happen once beginTest() has had a chance to post tasks |
| 307 // so that those tasks will happen before the first commit. | 309 // so that those tasks will happen before the first commit. |
| 308 if (m_layerTreeHost) | 310 if (m_layerTreeHost) |
| 309 static_cast<MockLayerTreeHost*>(m_layerTreeHost.get())->setTestStarted(t
rue); | 311 static_cast<MockLayerTreeHost*>(m_layerTreeHost.get())->setTestStarted(t
rue); |
| 310 } | 312 } |
| 311 | 313 |
| 312 void ThreadedTest::setupTree() | 314 void ThreadedTest::setupTree() |
| 313 { | 315 { |
| 314 if (!m_layerTreeHost->rootLayer()) { | 316 if (!m_layerTreeHost->rootLayer()) { |
| 315 scoped_refptr<Layer> rootLayer = Layer::create(); | 317 scoped_refptr<Layer> rootLayer = Layer::create(); |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 ASSERT_FALSE(m_layerTreeHost.get()); | 446 ASSERT_FALSE(m_layerTreeHost.get()); |
| 445 m_client.reset(); | 447 m_client.reset(); |
| 446 if (m_timedOut) { | 448 if (m_timedOut) { |
| 447 FAIL() << "Test timed out"; | 449 FAIL() << "Test timed out"; |
| 448 return; | 450 return; |
| 449 } | 451 } |
| 450 afterTest(); | 452 afterTest(); |
| 451 } | 453 } |
| 452 | 454 |
| 453 } // namespace cc | 455 } // namespace cc |
| OLD | NEW |