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

Unified Diff: content/browser/compositor/image_transport_factory.cc

Issue 276973002: Adds getter for ContextFactory to content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: include 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
Index: content/browser/compositor/image_transport_factory.cc
diff --git a/content/browser/compositor/image_transport_factory.cc b/content/browser/compositor/image_transport_factory.cc
index aa6e53292b8f8a31af0a67355a75373e8c4928ce..0827acb7b89dd029a4842338b61fc41f55256977 100644
--- a/content/browser/compositor/image_transport_factory.cc
+++ b/content/browser/compositor/image_transport_factory.cc
@@ -17,6 +17,12 @@ namespace {
ImageTransportFactory* g_factory = NULL;
bool g_initialized_for_unit_tests = false;
static gfx::DisableNullDrawGLBindings* g_disable_null_draw = NULL;
+
+void SetFactory(ImageTransportFactory* factory) {
+ g_factory = factory;
+ ui::ContextFactory::SetInstance(factory->GetContextFactory());
+}
+
}
// static
@@ -24,9 +30,7 @@ void ImageTransportFactory::Initialize() {
DCHECK(!g_factory || g_initialized_for_unit_tests);
if (g_initialized_for_unit_tests)
return;
- GpuProcessTransportFactory* factory = new GpuProcessTransportFactory;
- g_factory = factory;
- ui::ContextFactory::SetInstance(factory);
+ SetFactory(new GpuProcessTransportFactory);
}
void ImageTransportFactory::InitializeForUnitTests(
@@ -39,10 +43,7 @@ void ImageTransportFactory::InitializeForUnitTests(
if (command_line->HasSwitch(switches::kEnablePixelOutputInTests))
g_disable_null_draw = new gfx::DisableNullDrawGLBindings;
- NoTransportImageTransportFactory* factory =
- new NoTransportImageTransportFactory(test_factory.Pass());
- g_factory = factory;
- ui::ContextFactory::SetInstance(factory->context_factory());
+ SetFactory(new NoTransportImageTransportFactory(test_factory.Pass()));
}
// static

Powered by Google App Engine
This is Rietveld 408576698