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

Side by Side Diff: ui/compositor/test/context_factories_for_test.cc

Issue 638653003: Make ui::Compositor use ui::Scheduler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« no previous file with comments | « ui/compositor/layer_unittest.cc ('k') | ui/compositor/test/draw_waiter_for_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/compositor/test/context_factories_for_test.h" 5 #include "ui/compositor/test/context_factories_for_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/sys_info.h" 8 #include "base/sys_info.h"
9 #include "ui/compositor/compositor.h" 9 #include "ui/compositor/compositor.h"
10 #include "ui/compositor/compositor_switches.h" 10 #include "ui/compositor/compositor_switches.h"
(...skipping 11 matching lines...) Expand all
22 22
23 // static 23 // static
24 ui::ContextFactory* InitializeContextFactoryForTests(bool enable_pixel_output) { 24 ui::ContextFactory* InitializeContextFactoryForTests(bool enable_pixel_output) {
25 DCHECK(!g_implicit_factory) << 25 DCHECK(!g_implicit_factory) <<
26 "ContextFactory for tests already initialized."; 26 "ContextFactory for tests already initialized.";
27 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 27 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
28 if (command_line->HasSwitch(switches::kEnablePixelOutputInTests)) 28 if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
29 enable_pixel_output = true; 29 enable_pixel_output = true;
30 if (enable_pixel_output) 30 if (enable_pixel_output)
31 g_disable_null_draw = new gfx::DisableNullDrawGLBindings; 31 g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
32 g_implicit_factory = new InProcessContextFactory(); 32 bool context_factory_for_test = true;
33 g_implicit_factory = new InProcessContextFactory(context_factory_for_test);
33 return g_implicit_factory; 34 return g_implicit_factory;
34 } 35 }
35 36
36 void TerminateContextFactoryForTests() { 37 void TerminateContextFactoryForTests() {
37 delete g_implicit_factory; 38 delete g_implicit_factory;
38 g_implicit_factory = NULL; 39 g_implicit_factory = NULL;
39 delete g_disable_null_draw; 40 delete g_disable_null_draw;
40 g_disable_null_draw = NULL; 41 g_disable_null_draw = NULL;
41 } 42 }
42 43
43 } // namespace ui 44 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/layer_unittest.cc ('k') | ui/compositor/test/draw_waiter_for_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698