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

Unified Diff: cc/layer_impl.cc

Issue 12517003: cc: Chromify the Animation and LayerAnimationController classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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.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 ec440c9420b763fc66033427ad8b817d80a92ab2..f1ff69d0c4b6c56a5624309357191273c7026194 100644
--- a/cc/layer_impl.cc
+++ b/cc/layer_impl.cc
@@ -63,7 +63,7 @@ LayerImpl::LayerImpl(LayerTreeImpl* treeImpl, int id)
m_layerTreeImpl->RegisterLayer(this);
AnimationRegistrar* registrar = m_layerTreeImpl->animationRegistrar();
m_layerAnimationController = registrar->GetAnimationControllerForId(m_layerId);
- m_layerAnimationController->addObserver(this);
+ m_layerAnimationController->AddObserver(this);
}
LayerImpl::~LayerImpl()
@@ -72,7 +72,7 @@ LayerImpl::~LayerImpl()
DCHECK(!m_betweenWillDrawAndDidDraw);
#endif
m_layerTreeImpl->UnregisterLayer(this);
- m_layerAnimationController->removeObserver(this);
+ m_layerAnimationController->RemoveObserver(this);
}
void LayerImpl::addChild(scoped_ptr<LayerImpl> child)
@@ -365,7 +365,7 @@ void LayerImpl::pushPropertiesTo(LayerImpl* layer)
layer->setStackingOrderChanged(m_stackingOrderChanged);
- m_layerAnimationController->pushAnimationUpdatesTo(layer->layerAnimationController());
+ m_layerAnimationController->PushAnimationUpdatesTo(layer->layerAnimationController());
// Reset any state that should be cleared for the next update.
m_stackingOrderChanged = false;
@@ -739,7 +739,7 @@ float LayerImpl::opacity() const
bool LayerImpl::opacityIsAnimating() const
{
- return m_layerAnimationController->isAnimatingProperty(Animation::Opacity);
+ return m_layerAnimationController->IsAnimatingProperty(Animation::Opacity);
}
void LayerImpl::setPosition(const gfx::PointF& position)
@@ -786,7 +786,7 @@ const gfx::Transform& LayerImpl::transform() const
bool LayerImpl::transformIsAnimating() const
{
- return m_layerAnimationController->isAnimatingProperty(Animation::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.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698