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

Unified Diff: cc/layer_tree_host.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_impl.cc ('k') | cc/layer_tree_host_common_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index de02ac9a3f29b16fb483b3e91387b6b75bf8b061..e21352309db71015a2c396bf9d7d575d659fd63e 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -876,8 +876,8 @@ void LayerTreeHost::animateLayers(base::TimeTicks time)
AnimationRegistrar::AnimationControllerMap copy = m_animationRegistrar->active_animation_controllers();
for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); iter != copy.end(); ++iter) {
- (*iter).second->animate(monotonicTime);
- (*iter).second->updateState(0);
+ (*iter).second->Animate(monotonicTime);
+ (*iter).second->UpdateState(NULL);
}
}
@@ -887,7 +887,7 @@ void LayerTreeHost::setAnimationEventsRecursive(const AnimationEventsVector& eve
return;
for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) {
- if (layer->id() == events[eventIndex].layerId) {
+ if (layer->id() == events[eventIndex].layer_id) {
switch (events[eventIndex].type) {
case AnimationEvent::Started:
layer->notifyAnimationStarted(events[eventIndex], wallClockTime.ToDoubleT());
« no previous file with comments | « cc/layer_impl.cc ('k') | cc/layer_tree_host_common_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698