diff options
| author | rafaelw@google.com <rafaelw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 00:57:00 +0000 |
|---|---|---|
| committer | rafaelw@google.com <rafaelw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 00:57:00 +0000 |
| commit | 5f28eb4ad6cd3c061561e3b84f8e364ff1b487d0 (patch) | |
| tree | 0d635d7e4430b52fedd50948b90bf45f1f422661 /cc/animation/animation.h | |
| parent | 1a0436898a9e983e4b0188c9a7f124c5668a29a7 (diff) | |
| download | chromium_src-5f28eb4ad6cd3c061561e3b84f8e364ff1b487d0.zip chromium_src-5f28eb4ad6cd3c061561e3b84f8e364ff1b487d0.tar.gz chromium_src-5f28eb4ad6cd3c061561e3b84f8e364ff1b487d0.tar.bz2 | |
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
Diffstat (limited to 'cc/animation/animation.h')
| -rw-r--r-- | cc/animation/animation.h | 12 |
1 files changed, 7 insertions, 5 deletions
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<Animation> Create(scoped_ptr<AnimationCurve> 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 |