Revert 86510 - Contributed by junov@chromium.org

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 706 matching lines @@
 {
   for (size_t i = 0; i < active_entries_.size(); ++i) {
     if (active_entries_[i]->GetGpuFeatureFlags().flags() & feature)
       return true;
   }
   return false;
 }
 
 Value* GpuBlacklist::GetFeatureStatus(bool gpu_access_allowed,
                                       bool disable_accelerated_compositing,
-                                      bool disable_accelerated_2D_canvas,
+                                      bool enable_accelerated_2D_canvas,
                                       bool disable_experimental_webgl,
                                       bool disable_multisampling) const {
   DictionaryValue* status = new DictionaryValue();
 
   // Build the feature_status field.
   {
     ListValue* feature_status_list = new ListValue();
 
     // 2d_canvas.
     if (!gpu_access_allowed) {
-      if (disable_accelerated_2D_canvas)
+      if(enable_accelerated_2D_canvas)
+        feature_status_list->Append(NewStatusValue("2d_canvas",
+                                                   "unavailable_software"));
+      else
         feature_status_list->Append(NewStatusValue("2d_canvas",
                                                    "software"));
-      else
-        feature_status_list->Append(NewStatusValue("2d_canvas",
-                                                   "unavailable_software"));
-    } else if (!disable_accelerated_2D_canvas) {
+    } else if (enable_accelerated_2D_canvas) {
       if (IsFeatureBlacklisted(
               GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas))
         feature_status_list->Append(NewStatusValue("2d_canvas",
                                                    "unavailable_software"));
       else
         feature_status_list->Append(NewStatusValue("2d_canvas",
                                                    "enabled"));
     } else {
       feature_status_list->Append(NewStatusValue("2d_canvas",
                                                  "software"));
@@ skipping 35 matching lines @@
       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)
+    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
       feature_status_list->Append(NewStatusValue("multisampling",
                                                  "enabled"));
 
     status->Set("featureStatus", feature_status_list);
   }
 
   // Build the problems list.
   {
     ListValue* problem_list = new ListValue();
-    if (!gpu_access_allowed) {
+    if(!gpu_access_allowed) {
       DictionaryValue* problem = new DictionaryValue();
       problem->SetString("description",
           "GPU process was unable to boot. Access to GPU disallowed.");
       problem->Set("crBugs", new ListValue());
       problem->Set("webkitBugs", new ListValue());
       problem_list->Append(problem);
     }
-    if (disable_accelerated_2D_canvas) {
+    if(!enable_accelerated_2D_canvas) {
       DictionaryValue* problem = new DictionaryValue();
       problem->SetString("description",
-          "Accelerated 2D canvas has been disabled at the command line");
+          "Accelerated 2D canvas has not been enabled "
+          "(in about:flags or command line)");
       problem->Set("crBugs", new ListValue());
       problem->Set("webkitBugs", new ListValue());
       problem_list->Append(problem);
     }
-    if (disable_accelerated_compositing) {
+    if(disable_accelerated_compositing) {
       DictionaryValue* problem = new DictionaryValue();
       problem->SetString("description",
           "Accelerated compositing has been disabled, either via about:flags "
           "or command line");
       problem->Set("crBugs", new ListValue());
       problem->Set("webkitBugs", new ListValue());
       problem_list->Append(problem);
     }
-    if (disable_experimental_webgl) {
+    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());
       problem->Set("webkitBugs", new ListValue());
       problem_list->Append(problem);
     }
-    if (disable_multisampling) {
+    if(disable_multisampling) {
       DictionaryValue* problem = new DictionaryValue();
       problem->SetString("description",
           "Multisampling has been disabled, either via about:flags "
           "or command line");
       problem->Set("crBugs", new ListValue());
       problem->Set("webkitBugs", new ListValue());
       problem_list->Append(problem);
     }
     for (size_t i = 0; i < active_entries_.size(); ++i) {
       GpuBlacklistEntry* entry = active_entries_[i];
@@ skipping 94 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;
 }