| Index: cc/layer_impl.cc
|
| diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc
|
| index 98dc5599467fee9942b73a6314e6fdc2f28f938a..4b63c84680c6aa18e7da20f13b43cb3256103f99 100644
|
| --- a/cc/layer_impl.cc
|
| +++ b/cc/layer_impl.cc
|
| @@ -632,7 +632,7 @@ float LayerImpl::opacity() const
|
|
|
| bool LayerImpl::opacityIsAnimating() const
|
| {
|
| - return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Opacity);
|
| + return m_layerAnimationController->isAnimatingProperty(Animation::Opacity);
|
| }
|
|
|
| void LayerImpl::setPosition(const gfx::PointF& position)
|
| @@ -679,7 +679,7 @@ const gfx::Transform& LayerImpl::transform() const
|
|
|
| bool LayerImpl::transformIsAnimating() const
|
| {
|
| - return m_layerAnimationController->isAnimatingProperty(ActiveAnimation::Transform);
|
| + return m_layerAnimationController->isAnimatingProperty(Animation::Transform);
|
| }
|
|
|
| void LayerImpl::setContentBounds(const gfx::Size& contentBounds)
|
|
|