Revert 158076 - Implement blacklist's force GPU capability in dual GPU machines.

content/browser/gpu/gpu_data_manager_impl.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/gpu_data_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 53 matching lines @@
 
 // static
 GpuDataManagerImpl* GpuDataManagerImpl::GetInstance() {
   return Singleton<GpuDataManagerImpl>::get();
 }
 
 GpuDataManagerImpl::GpuDataManagerImpl()
     : complete_gpu_info_already_requested_(false),
       gpu_feature_type_(content::GPU_FEATURE_TYPE_UNKNOWN),
       preliminary_gpu_feature_type_(content::GPU_FEATURE_TYPE_UNKNOWN),
-      gpu_switching_(content::GPU_SWITCHING_OPTION_AUTOMATIC),
+      gpu_switching_(content::GPU_SWITCHING_AUTOMATIC),
       observer_list_(new GpuDataManagerObserverList),
       software_rendering_(false),
       card_blacklisted_(false),
       update_histograms_(true) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) {
     command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas);
     command_line->AppendSwitch(switches::kDisableAcceleratedLayers);
   }
   if (command_line->HasSwitch(switches::kDisableGpu))
     BlacklistCard();
-  if (command_line->HasSwitch(switches::kGpuSwitching)) {
-    std::string option_string = command_line->GetSwitchValueASCII(
-        switches::kGpuSwitching);
-    GpuSwitchingOption option = gpu_util::StringToGpuSwitchingOption(
-        option_string);
-    if (option != content::GPU_SWITCHING_OPTION_UNKNOWN)
-      gpu_switching_ = option;
-  }
 }
 
 void GpuDataManagerImpl::Initialize() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kSkipGpuDataLoading))
     return;
 
   content::GPUInfo gpu_info;
   gpu_info_collector::CollectPreliminaryGraphicsInfo(&gpu_info);
 #if defined(ARCH_CPU_X86_FAMILY)
@@ skipping 74 matching lines @@
 
   if (gpu_blacklist_.get()) {
     GpuBlacklist::Decision decision =
         gpu_blacklist_->MakeBlacklistDecision(
             GpuBlacklist::kOsAny, NULL, gpu_info);
     if (update_histograms_) {
       gpu_util::UpdateStats(gpu_blacklist_.get(),
                             decision.blacklisted_features);
     }
     UpdateBlacklistedFeatures(decision.blacklisted_features);
-    if (decision.gpu_switching != content::GPU_SWITCHING_OPTION_UNKNOWN)
-      gpu_switching_ = decision.gpu_switching;
+    gpu_switching_ = decision.gpu_switching;
   }
 
   {
     base::AutoLock auto_lock(gpu_info_lock_);
     gpu_info_ = gpu_info;
     complete_gpu_info_already_requested_ =
         complete_gpu_info_already_requested_ || gpu_info_.finalized;
   }
 
   // We have to update GpuFeatureType before notify all the observers.
@@ skipping 141 matching lines @@
       swiftshader_path = swiftshader_path_;
   } else if ((flags & (content::GPU_FEATURE_TYPE_WEBGL |
                 content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING |
                 content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)) &&
       (use_gl == "any")) {
     command_line->AppendSwitchASCII(
         switches::kUseGL, gfx::kGLImplementationOSMesaName);
   } else if (!use_gl.empty()) {
     command_line->AppendSwitchASCII(switches::kUseGL, use_gl);
   }
-  switch (gpu_switching_) {
-    case content::GPU_SWITCHING_OPTION_FORCE_DISCRETE:
-      command_line->AppendSwitchASCII(switches::kGpuSwitching,
-          switches::kGpuSwitchingOptionNameForceDiscrete);
-      break;
-    case content::GPU_SWITCHING_OPTION_FORCE_INTEGRATED:
-      command_line->AppendSwitchASCII(switches::kGpuSwitching,
-          switches::kGpuSwitchingOptionNameForceIntegrated);
-      break;
-    default:
-      break;
-  }
 
   if (!swiftshader_path.empty())
     command_line->AppendSwitchPath(switches::kSwiftShaderPath,
                                    swiftshader_path);
 
   {
     base::AutoLock auto_lock(gpu_info_lock_);
     if (gpu_info_.optimus)
       command_line->AppendSwitch(switches::kReduceGpuSandbox);
     if (gpu_info_.amd_switchable) {
@@ skipping 120 matching lines @@
 }
 
 void GpuDataManagerImpl::BlacklistCard() {
   card_blacklisted_ = true;
 
   gpu_feature_type_ = content::GPU_FEATURE_TYPE_ALL;
 
   EnableSoftwareRenderingIfNecessary();
   NotifyGpuInfoUpdate();
 }