diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 21:24:26 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 21:24:26 +0000 |
| commit | 9bdcfd64a8555352b63437db70ff06eabd259a16 (patch) | |
| tree | 7f6a45d10ddb164da79e4bedcbd5aa501ffe2132 /cc/layer.cc | |
| parent | 017b4f7b3f6f59a62cd296caa66db693aabd7cde (diff) | |
| download | chromium_src-9bdcfd64a8555352b63437db70ff06eabd259a16.zip chromium_src-9bdcfd64a8555352b63437db70ff06eabd259a16.tar.gz chromium_src-9bdcfd64a8555352b63437db70ff06eabd259a16.tar.bz2 | |
cc: Remove cc::settings, move them to LayerTreeSettings.
For now, we don't want to make plumbing through the WebKit API for all these
settings. So they are marked with a TODO to move into chromium. When we are
no longer going through the WebKit API from chromium, we can set these settings
in chromium, instead of reading the command-line parameters in cc.
Depends on: https://bugs.webkit.org/show_bug.cgi?id=102146
R=jamesr
BUG=160771
Review URL: https://chromiumcodereview.appspot.com/11361223
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer.cc')
| -rw-r--r-- | cc/layer.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/layer.cc b/cc/layer.cc index 88390a0..8164ee9 100644 --- a/cc/layer.cc +++ b/cc/layer.cc @@ -9,7 +9,6 @@ #include "cc/layer_animation_controller.h" #include "cc/layer_impl.h" #include "cc/layer_tree_host.h" -#include "cc/settings.h" #include "third_party/skia/include/core/SkImageFilter.h" #include "ui/gfx/rect_conversions.h" #include <public/WebAnimationDelegate.h> @@ -768,7 +767,7 @@ bool Layer::addAnimation(scoped_ptr <ActiveAnimation> animation) if (!m_layerTreeHost) return false; - if (!Settings::acceleratedAnimationEnabled()) + if (!m_layerTreeHost->settings().acceleratedAnimationEnabled) return false; m_layerAnimationController->addAnimation(animation.Pass()); |