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/animation_registrar.h" | 8 #include "cc/animation_registrar.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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 virtual void scheduleComposite() OVERRIDE | 205 virtual void scheduleComposite() OVERRIDE |
206 { | 206 { |
207 m_testHooks->scheduleComposite(); | 207 m_testHooks->scheduleComposite(); |
208 } | 208 } |
209 | 209 |
210 virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE | 210 virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE |
211 { | 211 { |
212 return scoped_ptr<FontAtlas>(); | 212 return scoped_ptr<FontAtlas>(); |
213 } | 213 } |
214 | 214 |
| 215 virtual void onReceivedLatencyInfo(const LatencyInfo&) OVERRIDE |
| 216 { |
| 217 } |
| 218 |
215 private: | 219 private: |
216 explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks
(testHooks) { } | 220 explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks
(testHooks) { } |
217 | 221 |
218 TestHooks* m_testHooks; | 222 TestHooks* m_testHooks; |
219 }; | 223 }; |
220 | 224 |
221 ThreadedTest::ThreadedTest() | 225 ThreadedTest::ThreadedTest() |
222 : m_beginning(false) | 226 : m_beginning(false) |
223 , m_endWhenBeginReturns(false) | 227 , m_endWhenBeginReturns(false) |
224 , m_timedOut(false) | 228 , m_timedOut(false) |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
423 ASSERT_FALSE(m_layerTreeHost.get()); | 427 ASSERT_FALSE(m_layerTreeHost.get()); |
424 m_client.reset(); | 428 m_client.reset(); |
425 if (m_timedOut) { | 429 if (m_timedOut) { |
426 FAIL() << "Test timed out"; | 430 FAIL() << "Test timed out"; |
427 return; | 431 return; |
428 } | 432 } |
429 afterTest(); | 433 afterTest(); |
430 } | 434 } |
431 | 435 |
432 } // namespace cc | 436 } // namespace cc |
OLD | NEW |