Get the proper GPU Info in GpuProcessHost

content/browser/gpu/gpu_data_manager_impl_private.cc

Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index bb28f10dd7c5a14bbed629605053597485c05990..2f5c3bc4eb1fa8ad0666ed0e6ff87d7505a83c9b 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -717,7 +717,9 @@ void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
 
 void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo(
     const gpu::GpuFeatureInfo& gpu_feature_info) {
-  gpu_feature_info_ = gpu_feature_info;
+  if (!use_swiftshader_) {
+    gpu_feature_info_ = gpu_feature_info;
+  }
 }
 
 void GpuDataManagerImplPrivate::UpdateVideoMemoryUsageStats(
@@ -1269,11 +1271,20 @@ void GpuDataManagerImplPrivate::NotifyGpuInfoUpdate() {
 
 void GpuDataManagerImplPrivate::EnableSwiftShaderIfNecessary() {
 #if BUILDFLAG(ENABLE_SWIFTSHADER)
-  if (!GpuAccessAllowed(nullptr) ||
-      blacklisted_features_.count(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL)) {
-    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDisableSoftwareRasterizer))
-      use_swiftshader_ = true;
+  if ((!GpuAccessAllowed(nullptr) ||
+       blacklisted_features_.count(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL)) &&
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableSoftwareRasterizer)) {
+    use_swiftshader_ = true;
+
+    // Remove all previously recorded GPU info
+    gpu_info_ = gpu::GPUInfo();
+    // Set some basic info to identify the GPU as SwiftShader
+    gpu_info_.gl_vendor = "Google Inc.";
+    gpu_info_.gl_renderer = "Google SwiftShader";
+
+    for (auto& status : gpu_feature_info_.status_values)
+      status = gpu::kGpuFeatureStatusBlacklisted;

[Ken Russell (switch to Gerrit), 2017/03/29 17:29:22]

Is this status update correct? Isn't WebGL still supported in this
configuration?

Can we unify this code with the code which ultimately makes the blacklisting
decisions?

Could you please add a test to e.g. gpu_process_integration_test.py which forces
the browser to go down this path and verifies that the reported GPU info is
correct? Ideally the test would fail before this CL, and pass with it, so we
know it acts as a regression test. Tell me if you have any trouble constructing
it. Of course, you can skip it on non-Windows platforms for now.

[sugoi1, 2017/03/29 17:39:47]

Yes, but the feature is now called "GPU_FEATURE_TYPE_ACCELERATED_WEBGL", so it's
only on when the GPU is present. WebGL support is tested through
GpuDataManagerImplPrivate::IsWebGLEnabled(), which checks for SwiftShader.
I don't fully understand why this class has blacklisted_features_ when there's
also gpu_feature_info_.status_values.
Will do.

[Zhenyao Mo, 2017/03/29 17:48:48]

In theory the webgl status should be
hardware_accelerated/software_rendered/disabled, so you can verify it's the
right status.
gpu_feature_info_ is future directly, but currently it's only used for
rasterization, and webgl isn't part of that.

   }
 #endif
 }