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

Unified Diff: content/browser/gpu/compositor_util.cc

Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: content/browser/gpu/compositor_util.cc
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index e80973bca4a510e3cfe6c196ef1ecd6d035a834e..2811a0c7e7b6ab43a929697edad48d04eea983a9 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -242,6 +242,14 @@
bool IsZeroCopyUploadEnabled() {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
+ // Single-threaded mode in the renderer process (for layout tests) is
+ // synchronous, which depends on tiles being ready to draw when raster is
+ // complete. Therefore, it must use one of zero copy, software raster, or
+ // GPU raster. So we force zero-copy on for the case where software/GPU raster
+ // is not used.
+ // TODO(reveman): One-copy can work with sync compositing: crbug.com/490295.
+ if (command_line.HasSwitch(switches::kDisableThreadedCompositing))
+ return true;
return command_line.HasSwitch(switches::kEnableZeroCopy);
}
« no previous file with comments | « content/browser/compositor/reflector_impl_unittest.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698