From 5f28eb4ad6cd3c061561e3b84f8e364ff1b487d0 Mon Sep 17 00:00:00 2001 From: "rafaelw@google.com" Date: Tue, 1 Apr 2014 00:57:00 +0000 Subject: Revert "Handle direction control in compositor Animations" Caused compile failures in blink canary builders. TBR=a.renevier@samsung.com BUG=348071 Review URL: https://codereview.chromium.org/220403002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260721 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/animation/animation.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'cc/animation/animation.h') diff --git a/cc/animation/animation.h b/cc/animation/animation.h index 56f1ff7..f996c38 100644 --- a/cc/animation/animation.h +++ b/cc/animation/animation.h @@ -48,8 +48,6 @@ class CC_EXPORT Animation { TargetPropertyEnumSize }; - enum Direction { Normal, Reverse, Alternate, AlternateReverse }; - static scoped_ptr Create(scoped_ptr curve, int animation_id, int group_id, @@ -80,8 +78,12 @@ class CC_EXPORT Animation { void Suspend(double monotonic_time); void Resume(double monotonic_time); - Direction direction() { return direction_; } - void set_direction(Direction direction) { direction_ = direction; } + // If alternates_direction is true, on odd numbered iterations we reverse the + // curve. + bool alternates_direction() const { return alternates_direction_; } + void set_alternates_direction(bool alternates) { + alternates_direction_ = alternates; + } bool IsFinishedAt(double monotonic_time) const; bool is_finished() const { @@ -148,7 +150,7 @@ class CC_EXPORT Animation { RunState run_state_; int iterations_; double start_time_; - Direction direction_; + bool alternates_direction_; // The time offset effectively pushes the start of the animation back in time. // This is used for resuming paused animations -- an animation is added with a -- cgit v1.1