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 9f5690974f5b1703eb8d7a5a4e4131e66f7ec141..182e1c1f053496fba898b60051e96248239ceda5 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -74,16 +74,7 @@ GpuProcessTransportFactory::GpuProcessTransportFactory() |
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); |
} |
@@ -245,10 +236,10 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
} |
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."; |
- } |
+#if defined(OS_CHROMEOS) |
+ LOG(FATAL) << "Failed to create UI context, but can't use software" |
+ " compositing with browser threaded compositing. Aborting."; |
+#endif |
scoped_ptr<SoftwareBrowserCompositorOutputSurface> surface( |
new SoftwareBrowserCompositorOutputSurface( |