Move GPU blacklist calculation to GPU proc

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 291 matching lines @@
     // Skia's software rendering is probably more efficient than going through
     // software emulation of the GPU, so use that.
     if (feature == gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)
       return true;
     return false;
   }
 
   return (blacklisted_features_.count(feature) == 1);
 }
 
+bool GpuDataManagerImplPrivate::IsFeatureEnabled(int feature) const {
+  DCHECK_EQ(feature, gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION);
+  return (enabled_features_.count(feature) == 1);
+}
+
 bool GpuDataManagerImplPrivate::IsDriverBugWorkaroundActive(int feature) const {
   return (gpu_driver_bugs_.count(feature) == 1);
 }
 
 size_t GpuDataManagerImplPrivate::GetBlacklistedFeatureCount() const {
   if (use_swiftshader_)
     return 1;
   return blacklisted_features_.size();
 }
 
@@ skipping 353 matching lines @@
   if (IsCompleteGpuInfoAvailable()) {
     complete_gpu_info_already_requested_ = true;
   } else if (was_info_available) {
     // Allow future requests to go through properly.
     complete_gpu_info_already_requested_ = false;
   }
 
   UpdateGpuInfoHelper();
 }
 
+void GpuDataManagerImplPrivate::UpdateGpuFeatureStatus(
+    const gpu::GPUFeatureStatus& gpu_feature_status) {
+  if (gpu_blacklist_) {
+    // Currently this duplicates the blacklist re-computation in
+    // UpdateGpuInfoHelper. Ensure we get the expected value for the
+    // GPU_RASTERIZATION feature, which is the only one in use here.
+    DCHECK_EQ(
+        gpu_feature_status.blacklisted_features.count(
+            gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION),
+        blacklisted_features_.count(gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION));
+  }
+
+  // Copy the |enabled_features| member.
+  enabled_features_ = gpu_feature_status.enabled_features;
+  // This is currently only used for GPU rasterization. Ensure that this is the
+  // only flag set (if set at all).
+  DCHECK(enabled_features_.size() ==
+         enabled_features_.count(gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION));
+}
+
 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);
 }
 
 void GpuDataManagerImplPrivate::AppendRendererCommandLine(
     base::CommandLine* command_line) const {
@@ skipping 652 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