Move GPU blacklist calculation to GPU proc

gpu/config/gpu_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 "gpu/config/gpu_util.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "gpu/config/gpu_blacklist.h"
 #include "gpu/config/gpu_control_list_jsons.h"
 #include "gpu/config/gpu_driver_bug_list.h"
+#include "gpu/config/gpu_feature_type.h"
+#include "gpu/config/gpu_features.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 namespace gpu {
 
 namespace {
 
 // Combine the integers into a string, seperated by ','.
@@ skipping 25 matching lines @@
   DCHECK(list);
   for (const base::StringPiece& piece : base::SplitStringPiece(
            str, ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
     uint32_t id = 0;
     bool succeed = base::HexStringToUInt(piece, &id);
     DCHECK(succeed);
     list->push_back(id);
   }
 }
 
+GpuFeatureStatus GetGpuRasterizationFeatureStatus(
+    const std::set<int>& blacklisted_features,
+    const base::CommandLine& command_line) {
+  if (command_line.HasSwitch(switches::kDisableGpuRasterization))
+    return kGpuFeatureStatusDisabled;
+  else if (command_line.HasSwitch(switches::kEnableGpuRasterization))
+    return kGpuFeatureStatusEnabled;
+
+  if (blacklisted_features.count(GPU_FEATURE_TYPE_GPU_RASTERIZATION))
+    return kGpuFeatureStatusBlacklisted;
+
+  // Gpu Rasterization on platforms that are not fully enabled is controlled by
+  // a finch experiment.
+  if (!base::FeatureList::IsEnabled(features::kDefaultEnableGpuRasterization))
+    return kGpuFeatureStatusDisabled;
+
+  return kGpuFeatureStatusEnabled;
+}
+
 }  // namespace anonymous
 
 void ApplyGpuDriverBugWorkarounds(const GPUInfo& gpu_info,
                                   base::CommandLine* command_line) {
   std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
   list->LoadList(kGpuDriverBugListJson,
                  GpuControlList::kCurrentOsOnly);
   std::set<int> workarounds = list->MakeDecision(
       GpuControlList::kOsAny, std::string(), gpu_info);
   GpuDriverBugList::AppendWorkaroundsFromCommandLine(
@@ skipping 72 matching lines @@
   ui::GpuSwitchingManager* switching_manager =
       ui::GpuSwitchingManager::GetInstance();
   if (!switching_manager->SupportsDualGpus())
     return;
   if (driver_bug_workarounds.count(gpu::FORCE_DISCRETE_GPU) == 1)
     ui::GpuSwitchingManager::GetInstance()->ForceUseOfDiscreteGpu();
   else if (driver_bug_workarounds.count(gpu::FORCE_INTEGRATED_GPU) == 1)
     ui::GpuSwitchingManager::GetInstance()->ForceUseOfIntegratedGpu();
 }
 
+GpuFeatureInfo GetGpuFeatureInfo(const GPUInfo& gpu_info,
+                                 const base::CommandLine& command_line) {

[Zhenyao Mo, 2017/02/03 23:57:32]

Can we DCHECK it's either in-process gpu mode or it's actually in GPU process? 
If it's too much efforts, then forget about it.

[ericrk, 2017/02/06 19:51:38]

I did a bit of searching and I couldn't find a good way to DCHECK what process
we are in. I'll add a comment to the .h indicating that this should only be used
with the GPU proc or Browser proc in in-proc GPU mode.

+  GpuFeatureInfo gpu_feature_info;
+  std::set<int> blacklisted_features;
+  if (!command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) {
+    std::unique_ptr<GpuBlacklist> list(GpuBlacklist::Create());
+    list->LoadList(kSoftwareRenderingListJson, GpuControlList::kCurrentOsOnly);
+    blacklisted_features =
+        list->MakeDecision(GpuControlList::kOsAny, std::string(), gpu_info);
+  }
+
+  // Currently only used for GPU rasterization.
+  gpu_feature_info.status_values[GPU_FEATURE_TYPE_GPU_RASTERIZATION] =
+      GetGpuRasterizationFeatureStatus(blacklisted_features, command_line);
+
+  return gpu_feature_info;
+}
+
 }  // namespace gpu