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

Unified Diff: ui/compositor/layer_animation_sequence.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 | « ui/compositor/layer_animation_element.cc ('k') | ui/compositor/layer_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animation_sequence.cc
diff --git a/ui/compositor/layer_animation_sequence.cc b/ui/compositor/layer_animation_sequence.cc
index 10ba702c005cc26f036de2ff3fab6d67a03050f3..a8f4d1cee22f2a40238ffbd49a8e86b164023107 100644
--- a/ui/compositor/layer_animation_sequence.cc
+++ b/ui/compositor/layer_animation_sequence.cc
@@ -207,18 +207,18 @@ void LayerAnimationSequence::RemoveObserver(LayerAnimationObserver* observer) {
void LayerAnimationSequence::OnThreadedAnimationStarted(
const cc::AnimationEvent& event) {
- if (elements_.empty() || event.groupId != animation_group_id_)
+ if (elements_.empty() || event.group_id != animation_group_id_)
return;
size_t current_index = last_element_ % elements_.size();
const LayerAnimationElement::AnimatableProperties& element_properties =
elements_[current_index]->properties();
LayerAnimationElement::AnimatableProperty event_property =
- LayerAnimationElement::ToAnimatableProperty(event.targetProperty);
+ LayerAnimationElement::ToAnimatableProperty(event.target_property);
DCHECK(element_properties.find(event_property) != element_properties.end());
elements_[current_index]->set_effective_start_time(
base::TimeTicks::FromInternalValue(
- event.monotonicTime * base::Time::kMicrosecondsPerSecond));
+ event.monotonic_time * base::Time::kMicrosecondsPerSecond));
}
void LayerAnimationSequence::OnScheduled() {
« no previous file with comments | « ui/compositor/layer_animation_element.cc ('k') | ui/compositor/layer_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698