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

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

Issue 17265006: wayland patch for inspection Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « content/browser/power_save_blocker_wayland.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/image_transport_factory.cc
diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc
index a4eeacd1759a40e37df96d2c9e89771a9f91c38b..8dfa90739d3e1fad5c4c1acf787740eaeaa9eb3c 100644
--- a/content/browser/renderer_host/image_transport_factory.cc
+++ b/content/browser/renderer_host/image_transport_factory.cc
@@ -1048,6 +1048,10 @@ void ImageTransportFactory::Initialize() {
if (command_line->HasSwitch(switches::kTestCompositor)) {
ui::SetupTestCompositor();
}
+
+#if defined(USE_WAYLAND)
+ g_factory = new NoTransportFactory(NULL);
+#else
if (ui::IsTestCompositorEnabled()) {
g_factory = new NoTransportFactory(new ui::TestContextFactory);
} else if (command_line->HasSwitch(switches::kUIEnableSoftwareCompositing)) {
@@ -1056,6 +1060,7 @@ void ImageTransportFactory::Initialize() {
g_factory = new GpuProcessTransportFactory;
}
ui::ContextFactory::SetInstance(g_factory->AsContextFactory());
+#endif
}
// static
« no previous file with comments | « content/browser/power_save_blocker_wayland.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698