Make gpu black list work again on Linux

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 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_private.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 255 matching lines @@
     const gpu::GPUInfo& gpu_info) {
   // This function is for testing only, so disable histograms.
   update_histograms_ = false;
 
   // Prevent all further initialization.
   finalized_ = true;
 
   InitializeImpl(gpu_blacklist_json, std::string(), gpu_info);
 }
 
+bool GpuDataManagerImplPrivate::IsInitialized() const {
+  return finalized_;

[Zhenyao Mo, 2016/01/11 23:23:32]

You can't use finalized_.  It has a very different semantic meaning from
initialized.  You should define a new variable initialized_.

Besides, it's a not a good idea to define a function that's not used at all.  It
seems that the bug is not we use the GpuDataManager before it's initialized, so
this CL does not need to include this change.

+}
+
 bool GpuDataManagerImplPrivate::IsFeatureBlacklisted(int feature) const {
 #if defined(OS_CHROMEOS)
   if (feature == gpu::GPU_FEATURE_TYPE_PANEL_FITTING &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisablePanelFitting)) {
     return true;
   }
 #endif  // OS_CHROMEOS
   if (use_swiftshader_ || ShouldUseWarp()) {
     // Skia's software rendering is probably more efficient than going through
@@ skipping 265 matching lines @@
   }
   InitializeImpl(gpu_blacklist_string,
                  gpu_driver_bug_list_string,
                  gpu_info);
 
   if (command_line->HasSwitch(switches::kSingleProcess) ||
       command_line->HasSwitch(switches::kInProcessGPU)) {
     command_line->AppendSwitch(switches::kDisableGpuWatchdog);
     AppendGpuCommandLine(command_line);
   }
+
+  finalized_ = true;
 }
 
 void GpuDataManagerImplPrivate::UpdateGpuInfoHelper() {
   GetContentClient()->SetGpuInfo(gpu_info_);
 
   if (gpu_blacklist_) {
     std::set<int> features = gpu_blacklist_->MakeDecision(
         gpu::GpuControlList::kOsAny, std::string(), gpu_info_);
     if (update_histograms_)
       UpdateStats(gpu_info_, gpu_blacklist_.get(), features);
@@ skipping 129 matching lines @@
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
       !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
     command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
   }
 #endif
 
   // Pass GPU and driver information to GPU process. We try to avoid full GPU
   // info collection at GPU process startup, but we need gpu vendor_id,
   // device_id, driver_vendor, driver_version for deciding whether we need to
   // collect full info (on Linux) and for crash reporting purpose.
-  command_line->AppendSwitchASCII(switches::kGpuVendorID,
-      base::StringPrintf("0x%04x", gpu_info_.gpu.vendor_id));
-  command_line->AppendSwitchASCII(switches::kGpuDeviceID,
-      base::StringPrintf("0x%04x", gpu_info_.gpu.device_id));
-  command_line->AppendSwitchASCII(switches::kGpuDriverVendor,
-      gpu_info_.driver_vendor);
-  command_line->AppendSwitchASCII(switches::kGpuDriverVersion,
-      gpu_info_.driver_version);
+  if (!command_line->HasSwitch(switches::kGpuVendorID))
+    command_line->AppendSwitchASCII(
+        switches::kGpuVendorID,
+        base::StringPrintf("0x%04x", gpu_info_.gpu.vendor_id));
+  if (!command_line->HasSwitch(switches::kGpuDeviceID))
+    command_line->AppendSwitchASCII(
+        switches::kGpuDeviceID,
+        base::StringPrintf("0x%04x", gpu_info_.gpu.device_id));
+  if (!command_line->HasSwitch(switches::kGpuDriverVendor))
+    command_line->AppendSwitchASCII(switches::kGpuDriverVendor,
+                                    gpu_info_.driver_vendor);
+  if (!command_line->HasSwitch(switches::kGpuDriverVersion))
+    command_line->AppendSwitchASCII(switches::kGpuDriverVersion,
+                                    gpu_info_.driver_version);
 
   if (ShouldUseWarp() && !command_line->HasSwitch(switches::kUseANGLE)) {
     command_line->AppendSwitchASCII(switches::kUseANGLE,
                                     gfx::kANGLEImplementationWARPName);
   }
 }
 
 void GpuDataManagerImplPrivate::AppendPluginCommandLine(
     base::CommandLine* command_line) const {
   DCHECK(command_line);
@@ skipping 514 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content