summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 19:00:58 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 19:00:58 +0000
commita8f1eaaad1ac27710e2797663d129b7cd7841c78 (patch)
treea2271704f003bbf477e99a6e605f0f672b79c99a /webkit/glue
parent82874ea9f3f8c69a9bd6e4157133c2c9428240c1 (diff)
downloadchromium_src-a8f1eaaad1ac27710e2797663d129b7cd7841c78.zip
chromium_src-a8f1eaaad1ac27710e2797663d129b7cd7841c78.tar.gz
chromium_src-a8f1eaaad1ac27710e2797663d129b7cd7841c78.tar.bz2
Add command line switches and about:flag to enable FPS indicator and compositor layer tree.
Intentionally did not add a flag for compositor-layer-tree. Can add one if we feel it is truly useful. BUG= TEST= Review URL: http://codereview.chromium.org/6581004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webpreferences.cc9
-rw-r--r--webkit/glue/webpreferences.h2
2 files changed, 11 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 0edac2f..ab359a2 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -64,6 +64,8 @@ WebPreferences::WebPreferences()
experimental_webgl_enabled(false),
gl_multisampling_enabled(true),
show_composited_layer_borders(false),
+ show_composited_layer_tree(false),
+ show_fps_counter(false),
asynchronous_spell_checking_enabled(true),
accelerated_compositing_enabled(false),
composite_to_texture_enabled(false),
@@ -163,6 +165,13 @@ void WebPreferences::Apply(WebView* web_view) const {
// on command line.
settings->setShowDebugBorders(show_composited_layer_borders);
+ // Display an FPS indicator if requested on the command line.
+ settings->setShowFPSCounter(show_fps_counter);
+
+ // Display the current compositor tree as overlay if requested on
+ // the command line
+ settings->setShowPlatformLayerTree(show_composited_layer_tree);
+
// Enable gpu-accelerated compositing if requested on the command line.
settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index aed98ba..0d37d39 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -70,6 +70,8 @@ struct WebPreferences {
bool experimental_webgl_enabled;
bool gl_multisampling_enabled;
bool show_composited_layer_borders;
+ bool show_composited_layer_tree;
+ bool show_fps_counter;
bool asynchronous_spell_checking_enabled;
bool accelerated_compositing_enabled;
bool composite_to_texture_enabled;