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

content/browser/gpu/compositor_util.cc

Index: content/browser/gpu/compositor_util.cc
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc
index b9491427d1daddc126f7d3b263597fc18d041f6c..18eefc766f4c1314bb2e5debcd4158ab8cfd7830 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -316,12 +316,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() {