Figure out whether we have enough information to make the final GPU blacklisting decision.

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"
 
 #if defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif  // OS_MACOSX
 
@@ skipping 281 matching lines @@
   if (!gpu_info_.gpu_accessible)
     return false;
 
   if (card_blacklisted_)
     return false;
 
   // We only need to block GPU process if more features are disallowed other
   // than those in the preliminary gpu feature flags because the latter work
   // through renderer commandline switches.
   uint32 mask = ~(preliminary_gpu_feature_type_);
-  return (gpu_feature_type_ & mask) == 0;
+  if ((gpu_feature_type_ & mask) != 0)

[Ken Russell (switch to Gerrit), 2012/10/09 18:52:55]

At some point we really should rename confusingly named variables like
"gpu_feature_type_". They make it difficult to read through code like this
quickly and figure out what it's doing.

[Zhenyao Mo, 2012/10/09 19:20:47]

Will do in a follow-up CL.

+    return false;
+
+  if (gpu_feature_type_ == content::GPU_FEATURE_TYPE_ALL) {
+    if (gpu_blacklist_.get() && !gpu_blacklist_->needs_more_info())
+      return false;
+  }
+
+  return true;
 }
 
 void GpuDataManagerImpl::HandleGpuSwitch() {
   if (complete_gpu_info_already_requested_) {
     complete_gpu_info_already_requested_ = false;
     gpu_info_.finalized = false;
     RequestCompleteGpuInfoIfNeeded();
   }
 }
 
@@ skipping 91 matching lines @@
             switches::kGpuSwitchingOptionNameForceIntegrated);
         break;
       case content::GPU_SWITCHING_OPTION_AUTOMATIC:
       case content::GPU_SWITCHING_OPTION_UNKNOWN:
         break;
     }
   } else {
     command_line->AppendSwitchASCII(switches::kSupportsDualGpus, "false");
   }
 
+  if (!gpu_blacklist_.get() || !gpu_blacklist_->needs_more_info())
+    command_line->AppendSwitch(switches::kSkipGpuFullInfoCollection);
+
   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) {
       // The image transport surface currently doesn't work with AMD Dynamic
@@ skipping 135 matching lines @@
 }
 
 void GpuDataManagerImpl::BlacklistCard() {
   card_blacklisted_ = true;
 
   gpu_feature_type_ = content::GPU_FEATURE_TYPE_ALL;
 
   EnableSoftwareRenderingIfNecessary();
   NotifyGpuInfoUpdate();
 }