Always enable FCM on Mac 10.8.

content/browser/gpu/compositor_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/config/gpu_feature_type.h"
 
-#if defined(OS_WIN)
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#elif defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace content {
 
 namespace {
 
 bool CanDoAcceleratedCompositing() {
   const GpuDataManager* manager = GpuDataManager::GetInstance();
 
@@ skipping 52 matching lines @@
 
   // Command line switches take precedence over blacklisting and field trials.
   if (command_line.HasSwitch(switches::kDisableForceCompositingMode))
     return false;
   else if (command_line.HasSwitch(switches::kForceCompositingMode))
     return true;
 
   if (!CanDoAcceleratedCompositing())
     return false;
 
-#if defined(OS_WIN)
+  // TODO(gab): Do the same thing in IsThreadedCompositingEnabled() once this is
+  // stable.
+  // TODO(gab): Use the GPU blacklist instead of hardcoding OS versions here
+  // https://codereview.chromium.org/23534006.
+#if defined(OS_MACOSX)
+  // Mac OSX 10.8+ has been shipping with FCM enabled at 100% since M28; skip
+  // the field trial check to ensure this is always enabled on the try bots.

[Zhenyao Mo, 2013/09/18 20:43:59]

Shouldn't this field trial check comment be more general than mac only?

[gab, 2013/09/18 21:00:21]

Done.

+  return base::mac::IsOSMountainLionOrLater();
+#elif defined(OS_WIN)
   // Windows Vista+ has been shipping with FCM enabled at 100% since M24; skip
   // the field trial check to ensure this is always enabled on the try bots.
-  // TODO(gab): Do the same thing in IsThreadedCompositingEnabled() once this is
-  // stable.
-  // TODO(gab): Do the same thing for Mac OS (which has been enabled at 100%
-  // since M28) as well and get rid of the field trial code.
-  // TODO(gab): Use the GPU blacklist instead of hardcoding OS version here
-  // https://codereview.chromium.org/23534006.
   return base::win::GetVersion() >= base::win::VERSION_VISTA;
 #endif
 
-  base::FieldTrial* trial =
-      base::FieldTrialList::Find(kGpuCompositingFieldTrialName);
-
-  // Force compositing is enabled in both the force compositing
-  // and threaded compositing mode field trials.
-  return trial &&
-        (trial->group_name() ==
-            kGpuCompositingFieldTrialForceCompositingEnabledName ||
-         trial->group_name() == kGpuCompositingFieldTrialThreadEnabledName);
+  return false;
 }
 
 bool IsDelegatedRendererEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   bool enabled = false;
 
 #if defined(USE_AURA)
   // Default to true on Aura, but allow override via flags.
   enabled = true;
 #endif
 
   // Flags override.
   enabled |= command_line.HasSwitch(switches::kEnableDelegatedRenderer);
   enabled &= !command_line.HasSwitch(switches::kDisableDelegatedRenderer);
 
   // Needs compositing, and thread.
   if (enabled &&
       (!IsForceCompositingModeEnabled() || !IsThreadedCompositingEnabled())) {
     enabled = false;
     LOG(ERROR) << "Disabling delegated-rendering because it needs "
                << "force-compositing-mode and threaded-compositing.";
   }
 
   return enabled;
 }
 
 }  // namespace content