summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_internals_ui.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-24 21:12:21 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-24 21:12:21 +0000
commitca6344930cd8fe32876ebce8b3df42e6686250eb (patch)
tree7d3b7c485e76b2095af057956f5c9b14333db650 /content/browser/gpu/gpu_internals_ui.cc
parent226dea4944e6ea35b68b40c6d6dab62c370ec410 (diff)
downloadchromium_src-ca6344930cd8fe32876ebce8b3df42e6686250eb.zip
chromium_src-ca6344930cd8fe32876ebce8b3df42e6686250eb.tar.gz
chromium_src-ca6344930cd8fe32876ebce8b3df42e6686250eb.tar.bz2
Hide panel_fitting feature on non-CrOS platforms
The panel_fitting GPU feature is only used by Chrome OS Aura, so was blacklisted for all other platforms. Unfortunately this produced an "Unavailable. Hardware acceleration disabled." and problem message in chrome:gpu on other platforms. This change removes the panel_fitting feature on non-CrOS platforms, and changes its blacklisting rule to apply only on CrOS. As a result we will see normal status and errors on CrOS, but nothing on other platforms. BUG=158095 TEST=Checked chrome:gpu on desktop, Link and Alex for 'Panel Fitting' R=zmo@chromium.org Review URL: https://codereview.chromium.org/16311015 Patch from Chris Wolfe <cwolfe@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_internals_ui.cc')
-rw-r--r--content/browser/gpu/gpu_internals_ui.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index e3da336..edf020e 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -324,18 +324,16 @@ base::Value* GetFeatureStatus() {
" about:flags or command line.",
true
},
+#if defined(OS_CHROMEOS)
{
"panel_fitting",
manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_PANEL_FITTING),
-#if defined(OS_CHROMEOS)
command_line.HasSwitch(switches::kDisablePanelFitting),
-#else
- true,
-#endif
- "Panel fitting is unavailable, either disabled at the command"
- " line or not supported by the current system.",
+ "Panel fitting has been disabled, either via about:flags or command"
+ " line.",
false
},
+#endif
{
"force_compositing_mode",
manager->IsFeatureBlacklisted(