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

Unified Diff: ui/compositor/test/context_factories_for_test.cc

Issue 285373012: Temporarily adds another constructor to Compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/test/context_factories_for_test.h ('k') | ui/compositor/test/test_compositor_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/context_factories_for_test.cc
diff --git a/ui/compositor/test/context_factories_for_test.cc b/ui/compositor/test/context_factories_for_test.cc
index 045739d0a6551f8decb447b81569c2b6ea1a045d..dbee78cf4e98e8b213f2303a40ec8e3693f657ad 100644
--- a/ui/compositor/test/context_factories_for_test.cc
+++ b/ui/compositor/test/context_factories_for_test.cc
@@ -21,7 +21,7 @@ static gfx::DisableNullDrawGLBindings* g_disable_null_draw = NULL;
namespace ui {
// static
-void InitializeContextFactoryForTests(bool enable_pixel_output) {
+ui::ContextFactory* InitializeContextFactoryForTests(bool enable_pixel_output) {
DCHECK(!g_implicit_factory) <<
"ContextFactory for tests already initialized.";
CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ -31,6 +31,7 @@ void InitializeContextFactoryForTests(bool enable_pixel_output) {
g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
g_implicit_factory = new InProcessContextFactory();
ContextFactory::SetInstance(g_implicit_factory);
+ return g_implicit_factory;
}
void TerminateContextFactoryForTests() {
« no previous file with comments | « ui/compositor/test/context_factories_for_test.h ('k') | ui/compositor/test/test_compositor_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698