Add force_compositing_mode support in gpu blacklist.

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/public/browser/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_constants.h"
@@ skipping 36 matching lines @@
   if (!CanDoAcceleratedCompositing())
     return false;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   // Command line switches take precedence over field trials.
   if (command_line.HasSwitch(switches::kDisableForceCompositingMode) ||
       command_line.HasSwitch(switches::kDisableThreadedCompositing))
     return false;
 
+  GpuFeatureType blacklisted_features =

[vangelis, 2013/01/16 18:04:09]

nit: Could you hoist that into a separate method in the unnamed namespace? 

[Zhenyao Mo, 2013/01/16 20:53:36]

Done.

+    GpuDataManager::GetInstance()->GetBlacklistedFeatures();
+  if (blacklisted_features & GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE)
+    return false;
+
   if (command_line.HasSwitch(switches::kEnableThreadedCompositing))
     return true;
 
   base::FieldTrial* trial =
       base::FieldTrialList::Find(kGpuCompositingFieldTrialName);
   return trial &&
          trial->group_name() == kGpuCompositingFieldTrialThreadEnabledName;
 }
 
 bool IsForceCompositingModeEnabled() {
 #if defined(OS_WIN) && defined(USE_AURA)
   // We always want compositing on Aura Windows.
   return true;
 #endif
 
   if (!CanDoAcceleratedCompositing())
     return false;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
-  // Command line switches take precedence over field trials.
+  // Command line switches take precedence over blacklisting and field trials.
   if (command_line.HasSwitch(switches::kDisableForceCompositingMode))
     return false;
 
   if (command_line.HasSwitch(switches::kForceCompositingMode))
     return true;
 
+  GpuFeatureType blacklisted_features =
+    GpuDataManager::GetInstance()->GetBlacklistedFeatures();
+  if (blacklisted_features & GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE)
+    return false;
+
   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);
 }
 
 }  // namespace content