diff options
| author | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 21:07:25 +0000 |
|---|---|---|
| committer | wjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 21:07:25 +0000 |
| commit | 9ec543be4ee66c932c9370ea8882950f58f8792d (patch) | |
| tree | 219abe89317ecb45edd9093343d27ee4b6b3930f | |
| parent | 4e27422dab675e9b1cb3107f29c8e097a7f096ab (diff) | |
| download | chromium_src-9ec543be4ee66c932c9370ea8882950f58f8792d.zip chromium_src-9ec543be4ee66c932c9370ea8882950f58f8792d.tar.gz chromium_src-9ec543be4ee66c932c9370ea8882950f58f8792d.tar.bz2 | |
Re-submit 163654 - Fix initialisation of s_acceleratedAnimationEnabled flag.
BUG=None
This originally broke some WebKit animation layout tests due to a bug in
DumpRenderTree which have since been fixed.
Review URL: https://chromiumcodereview.appspot.com/11238063
TBR=wjmaclean@chromium.org
Review URL: https://codereview.chromium.org/11225066
TBR=wjmaclean@chromium.org
Review URL: https://codereview.chromium.org/11264015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163901 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cc/settings.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/settings.cc b/cc/settings.cc index 5954704..3aa1326 100644 --- a/cc/settings.cc +++ b/cc/settings.cc @@ -24,7 +24,7 @@ void reset() s_perTilePaintingEnabled = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnablePerTilePainting); s_partialSwapEnabled = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnablePartialSwap); - s_acceleratedAnimationEnabled = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kDisableThreadedAnimation); + s_acceleratedAnimationEnabled = !CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kDisableThreadedAnimation); s_pageScalePinchZoomEnabled = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnablePinchInCompositor); s_jankInsteadOfCheckerboard = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kJankInsteadOfCheckerboard); s_backgroundColorInsteadOfCheckerboard = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kBackgroundColorInsteadOfCheckerboard); |