Index: content/browser/gpu/gpu_blacklist.cc |
diff --git a/content/browser/gpu/gpu_blacklist.cc b/content/browser/gpu/gpu_blacklist.cc |
index f0c4413a7670ed7ad10b9073eaa10991c0446724..7b7e06788ed73dd3e663dab66f36eb3ef85f15f1 100644 |
--- a/content/browser/gpu/gpu_blacklist.cc |
+++ b/content/browser/gpu/gpu_blacklist.cc |
@@ -746,6 +746,9 @@ Value* GpuBlacklist::GetFeatureStatus(bool gpu_access_allowed, |
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")); |
@@ -789,6 +792,9 @@ Value* GpuBlacklist::GetFeatureStatus(bool gpu_access_allowed, |
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 --disab
|
+ feature_status_list->Append(NewStatusValue("webgl", |
+ "unavailable_off")); |
else |
feature_status_list->Append(NewStatusValue("webgl", |
"enabled")); |
@@ -804,6 +810,9 @@ Value* GpuBlacklist::GetFeatureStatus(bool gpu_access_allowed, |
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
|
else |
feature_status_list->Append(NewStatusValue("multisampling", |
"enabled")); |
@@ -834,7 +843,7 @@ Value* GpuBlacklist::GetFeatureStatus(bool gpu_access_allowed, |
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
|
problem->Set("crBugs", new ListValue()); |
problem->Set("webkitBugs", new ListValue()); |
problem_list->Append(problem); |