Use Surfaces on Windows, Linux, and Mac OS (try #5)

Surfaces should be feature-complete, so try enabling them on Windows, Linux, and Mac OS. They're still disabled on Chrome OS because they rely on single-threaded browser compositing, and on Android because they haven't been implemented there yet.

BUG=334090
TBR=piman@chromium.org

Review URL: https://codereview.chromium.org/923833002

Cr-Commit-Position: refs/heads/master@{#317716}

chrome/browser/chromeos/login/chrome_restart_request.cc

@@ -90,6 +90,7 @@ std::string DeriveCommandLine(const GURL& start_url,
     ::switches::kDisablePanelFitting,
     ::switches::kDisableSeccompFilterSandbox,
     ::switches::kDisableSetuidSandbox,
+    ::switches::kDisableSurfaces,
     ::switches::kDisableTextBlobs,
     ::switches::kDisableThreadedGpuRasterization,
     ::switches::kDisableThreadedScrolling,

content/browser/gpu/compositor_util.cc

@@ -310,12 +310,19 @@ bool IsThreadedGpuRasterizationEnabled() {
 bool UseSurfacesEnabled() {
 #if defined(OS_ANDROID)
   return false;
-#else
+#endif
+  bool enabled = false;
+#if (defined(USE_AURA) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+  enabled = true;
+#endif
+
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
-  return command_line.HasSwitch(switches::kUseSurfaces);
-#endif
+  // Flags override.
+  enabled |= command_line.HasSwitch(switches::kUseSurfaces);
+  enabled &= !command_line.HasSwitch(switches::kDisableSurfaces);
+  return enabled;
 }
 
 int GpuRasterizationMSAASampleCount() {

content/public/common/content_switches.cc

@@ -844,6 +844,9 @@ const char kUseNormalPriorityForTileTaskWorkerThreads[] =
 // Use the new surfaces system to handle compositor delegation.
 const char kUseSurfaces[] = "use-surfaces";
 
+// Disable the use of the new surfaces system to handle compositor delegation.
+const char kDisableSurfaces[] = "disable-surfaces";
+
 // The contents of this flag are prepended to the utility process command line.
 // Useful values might be "valgrind" or "xterm -e gdb --args".
 const char kUtilityCmdPrefix[]              = "utility-cmd-prefix";

content/public/common/content_switches.h

@@ -231,6 +231,7 @@ extern const char kUseImageTextureTarget[];
 CONTENT_EXPORT extern const char kUseMobileUserAgent[];
 CONTENT_EXPORT extern const char kUseNormalPriorityForTileTaskWorkerThreads[];
 extern const char kUseSurfaces[];
+CONTENT_EXPORT extern const char kDisableSurfaces[];
 extern const char kUtilityCmdPrefix[];
 CONTENT_EXPORT extern const char kUtilityProcess[];
 extern const char kUtilityProcessAllowedDir[];