OLD | NEW |
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 Loading... |
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 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 27 CommandLine* command_line = 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 |
OLD | NEW |