Cleanup logic that generates about:gpu feature status.

content/browser/gpu/compositor_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 "content/browser/gpu/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
@@ skipping 19 matching lines @@
                gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION_FIELD_TRIAL);
   }
 
   return manager->IsFeatureBlacklisted(
         gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION);
 }
 
 const char* kGpuCompositingFeatureName = "gpu_compositing";
 const char* kWebGLFeatureName = "webgl";
 const char* kRasterizationFeatureName = "rasterization";
+const char* kThreadedRasterizationFeatureName = "threaded_rasterization";
 
 struct GpuFeatureInfo {
   std::string name;
-  uint32 blocked;
+  bool blocked;
   bool disabled;
   std::string disabled_description;
   bool fallback_to_software;
 };
 
 const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance();
 
   const GpuFeatureInfo kGpuFeatureInfo[] = {
@@ skipping 23 matching lines @@
           command_line.HasSwitch(switches::kDisableExperimentalWebGL),
           "WebGL has been disabled, either via about:flags or command line.",
           false
       },
       {
           "flash_3d",
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_FLASH3D),
           command_line.HasSwitch(switches::kDisableFlash3d),
           "Using 3d in flash has been disabled, either via about:flags or"
           " command line.",
-          false
+          true
       },
       {
           "flash_stage3d",
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D),
           command_line.HasSwitch(switches::kDisableFlashStage3d),
           "Using Stage3d in Flash has been disabled, either via about:flags or"
           " command line.",
-          false
+          true
       },
       {
           "flash_stage3d_baseline",
           manager->IsFeatureBlacklisted(
               gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE) ||
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_FLASH_STAGE3D),
           command_line.HasSwitch(switches::kDisableFlashStage3d),
           "Using Stage3d Baseline profile in Flash has been disabled, either"
           " via about:flags or command line.",
-          false
+          true
       },
       {
           "video_decode",
           manager->IsFeatureBlacklisted(
               gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
           command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode),
           "Accelerated video decode has been disabled, either via about:flags"
           " or command line.",
           true
       },
@@ skipping 17 matching lines @@
           " line.",
           false
       },
 #endif
       {
           kRasterizationFeatureName,
           IsGpuRasterizationBlacklisted() &&
           !IsGpuRasterizationEnabled() && !IsForceGpuRasterizationEnabled(),
           !IsGpuRasterizationEnabled() && !IsForceGpuRasterizationEnabled() &&
           !IsGpuRasterizationBlacklisted(),
-          "Accelerated rasterization has not been enabled or"
+          "Accelerated rasterization has been disabled, either via about:flags"
+          " or command line.",
+          true
+      },
+      {
+          kThreadedRasterizationFeatureName,
+          false,
+          !IsImplSidePaintingEnabled(),
+          "Threaded rasterization has not been enabled or"
           " is not supported by the current system.",
-          true
+          false
       }
+
   };
   DCHECK(index < arraysize(kGpuFeatureInfo));
   *eof = (index == arraysize(kGpuFeatureInfo) - 1);
   return kGpuFeatureInfo[index];
 }
 
 }  // namespace
 
 bool IsPinchVirtualViewportEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
@@ skipping 104 matching lines @@
       !manager->GpuAccessAllowed(&gpu_access_blocked_reason);
 
   base::DictionaryValue* feature_status_dict = new base::DictionaryValue();
 
   bool eof = false;
   for (size_t i = 0; !eof; ++i) {
     const GpuFeatureInfo gpu_feature_info = GetGpuFeatureInfo(i, &eof);
     std::string status;
     if (gpu_feature_info.disabled) {
       status = "disabled";
-      if (gpu_feature_info.name == kRasterizationFeatureName) {
-        if (IsImplSidePaintingEnabled())
-          status += "_software_multithreaded";
-        else
-          status += "_software";
-      } else {
-        if (gpu_feature_info.fallback_to_software)
-          status += "_software";
-        else
-          status += "_off";
-      }
-    } else if (manager->ShouldUseSwiftShader()) {
-      status = "unavailable_software";
-    } else if (gpu_feature_info.blocked ||
-               gpu_access_blocked) {
-      status = "unavailable";
       if (gpu_feature_info.fallback_to_software)
         status += "_software";
       else
         status += "_off";
+      if (gpu_feature_info.name == kThreadedRasterizationFeatureName)
+        status += "_ok";
+    } else if (gpu_feature_info.blocked ||
+               gpu_access_blocked) {
+      status = "unavailable";
+      if (gpu_feature_info.fallback_to_software) {
+        status += "_software";
+      } else
+        status += "_off";
     } else {
       status = "enabled";
       if (gpu_feature_info.name == kWebGLFeatureName &&
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING))
         status += "_readback";
       if (gpu_feature_info.name == kRasterizationFeatureName) {
         if (IsForceGpuRasterizationEnabled())
           status += "_force";
       }
+      if (gpu_feature_info.name == kThreadedRasterizationFeatureName)
+        status += "_on";
     }
     if (gpu_feature_info.name == kGpuCompositingFeatureName) {
       if (IsThreadedCompositingEnabled())
         status += "_threaded";
     }
+    if (gpu_feature_info.name == kWebGLFeatureName &&
+        (gpu_feature_info.blocked || gpu_access_blocked) &&
+        manager->ShouldUseSwiftShader()) {
+      status = "unavailable_software";
+    }
+
     feature_status_dict->SetString(
         gpu_feature_info.name.c_str(), status.c_str());
   }
   return feature_status_dict;
 }
 
 base::Value* GetProblems() {
   GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance();
   std::string gpu_access_blocked_reason;
   bool gpu_access_blocked =
@@ skipping 34 matching lines @@
   return problem_list;
 }
 
 base::Value* GetDriverBugWorkarounds() {
   base::ListValue* workaround_list = new base::ListValue();
   GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(workaround_list);
   return workaround_list;
 }
 
 }  // namespace content