Include accelerated_compositing disable flag in about:gpu status

content/browser/gpu/gpu_blacklist.cc

 // Copyright (c) 2011 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_blacklist.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
@@ skipping 728 matching lines @@
         feature_status_list->Append(NewStatusValue("2d_canvas",
                                                    "software"));
       else
         feature_status_list->Append(NewStatusValue("2d_canvas",
                                                    "unavailable_software"));
     } else if (!disable_accelerated_2D_canvas) {
       if (IsFeatureBlacklisted(
               GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas))
         feature_status_list->Append(NewStatusValue("2d_canvas",
                                                    "unavailable_software"));
+      else if (disable_accelerated_compositing)
+        feature_status_list->Append(NewStatusValue("2d_canvas",
+                                                   "disabled_software"));
       else
         feature_status_list->Append(NewStatusValue("2d_canvas",
                                                    "enabled"));
     } else {
       feature_status_list->Append(NewStatusValue("2d_canvas",
                                                  "software"));
     }
 
     // 3d css and compositing.
     if (!gpu_access_allowed) {
@@ skipping 23 matching lines @@
     if (!gpu_access_allowed)
       feature_status_list->Append(NewStatusValue("webgl",
                                                  "unavailable_off"));
     else if (disable_experimental_webgl)
       feature_status_list->Append(NewStatusValue("webgl",
                                                  "disabled_off"));
     else if (IsFeatureBlacklisted(
         GpuFeatureFlags::kGpuFeatureWebgl))
       feature_status_list->Append(NewStatusValue("webgl",
                                                  "unavailable_off"));
+    else if (disable_accelerated_compositing)

[Ken Russell (switch to Gerrit), 2011/07/30 01:06:51]

I'm not sure this is correct. Currently if --disable-accelerated-compositing is
passed, WebGL will still run, but use the software readback path for rendering
onscreen. We could certainly change the semantic of the flag but I think this is
not correct as written.

+      feature_status_list->Append(NewStatusValue("webgl",
+                                                 "unavailable_off"));
     else
       feature_status_list->Append(NewStatusValue("webgl",
                                                  "enabled"));
 
     // multisampling
     if (!gpu_access_allowed)
       feature_status_list->Append(NewStatusValue("multisampling",
                                                  "unavailable_off"));
     else if (disable_multisampling)
       feature_status_list->Append(NewStatusValue("multisampling",
                                                  "disabled_off"));
     else if (IsFeatureBlacklisted(
         GpuFeatureFlags::kGpuFeatureMultisampling))
       feature_status_list->Append(NewStatusValue("multisampling",
                                                  "disabled_off"));
+    else if (disable_accelerated_compositing)
+      feature_status_list->Append(NewStatusValue("multisampling",
+                                                 "unavailable_off"));

[Ken Russell (switch to Gerrit), 2011/07/30 01:06:51]

I'm also not sure this one is correct. I'm pretty sure the WebGL implementation
will continue to use multisampling if --disable-accelerated-compositing is
passed.

     else
       feature_status_list->Append(NewStatusValue("multisampling",
                                                  "enabled"));
 
     status->Set("featureStatus", feature_status_list);
   }
 
   // Build the problems list.
   {
     ListValue* problem_list = new ListValue();
@@ skipping 10 matching lines @@
       problem->SetString("description",
           "Accelerated 2D canvas has been disabled at the command line");
       problem->Set("crBugs", new ListValue());
       problem->Set("webkitBugs", new ListValue());
       problem_list->Append(problem);
     }
     if (disable_accelerated_compositing) {
       DictionaryValue* problem = new DictionaryValue();
       problem->SetString("description",
           "Accelerated compositing has been disabled, either via about:flags "
-          "or command line");
+          "or command line. This disables all hardware acceleration.");

[Ken Russell (switch to Gerrit), 2011/07/30 01:06:51]

Not sure this comment is correct either. It really only disables the accelerated
compositor and (I suppose) 2D canvas.

       problem->Set("crBugs", new ListValue());
       problem->Set("webkitBugs", new ListValue());
       problem_list->Append(problem);
     }
     if (disable_experimental_webgl) {
       DictionaryValue* problem = new DictionaryValue();
       problem->SetString("description",
           "WebGL has been disabled, either via about:flags "
           "or command line");
       problem->Set("crBugs", new ListValue());
@@ skipping 108 matching lines @@
     browser_version_info.reset(
       new VersionInfo(version_op, version_string, version_string2));
     if (!browser_version_info->IsValid())
       return kMalformed;
     if (browser_version_info->Contains(*browser_version_))
       return kSupported;
     return kUnsupported;
   }
   return kSupported;
 }