summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-31 00:13:03 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-31 00:13:03 +0000
commitd87394f88637dc41877b27ad32129a5e6e4a9333 (patch)
tree896408a2ece300a7b03925a13445c738a8d7d3cd /webkit
parent42e35fa6dc371b261f24ddad28c53d30b1e8b66d (diff)
downloadchromium_src-d87394f88637dc41877b27ad32129a5e6e4a9333.zip
chromium_src-d87394f88637dc41877b27ad32129a5e6e4a9333.tar.gz
chromium_src-d87394f88637dc41877b27ad32129a5e6e4a9333.tar.bz2
Disable accelerated animation when using a software 3d rasterizer.
Using a software 3d rasterizer to do animation is probably slower than the regular software mode, so avoid doing that. BUG= TEST= Review URL: http://codereview.chromium.org/9289012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc3
-rw-r--r--webkit/glue/webpreferences.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 8d807e2..2d9a7ce 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -84,6 +84,7 @@ WebPreferences::WebPreferences()
composite_to_texture_enabled(false),
fixed_position_compositing_enabled(false),
accelerated_layers_enabled(false),
+ accelerated_animation_enabled(false),
accelerated_video_enabled(false),
accelerated_2d_canvas_enabled(false),
accelerated_painting_enabled(false),
@@ -295,7 +296,7 @@ void WebPreferences::Apply(WebView* web_view) const {
settings->setAcceleratedCompositingForVideoEnabled(
accelerated_video_enabled);
settings->setAcceleratedCompositingForAnimationEnabled(
- accelerated_layers_enabled);
+ accelerated_animation_enabled);
// Enabling accelerated plugins if specified from the command line.
settings->setAcceleratedCompositingForPluginsEnabled(
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 7d58641..db04cfd 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -98,6 +98,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
bool composite_to_texture_enabled;
bool fixed_position_compositing_enabled;
bool accelerated_layers_enabled;
+ bool accelerated_animation_enabled;
bool accelerated_video_enabled;
bool accelerated_2d_canvas_enabled;
bool accelerated_painting_enabled;