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

Unified Diff: ui/compositor/layer_animator.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_sequence.cc ('k') | ui/compositor/transform_animation_curve_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animator.cc
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc
index e18c796fed3b76f2c32e8144ba71353b51ff70eb..2324434dbd7865b85fa743fc72a933bbb7dcd876 100644
--- a/ui/compositor/layer_animator.cc
+++ b/ui/compositor/layer_animator.cc
@@ -319,14 +319,14 @@ void LayerAnimator::RemoveObserver(LayerAnimationObserver* observer) {
void LayerAnimator::OnThreadedAnimationStarted(
const cc::AnimationEvent& event) {
LayerAnimationElement::AnimatableProperty property =
- LayerAnimationElement::ToAnimatableProperty(event.targetProperty);
+ LayerAnimationElement::ToAnimatableProperty(event.target_property);
RunningAnimation* running = GetRunningAnimation(property);
if (!running)
return;
DCHECK(running->is_sequence_alive());
- if (running->sequence()->animation_group_id() != event.groupId)
+ if (running->sequence()->animation_group_id() != event.group_id)
return;
running->sequence()->OnThreadedAnimationStarted(event);
@@ -334,7 +334,7 @@ void LayerAnimator::OnThreadedAnimationStarted(
return;
base::TimeTicks start_time = base::TimeTicks::FromInternalValue(
- event.monotonicTime * base::Time::kMicrosecondsPerSecond);
+ event.monotonic_time * base::Time::kMicrosecondsPerSecond);
running->sequence()->set_waiting_for_group_start(false);
@@ -345,7 +345,7 @@ void LayerAnimator::OnThreadedAnimationStarted(
iter != running_animations_.end(); ++iter) {
// Ensure that each sequence is only Started once, regardless of the
// number of sequences in the group that have threaded first elements.
- if (((*iter).sequence()->animation_group_id() == event.groupId) &&
+ if (((*iter).sequence()->animation_group_id() == event.group_id) &&
!(*iter).sequence()->IsFirstElementThreaded() &&
(*iter).sequence()->waiting_for_group_start()) {
(*iter).sequence()->set_start_time(start_time);
« no previous file with comments | « ui/compositor/layer_animation_sequence.cc ('k') | ui/compositor/transform_animation_curve_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698