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

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 523019df32b364102ece6478c8df8aef50655163..844278625e31b74384fc6e9379c0b62adfb4d73d 100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -287,12 +287,19 @@ bool IsForceGpuRasterizationEnabled() {
 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;
 }
 
 base::DictionaryValue* GetFeatureStatus() {