diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 01:02:15 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 01:02:15 +0000 |
| commit | 415f53ef5d509c8a3ea0f472f9fd6bd175129d78 (patch) | |
| tree | c690b043e72fb535709fd0934a098a12ed880b0f /cc/layer_impl.cc | |
| parent | dfad18be78e099d61120b44ebaafa236fc5f8be0 (diff) | |
| download | chromium_src-415f53ef5d509c8a3ea0f472f9fd6bd175129d78.zip chromium_src-415f53ef5d509c8a3ea0f472f9fd6bd175129d78.tar.gz chromium_src-415f53ef5d509c8a3ea0f472f9fd6bd175129d78.tar.bz2 | |
Revert "Rename ActiveAnimation -> Animation"
TBR=vollick
BUG=none
Review URL: https://codereview.chromium.org/11642055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_impl.cc')
| -rw-r--r-- | cc/layer_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index a62c353..09c1fa0 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -649,7 +649,7 @@ float LayerImpl::opacity() const bool LayerImpl::opacityIsAnimating() const { - return m_layerAnimationController->isAnimatingProperty(Animation::Opacity); + return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Opacity); } void LayerImpl::setPosition(const gfx::PointF& position) @@ -696,7 +696,7 @@ const gfx::Transform& LayerImpl::transform() const bool LayerImpl::transformIsAnimating() const { - return m_layerAnimationController->isAnimatingProperty(Animation::Transform); + return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Transform); } void LayerImpl::setContentBounds(const gfx::Size& contentBounds) |