Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: cc/test/layer_tree_test_common.cc

Issue 12212099: cc: remove FontAtlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to 182043 Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/animation.h" 7 #include "cc/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"
11 #include "cc/input_handler.h" 10 #include "cc/input_handler.h"
12 #include "cc/layer.h" 11 #include "cc/layer.h"
13 #include "cc/layer_animation_controller.h" 12 #include "cc/layer_animation_controller.h"
14 #include "cc/layer_impl.h" 13 #include "cc/layer_impl.h"
15 #include "cc/layer_tree_host_impl.h" 14 #include "cc/layer_tree_host_impl.h"
16 #include "cc/single_thread_proxy.h" 15 #include "cc/single_thread_proxy.h"
17 #include "cc/thread_impl.h" 16 #include "cc/thread_impl.h"
18 #include "cc/test/animation_test_common.h" 17 #include "cc/test/animation_test_common.h"
19 #include "cc/test/fake_output_surface.h" 18 #include "cc/test/fake_output_surface.h"
20 #include "cc/test/occlusion_tracker_test_common.h" 19 #include "cc/test/occlusion_tracker_test_common.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 219
221 virtual void didCompleteSwapBuffers() OVERRIDE 220 virtual void didCompleteSwapBuffers() OVERRIDE
222 { 221 {
223 } 222 }
224 223
225 virtual void scheduleComposite() OVERRIDE 224 virtual void scheduleComposite() OVERRIDE
226 { 225 {
227 m_testHooks->scheduleComposite(); 226 m_testHooks->scheduleComposite();
228 } 227 }
229 228
230 virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE
231 {
232 return scoped_ptr<FontAtlas>();
233 }
234
235 private: 229 private:
236 explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks (testHooks) { } 230 explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks (testHooks) { }
237 231
238 TestHooks* m_testHooks; 232 TestHooks* m_testHooks;
239 }; 233 };
240 234
241 ThreadedTest::ThreadedTest() 235 ThreadedTest::ThreadedTest()
242 : m_beginning(false) 236 : m_beginning(false)
243 , m_endWhenBeginReturns(false) 237 , m_endWhenBeginReturns(false)
244 , m_timedOut(false) 238 , m_timedOut(false)
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 ASSERT_FALSE(m_layerTreeHost.get()); 437 ASSERT_FALSE(m_layerTreeHost.get());
444 m_client.reset(); 438 m_client.reset();
445 if (m_timedOut) { 439 if (m_timedOut) {
446 FAIL() << "Test timed out"; 440 FAIL() << "Test timed out";
447 return; 441 return;
448 } 442 }
449 afterTest(); 443 afterTest();
450 } 444 }
451 445
452 } // namespace cc 446 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_layer_tree_host_client.cc ('k') | content/browser/renderer_host/compositor_impl_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698