Get the proper GPU Info in GpuProcessHost

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 703 matching lines @@
   } else if (was_info_available) {
     // Allow future requests to go through properly.
     complete_gpu_info_already_requested_ = false;
   }
 
   UpdateGpuInfoHelper();
 }
 
 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(
     const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
   GpuDataManagerImpl::UnlockedSession session(owner_);
   observer_list_->Notify(FROM_HERE,
                          &GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate,
                          video_memory_usage_stats);
 }
 
@@ skipping 535 matching lines @@
   ui::GpuSwitchingManager::GetInstance()->SetGpuVendorIds(vendor_ids);
   gpu::InitializeDualGpusIfSupported(gpu_driver_bugs_);
 }
 
 void GpuDataManagerImplPrivate::NotifyGpuInfoUpdate() {
   observer_list_->Notify(FROM_HERE, &GpuDataManagerObserver::OnGpuInfoUpdate);
 }
 
 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";
+    gpu_info_.software_rendering = true;
+
+    for (auto& status : gpu_feature_info_.status_values)
+      status = gpu::kGpuFeatureStatusBlacklisted;
   }
 #endif
 }
 
 std::string GpuDataManagerImplPrivate::GetDomainFromURL(
     const GURL& url) const {
   // For the moment, we just use the host, or its IP address, as the
   // entry in the set, rather than trying to figure out the top-level
   // domain. This does mean that a.foo.com and b.foo.com will be
   // treated independently in the blocking of a given domain, but it
@@ skipping 97 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