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

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

Issue 781163003: Flip flag to turn CrOS Browser Compositor Single Threaded (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/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(
« no previous file with comments | « no previous file | ui/compositor/test/in_process_context_factory.cc » ('j') | ui/compositor/test/in_process_context_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698