diff options
author | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:55:26 +0000 |
---|---|---|
committer | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 03:55:26 +0000 |
commit | 02665c5a2c9589c6f34f14214d68c5dc47ba5155 (patch) | |
tree | fe11f3b2550eb7773bc168ae81a773e3cf529f88 /content | |
parent | bca6c2c533f6c1d2eb4d565af3d66edc5c5bff31 (diff) | |
download | chromium_src-02665c5a2c9589c6f34f14214d68c5dc47ba5155.zip chromium_src-02665c5a2c9589c6f34f14214d68c5dc47ba5155.tar.gz chromium_src-02665c5a2c9589c6f34f14214d68c5dc47ba5155.tar.bz2 |
content: Add "Rasterization" field to about:gpu.
This adds a new field to the Graphics Feature Status section of
about:gpu. The field displays current status of raster acceleration.
This will say "Software only, multi-threaded" when impl-side painting
is enabled.
BUG=223169
Review URL: https://chromiumcodereview.appspot.com/12803012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/gpu/gpu_internals_ui.cc | 18 | ||||
-rw-r--r-- | content/browser/resources/gpu/info_view.js | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index 118a4ec..acdddaf 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -328,6 +328,14 @@ base::Value* GetFeatureStatus() { "Force compositing mode is off, either disabled at the command" " line or not supported by the current system.", false + }, + { + "raster", + false, + !command_line.HasSwitch(switches::kEnableAcceleratedPainting), + "Accelerated rasterization has not been enabled or" + " is not supported by the current system.", + true } }; const size_t kNumFeatures = sizeof(kGpuFeatureInfo) / sizeof(GpuFeatureInfo); @@ -346,6 +354,11 @@ base::Value* GetFeatureStatus() { status = "disabled"; if (kGpuFeatureInfo[i].name == "css_animation") { status += "_software_animated"; + } else if (kGpuFeatureInfo[i].name == "raster") { + if (cc::switches::IsImplSidePaintingEnabled()) + status += "_software_multithreaded"; + else + status += "_software"; } else { if (kGpuFeatureInfo[i].fallback_to_software) status += "_software"; @@ -383,6 +396,11 @@ base::Value* GetFeatureStatus() { status = "accelerated"; } } + // TODO(reveman): Remove this when crbug.com/223286 has been fixed. + if (kGpuFeatureInfo[i].name == "raster" && + cc::switches::IsImplSidePaintingEnabled()) { + status = "disabled_software_multithreaded"; + } feature_status_list->Append( NewStatusValue(kGpuFeatureInfo[i].name.c_str(), status.c_str())); } diff --git a/content/browser/resources/gpu/info_view.js b/content/browser/resources/gpu/info_view.js index 25b0df9..0010e2f 100644 --- a/content/browser/resources/gpu/info_view.js +++ b/content/browser/resources/gpu/info_view.js @@ -84,6 +84,7 @@ cr.define('gpu', function() { 'gpu_switching': 'GPU Switching', 'panel_fitting': 'Panel Fitting', 'force_compositing_mode': 'Force Compositing Mode', + 'raster': 'Rasterization', }; var statusLabelMap = { 'disabled_software': 'Software only. Hardware acceleration disabled.', @@ -105,6 +106,7 @@ cr.define('gpu', function() { 'gpu_switching_automatic': 'Automatic switching', 'gpu_switching_force_discrete': 'Always on discrete GPU', 'gpu_switching_force_integrated': 'Always on integrated GPU', + 'disabled_software_multithreaded': 'Software only, multi-threaded', }; var statusClassMap = { @@ -125,6 +127,7 @@ cr.define('gpu', function() { 'gpu_switching_automatic': 'feature-green', 'gpu_switching_force_discrete': 'feature-red', 'gpu_switching_force_integrated': 'feature-red', + 'disabled_software_multithreaded': 'feature-yellow', }; // GPU info, basic |