[CLOSED] Cleaning up the plethora of switches for GPU vs software vs SwiftShader.

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"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/gpu_feature_type.h"
 
 namespace content {
 
 namespace {
 
 bool CanDoAcceleratedCompositing() {
   const GpuDataManager* manager = GpuDataManager::GetInstance();
 
   // Don't run the field trial if gpu access has been blocked or
   // accelerated compositing is blacklisted.
   if (!manager->GpuAccessAllowed() ||
       manager->IsFeatureBlacklisted(GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING))
     return false;
 
-  // Check for the software rasterizer (SwiftShader).
-  if (manager->ShouldUseSoftwareRendering())
+  // Check for SwiftShader.
+  if (manager->ShouldUseSwiftShader())
     return false;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDisableAcceleratedCompositing))
     return false;
 
   return true;
 }
 
 bool IsForceCompositingModeBlacklisted() {
@@ skipping 68 matching lines @@
 
   // 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