diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 20:26:20 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 20:26:20 +0000 |
| commit | f39a5df9b45cf04660013daa562e8c2043a3630a (patch) | |
| tree | 4c365ba4bd2bdf73040715d6042b5c40987dc85b | |
| parent | 577dd6e274bfb1cf9c7db707f2154b5a05a7dbf9 (diff) | |
| download | chromium_src-f39a5df9b45cf04660013daa562e8c2043a3630a.zip chromium_src-f39a5df9b45cf04660013daa562e8c2043a3630a.tar.gz chromium_src-f39a5df9b45cf04660013daa562e8c2043a3630a.tar.bz2 | |
Merge 177318
> Improve about:gpu accuracy on force_compositing_mode.
>
> When we blacklist force_compositing_mode, but pass in --force-compositing-mode flag (in commandline or through about:flags), then the about:gpu page should display that the force_compositing_mode is on (it actually is on, because commandline flag precedes blacklist).
>
> BUG=169938
> TEST=about:gpu
> TBR=kbr
> Review URL: https://codereview.chromium.org/11969027
TBR=zmo@chromium.org
Review URL: https://codereview.chromium.org/12007003
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@177462 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/gpu_internals_ui.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc index 8458e74..cda05e7 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.cc +++ b/chrome/browser/ui/webui/gpu_internals_ui.cc @@ -321,7 +321,8 @@ Value* GetFeatureStatus() { }, { "force_compositing_mode", - flags & content::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE, + (flags & content::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE) && + !content::IsForceCompositingModeEnabled(), !content::IsForceCompositingModeEnabled() && !(flags & content::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE), "Force compositing mode is off, either disabled at the command" |