Index: content/browser/compositor/gpu_process_transport_factory.cc |
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc |
index d9ba0b55aeebf2c630872f1c55bb3d87d0dde745..c7c867e6001ea62b0ae91752c2b9e3171a601b98 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -74,7 +74,16 @@ |
callback_factory_(this) { |
output_surface_proxy_ = new BrowserCompositorOutputSurfaceProxy( |
&output_surface_map_); |
- |
+#if defined(OS_CHROMEOS) |
+ bool use_thread = !base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kUIDisableThreadedCompositing); |
+#else |
+ bool use_thread = false; |
+#endif |
+ if (use_thread) { |
+ compositor_thread_.reset(new base::Thread("Browser Compositor")); |
+ compositor_thread_->Start(); |
+ } |
if (UseSurfacesEnabled()) |
surface_manager_ = make_scoped_ptr(new cc::SurfaceManager); |
} |
@@ -238,7 +247,7 @@ |
if (!context_provider.get()) { |
if (compositor_thread_.get()) { |
LOG(FATAL) << "Failed to create UI context, but can't use software" |
- " compositing with browser threaded compositing. Aborting."; |
+ " compositing with browser threaded compositing. Aborting."; |
} |
scoped_ptr<SoftwareBrowserCompositorOutputSurface> surface( |