content: Fix about:gpu "Rasterization" status field.

content: Fix about:gpu "Rasterization" status field.

This makes the "Rasterization" field work properly again and adds
some constants to prevent this from breaking again.

BUG=367124
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266503

[Zhenyao Mo, 2014-04-25 17:08:10]

LGTM

Thanks for fixing this.

[reveman, 2014-04-25 17:12:43]

The CQ bit was checked by reveman@chromium.org

[commit-bot: I haz the power, 2014-04-25 22:15:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/reveman@chromium.org/250773007/1

[commit-bot: I haz the power, 2014-04-25 22:15:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-25 22:15:14]

Failed to apply patch for content/browser/gpu/compositor_util.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/gpu/compositor_util.cc
  Hunk #3 FAILED at 62.
  Hunk #4 succeeded at 55 (offset -15 lines).
  Hunk #5 succeeded at 127 (offset -15 lines).
  Hunk #6 FAILED at 259.
  Hunk #7 FAILED at 283.
  3 out of 7 hunks FAILED -- saving rejects to file
content/browser/gpu/compositor_util.cc.rej

Patch:       content/browser/gpu/compositor_util.cc
Index: content/browser/gpu/compositor_util.cc
diff --git a/content/browser/gpu/compositor_util.cc
b/content/browser/gpu/compositor_util.cc
index
a9c3318c86b611e63b712756df9046a5c960d565..fa446f1accd3a06f3cd6080863c224b8eb0477ad
100644
--- a/content/browser/gpu/compositor_util.cc
+++ b/content/browser/gpu/compositor_util.cc
@@ -16,6 +16,11 @@ namespace content {
 
 namespace {
 
+const char* kGpuCompositingFeatureName = "gpu_compositing";
+const char* kCSSAnimationFeatureName = "css_animation";
+const char* kWebGLFeatureName = "webgl";
+const char* kRasterizationFeatureName = "rasterization";
+
 struct GpuFeatureInfo {
   std::string name;
   uint32 blocked;
@@ -41,7 +46,7 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool*
eof) {
           true
       },
       {
-          "gpu_compositing",
+          kGpuCompositingFeatureName,
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING),
           false,
           "Gpu compositing has been disabled, either via about:flags or"
@@ -57,7 +62,7 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool*
eof) {
           false
       },
       {
-          "css_animation",
+          kCSSAnimationFeatureName,
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_3D_CSS),
           command_line.HasSwitch(cc::switches::kDisableThreadedAnimation) ||
           command_line.HasSwitch(switches::kDisableAcceleratedLayers),
@@ -65,7 +70,7 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool*
eof) {
           true
       },
       {
-          "webgl",
+          kWebGLFeatureName,
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL),
           command_line.HasSwitch(switches::kDisableExperimentalWebGL),
           "WebGL has been disabled, either via about:flags or command line.",
@@ -137,7 +142,7 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool*
eof) {
       },
 #endif
       {
-          "rasterization",
+          kRasterizationFeatureName,
           manager->IsFeatureBlacklisted(
               gpu::GPU_FEATURE_TYPE_GPU_RASTERIZATION) &&
           !IsGpuRasterizationEnabled() && !IsForceGpuRasterizationEnabled(),
@@ -254,9 +259,9 @@ base::Value* GetFeatureStatus() {
     std::string status;
     if (gpu_feature_info.disabled) {
       status = "disabled";
-      if (gpu_feature_info.name == "css_animation") {
+      if (gpu_feature_info.name == kCSSAnimationFeatureName) {
         status += "_software_animated";
-      } else if (gpu_feature_info.name == "raster") {
+      } else if (gpu_feature_info.name == kRasterizationFeatureName) {
         if (IsImplSidePaintingEnabled())
           status += "_software_multithreaded";
         else
@@ -278,20 +283,20 @@ base::Value* GetFeatureStatus() {
         status += "_off";
     } else {
       status = "enabled";
-      if (gpu_feature_info.name == "webgl" &&
+      if (gpu_feature_info.name == kWebGLFeatureName &&
           manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING))
         status += "_readback";
-      if (gpu_feature_info.name == "css_animation") {
+      if (gpu_feature_info.name == kCSSAnimationFeatureName) {
         if (IsThreadedCompositingEnabled())
           status = "accelerated_threaded";
         else
           status = "accelerated";
-      } else if (gpu_feature_info.name == "raster") {
+      } else if (gpu_feature_info.name == kRasterizationFeatureName) {
         if (IsForceGpuRasterizationEnabled())
           status += "_force";
       }
     }
-    if (gpu_feature_info.name == "gpu_compositing") {
+    if (gpu_feature_info.name == kGpuCompositingFeatureName) {
       if (IsThreadedCompositingEnabled())
         status += "_threaded";
     }

[reveman, 2014-04-25 22:51:19]

The CQ bit was checked by reveman@chromium.org

[commit-bot: I haz the power, 2014-04-25 22:52:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/reveman@chromium.org/250773007/20001

[commit-bot: I haz the power, 2014-04-28 10:28:22]

Change committed as 266503