| 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 "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "cc/active_animation.h" | 8 #include "cc/active_animation.h" |
| 9 #include "cc/content_layer.h" | 9 #include "cc/content_layer.h" |
| 10 #include "cc/font_atlas.h" | 10 #include "cc/font_atlas.h" |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 virtual void scheduleComposite() OVERRIDE | 255 virtual void scheduleComposite() OVERRIDE |
| 256 { | 256 { |
| 257 m_testHooks->scheduleComposite(); | 257 m_testHooks->scheduleComposite(); |
| 258 } | 258 } |
| 259 | 259 |
| 260 virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE | 260 virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE |
| 261 { | 261 { |
| 262 return scoped_ptr<FontAtlas>(); | 262 return scoped_ptr<FontAtlas>(); |
| 263 } | 263 } |
| 264 | 264 |
| 265 virtual void onReceivedLatencyInfo(const WebKit::WebLatencyInfoImpl&) OVERRI
DE |
| 266 { |
| 267 } |
| 268 |
| 265 private: | 269 private: |
| 266 explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks
(testHooks) { } | 270 explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks
(testHooks) { } |
| 267 | 271 |
| 268 TestHooks* m_testHooks; | 272 TestHooks* m_testHooks; |
| 269 }; | 273 }; |
| 270 | 274 |
| 271 ThreadedTest::ThreadedTest() | 275 ThreadedTest::ThreadedTest() |
| 272 : m_beginning(false) | 276 : m_beginning(false) |
| 273 , m_endWhenBeginReturns(false) | 277 , m_endWhenBeginReturns(false) |
| 274 , m_timedOut(false) | 278 , m_timedOut(false) |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 ASSERT_FALSE(m_layerTreeHost.get()); | 509 ASSERT_FALSE(m_layerTreeHost.get()); |
| 506 m_client.reset(); | 510 m_client.reset(); |
| 507 if (m_timedOut) { | 511 if (m_timedOut) { |
| 508 FAIL() << "Test timed out"; | 512 FAIL() << "Test timed out"; |
| 509 return; | 513 return; |
| 510 } | 514 } |
| 511 afterTest(); | 515 afterTest(); |
| 512 } | 516 } |
| 513 | 517 |
| 514 } // namespace cc | 518 } // namespace cc |
| OLD | NEW |