summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-08 01:23:38 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-08 01:23:38 +0000
commit555e75d02851c9e8ed138f49a6b254dfcac8c1c5 (patch)
tree685061ba27a9cc11e53096357f9450e06f7dbd83 /webkit/glue
parent19cd4eb279d4ef9985d1cee3cf2a99fd20d61f14 (diff)
downloadchromium_src-555e75d02851c9e8ed138f49a6b254dfcac8c1c5.zip
chromium_src-555e75d02851c9e8ed138f49a6b254dfcac8c1c5.tar.gz
chromium_src-555e75d02851c9e8ed138f49a6b254dfcac8c1c5.tar.bz2
Add command line switch for enabling threaded compositing
This is a patch against the patch in http://codereview.chromium.org/8139020/ BUG=none TEST=none Review URL: http://codereview.chromium.org/8163008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104623 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webpreferences.cc3
-rw-r--r--webkit/glue/webpreferences.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 08fd7db..a554137 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -74,6 +74,7 @@ WebPreferences::WebPreferences()
show_fps_counter(false),
asynchronous_spell_checking_enabled(true),
accelerated_compositing_enabled(false),
+ threaded_compositing_enabled(false),
force_compositing_mode(false),
allow_webui_compositing(false),
composite_to_texture_enabled(false),
@@ -249,6 +250,8 @@ void WebPreferences::Apply(WebView* web_view) const {
// Enable gpu-accelerated compositing if requested on the command line.
settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
+ settings->setUseThreadedCompositor(threaded_compositing_enabled);
+
// Always enter compositing if requested on the command line.
settings->setForceCompositingMode(force_compositing_mode);
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 927c18c..6634c1d 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -88,6 +88,7 @@ struct WebPreferences {
bool show_fps_counter;
bool asynchronous_spell_checking_enabled;
bool accelerated_compositing_enabled;
+ bool threaded_compositing_enabled;
bool force_compositing_mode;
bool allow_webui_compositing;
bool composite_to_texture_enabled;