| Index: content/browser/gpu/gpu_blacklist.cc
|
| ===================================================================
|
| --- content/browser/gpu/gpu_blacklist.cc (revision 86432)
|
| +++ content/browser/gpu/gpu_blacklist.cc (working copy)
|
| @@ -713,7 +713,7 @@
|
|
|
| Value* GpuBlacklist::GetFeatureStatus(bool gpu_access_allowed,
|
| bool disable_accelerated_compositing,
|
| - bool enable_accelerated_2D_canvas,
|
| + bool disable_accelerated_2D_canvas,
|
| bool disable_experimental_webgl,
|
| bool disable_multisampling) const {
|
| DictionaryValue* status = new DictionaryValue();
|
| @@ -724,13 +724,13 @@
|
|
|
| // 2d_canvas.
|
| if (!gpu_access_allowed) {
|
| - if(enable_accelerated_2D_canvas)
|
| + if (disable_accelerated_2D_canvas)
|
| feature_status_list->Append(NewStatusValue("2d_canvas",
|
| - "unavailable_software"));
|
| + "software"));
|
| else
|
| feature_status_list->Append(NewStatusValue("2d_canvas",
|
| - "software"));
|
| - } else if (enable_accelerated_2D_canvas) {
|
| + "unavailable_software"));
|
| + } else if (!disable_accelerated_2D_canvas) {
|
| if (IsFeatureBlacklisted(
|
| GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas))
|
| feature_status_list->Append(NewStatusValue("2d_canvas",
|
| @@ -786,7 +786,7 @@
|
| 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(
|
| @@ -803,7 +803,7 @@
|
| // 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.");
|
| @@ -811,16 +811,15 @@
|
| problem->Set("webkitBugs", new ListValue());
|
| problem_list->Append(problem);
|
| }
|
| - if(!enable_accelerated_2D_canvas) {
|
| + if (disable_accelerated_2D_canvas) {
|
| DictionaryValue* problem = new DictionaryValue();
|
| problem->SetString("description",
|
| - "Accelerated 2D canvas has not been enabled "
|
| - "(in about:flags or command line)");
|
| + "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) {
|
| + if (disable_accelerated_compositing) {
|
| DictionaryValue* problem = new DictionaryValue();
|
| problem->SetString("description",
|
| "Accelerated compositing has been disabled, either via about:flags "
|
| @@ -829,7 +828,7 @@
|
| 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 "
|
| @@ -838,7 +837,7 @@
|
| 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 "
|
|
|