Move GPU blacklist and driver bug workaround list from json to data struct.

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 <algorithm>
 #include <iterator>
 #include <memory>
 #include <utility>
@@ skipping 16 matching lines @@
 #include "content/common/gpu_host_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/web_preferences.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
-#include "gpu/config/gpu_control_list_jsons.h"
-#include "gpu/config/gpu_driver_bug_workaround_type.h"
-#include "gpu/config/gpu_feature_type.h"
+#include "gpu/config/gpu_driver_bug_list_autogen.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
+#include "gpu/config/software_rendering_list_autogen.h"
 #include "gpu/ipc/common/memory_stats.h"
 #include "gpu/ipc/service/switches.h"
 #include "media/media_features.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_features.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 #if defined(USE_OZONE)
@@ skipping 76 matching lines @@
                  const gpu::GpuBlacklist* blacklist,
                  const std::set<int>& blacklisted_features) {
   uint32_t max_entry_id = blacklist->max_entry_id();
   if (max_entry_id == 0) {
     // GPU Blacklist was not loaded.  No need to go further.
     return;
   }
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
-  bool disabled = false;
 
   // Use entry 0 to capture the total number of times that data
   // was recorded in this histogram in order to have a convenient
   // denominator to compute blacklist percentages for the rest of the
   // entries.
   UMA_HISTOGRAM_ENUMERATION("GPU.BlacklistTestResultsPerEntry",
       0, max_entry_id + 1);
 
   if (blacklisted_features.size() != 0) {
     std::vector<uint32_t> flag_entries;
-    blacklist->GetDecisionEntries(&flag_entries, disabled);
+    blacklist->GetDecisionEntries(&flag_entries);
     DCHECK_GT(flag_entries.size(), 0u);
     for (size_t i = 0; i < flag_entries.size(); ++i) {
       UMA_HISTOGRAM_ENUMERATION("GPU.BlacklistTestResultsPerEntry",
           flag_entries[i], max_entry_id + 1);
     }
   }
 
-  // This counts how many users are affected by a disabled entry - this allows
-  // us to understand the impact of an entry before enable it.
-  std::vector<uint32_t> flag_disabled_entries;
-  disabled = true;
-  blacklist->GetDecisionEntries(&flag_disabled_entries, disabled);
-  for (uint32_t disabled_entry : flag_disabled_entries) {
-    UMA_HISTOGRAM_ENUMERATION("GPU.BlacklistTestResultsPerDisabledEntry",
-        disabled_entry, max_entry_id + 1);

[Ken Russell (switch to Gerrit), 2017/03/31 02:37:06]

Is there a problem with losing this UMA histogram? Has it been used in the
recent past?

Are you going to remove it from the internal histograms.xml?

[Zhenyao Mo, 2017/03/31 19:14:14]

No, it hasn't been used for a long long time.
Yes, will do.

-  }
-
   const gpu::GpuFeatureType kGpuFeatures[] = {
       gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS,
       gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING,
       gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION,
       gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL, gpu::GPU_FEATURE_TYPE_WEBGL2};
   const std::string kGpuBlacklistFeatureHistogramNames[] = {
       "GPU.BlacklistFeatureTestResults.Accelerated2dCanvas",
       "GPU.BlacklistFeatureTestResults.GpuCompositing",
       "GPU.BlacklistFeatureTestResults.GpuRasterization",
       "GPU.BlacklistFeatureTestResults.Webgl",
@@ skipping 115 matching lines @@
           [](const gpu::GPUInfo& gpu_info) {
             TRACE_EVENT0("test_gpu", "OnGraphicsInfoCollected");
             GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info);
           },
           gpu_info));
 }
 
 }  // namespace anonymous
 
 void GpuDataManagerImplPrivate::InitializeForTesting(
-    const std::string& gpu_blacklist_json,
+    const gpu::GpuControlListData& gpu_blacklist_data,
     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);
+  gpu::GpuControlListData gpu_driver_bug_list_data;
+  InitializeImpl(gpu_blacklist_data, gpu_driver_bug_list_data, gpu_info);
 }
 
 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
@@ skipping 291 matching lines @@
   }
 #if defined(ARCH_CPU_X86_FAMILY)
   if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) {
     gpu_info.context_info_state = gpu::kCollectInfoNonFatalFailure;
 #if defined(OS_WIN)
     gpu_info.dx_diagnostics_info_state = gpu::kCollectInfoNonFatalFailure;
 #endif  // OS_WIN
   }
 #endif  // ARCH_CPU_X86_FAMILY
 
-  std::string gpu_blacklist_string;
-  std::string gpu_driver_bug_list_string;
+  gpu::GpuControlListData gpu_blacklist_data;
   if (!force_software_gl &&
       !command_line->HasSwitch(switches::kIgnoreGpuBlacklist) &&
       !command_line->HasSwitch(switches::kUseGpuInTests)) {
-    gpu_blacklist_string = gpu::kSoftwareRenderingListJson;
+    gpu_blacklist_data = {gpu::kSoftwareRenderingListVersion,
+                          gpu::kSoftwareRenderingListEntryCount,
+                          gpu::kSoftwareRenderingListEntries};
   }
+  gpu::GpuControlListData gpu_driver_bug_list_data;
   if (!force_software_gl &&
       !command_line->HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) {
-    gpu_driver_bug_list_string = gpu::kGpuDriverBugListJson;
+    gpu_driver_bug_list_data = {gpu::kGpuDriverBugListVersion,
+                                gpu::kGpuDriverBugListEntryCount,
+                                gpu::kGpuDriverBugListEntries};
   }
-  InitializeImpl(gpu_blacklist_string,
-                 gpu_driver_bug_list_string,
-                 gpu_info);
+  InitializeImpl(gpu_blacklist_data, gpu_driver_bug_list_data, gpu_info);
 
   if (in_process_gpu_) {
     command_line->AppendSwitch(switches::kDisableGpuWatchdog);
     AppendGpuCommandLine(command_line, nullptr);
   }
 }
 
 void GpuDataManagerImplPrivate::UpdateGpuInfoHelper() {
   GetContentClient()->SetGpuInfo(gpu_info_);
 
@@ skipping 539 matching lines @@
   }
 }
 
 GpuDataManagerImplPrivate::~GpuDataManagerImplPrivate() {
 #if defined(OS_MACOSX)
   CGDisplayRemoveReconfigurationCallback(DisplayReconfigCallback, owner_);
 #endif
 }
 
 void GpuDataManagerImplPrivate::InitializeImpl(
-    const std::string& gpu_blacklist_json,
-    const std::string& gpu_driver_bug_list_json,
+    const gpu::GpuControlListData& gpu_blacklist_data,
+    const gpu::GpuControlListData& gpu_driver_bug_list_data,
     const gpu::GPUInfo& gpu_info) {
   const bool log_gpu_control_list_decisions =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kLogGpuControlListDecisions);
 
-  if (!gpu_blacklist_json.empty()) {
-    gpu_blacklist_.reset(gpu::GpuBlacklist::Create());
+  if (gpu_blacklist_data.entry_count) {
+    gpu_blacklist_.reset(gpu::GpuBlacklist::Create(gpu_blacklist_data));
     if (log_gpu_control_list_decisions)
-      gpu_blacklist_->enable_control_list_logging("gpu_blacklist");
-    bool success = gpu_blacklist_->LoadList(
-        gpu_blacklist_json, gpu::GpuControlList::kCurrentOsOnly);
-    DCHECK(success);
+      gpu_blacklist_->EnableControlListLogging("gpu_blacklist");
   }
-  if (!gpu_driver_bug_list_json.empty()) {
-    gpu_driver_bug_list_.reset(gpu::GpuDriverBugList::Create());
+  if (gpu_driver_bug_list_data.entry_count) {
+    gpu_driver_bug_list_.reset(
+        gpu::GpuDriverBugList::Create(gpu_driver_bug_list_data));
     if (log_gpu_control_list_decisions)
-      gpu_driver_bug_list_->enable_control_list_logging("gpu_driver_bug_list");
-    bool success = gpu_driver_bug_list_->LoadList(
-        gpu_driver_bug_list_json, gpu::GpuControlList::kCurrentOsOnly);
-    DCHECK(success);
+      gpu_driver_bug_list_->EnableControlListLogging("gpu_driver_bug_list");
   }
 
   gpu_info_ = gpu_info;
   UpdateGpuInfo(gpu_info);
   UpdateGpuSwitchingManager(gpu_info);
   UpdatePreliminaryBlacklistedFeatures();
 
   RunPostInitTasks();
 }
 
@@ skipping 160 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