Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: cc/layer_impl.cc

Issue 11636051: Rename ActiveAnimation -> Animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layer_animation_controller_unittest.cc ('k') | cc/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « cc/layer_animation_controller_unittest.cc ('k') | cc/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698