summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 04:10:43 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 04:10:43 +0000
commitac8c1c3254aa0f1b1f11081189d85c17d70333ef (patch)
treeb1451f22dc4308e800738b0204bbfad384810bd1 /content/browser/gpu
parent92cc72e203e58ea3650535ec844f0bd4664a8085 (diff)
downloadchromium_src-ac8c1c3254aa0f1b1f11081189d85c17d70333ef.zip
chromium_src-ac8c1c3254aa0f1b1f11081189d85c17d70333ef.tar.gz
chromium_src-ac8c1c3254aa0f1b1f11081189d85c17d70333ef.tar.bz2
Include accelerated_compositing disable flag in calculation of
about:gpu feature status. BUG=90723 TEST=Run chrome with --disable-accelerated-compositing, verify about:gpu status is expected Review URL: http://codereview.chromium.org/7523019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
-rw-r--r--content/browser/gpu/gpu_blacklist.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/gpu/gpu_blacklist.cc b/content/browser/gpu/gpu_blacklist.cc
index f0c4413..255ab4b 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)
+ feature_status_list->Append(NewStatusValue("webgl",
+ "enabled_readback"));
else
feature_status_list->Append(NewStatusValue("webgl",
"enabled"));
@@ -834,7 +840,8 @@ 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 adversely affects performance of all hardware "
+ " accelerated features.");
problem->Set("crBugs", new ListValue());
problem->Set("webkitBugs", new ListValue());
problem_list->Append(problem);