| Index: content/browser/gpu/compositor_util.cc
|
| ===================================================================
|
| --- content/browser/gpu/compositor_util.cc (revision 176935)
|
| +++ content/browser/gpu/compositor_util.cc (working copy)
|
| @@ -74,13 +74,18 @@
|
|
|
| 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);
|
|
|
|
|