diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 08:27:40 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 08:27:40 +0000 |
| commit | f4d7feacd341fcdf796882be07a486ae62ccdd84 (patch) | |
| tree | 24d0c8e906aa720c855691f9c283ebb453f5271f /webkit/glue | |
| parent | 46f89e149da3971fcf52b778de939256fae4249a (diff) | |
| download | chromium_src-f4d7feacd341fcdf796882be07a486ae62ccdd84.zip chromium_src-f4d7feacd341fcdf796882be07a486ae62ccdd84.tar.gz chromium_src-f4d7feacd341fcdf796882be07a486ae62ccdd84.tar.bz2 | |
Introduce "--enable-memory-info" command-line flag to enable reporting
of JS heap size via "console.memory" (for now) and
"webkitPerformance.memory" (having Web Timing enabled).
BUG=43281
TEST=none
Review URL: http://codereview.chromium.org/3017007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index 7fd6a39..987cef4 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -96,6 +96,9 @@ void WebPreferences::Apply(WebView* web_view) const { // Enable gpu-accelerated compositing if requested on the command line. settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled); + // Enable memory info reporting to page if requested on the command line. + settings->setMemoryInfoEnabled(memory_info_enabled); + for (WebInspectorPreferences::const_iterator it = inspector_settings.begin(); it != inspector_settings.end(); ++it) web_view->setInspectorSetting(WebString::fromUTF8(it->first), diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index b86a051..3e4f926 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -65,6 +65,7 @@ struct WebPreferences { bool show_composited_layer_borders; bool accelerated_compositing_enabled; bool enable_html5_parser; + bool memory_info_enabled; // We try to keep the default values the same as the default values in // chrome, except for the cases where it would require lots of extra work for @@ -109,7 +110,8 @@ struct WebPreferences { experimental_webgl_enabled(false), show_composited_layer_borders(false), accelerated_compositing_enabled(false), - enable_html5_parser(true) { + enable_html5_parser(true), + memory_info_enabled(false) { } void Apply(WebKit::WebView* web_view) const; |