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

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: no longer rm switch Created 5 years, 11 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 | « no previous file | ui/compositor/test/in_process_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c7c867e6001ea62b0ae91752c2b9e3171a601b98..a7a4a5721f48442889df58bdb50a21e185e12ec8 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)
piman 2015/01/29 23:56:25 Actually, it looks like browser_tests on linux_chr
weiliangc 2015/01/30 00:00:52 Leaving it as it is now.
+ 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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698