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

2 files changed, 2 insertions, 42 deletions

diff --git a/webkit/renderer/compositor_bindings/web_animation_impl.cc b/webkit/renderer/compositor_bindings/web_animation_impl.cc
index d910acf..c401d5c 100644
--- a/webkit/renderer/compositor_bindings/web_animation_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_animation_impl.cc
@@ -95,48 +95,13 @@ void WebAnimationImpl::setTimeOffset(double monotonic_time) {
   animation_->set_time_offset(monotonic_time);
 }
 
-#if WEB_ANIMATION_SUPPORTS_FULL_DIRECTION
-blink::WebAnimation::Direction WebAnimationImpl::direction() const {
-  switch (animation_->direction()) {
-    case cc::Animation::Normal:
-      return DirectionNormal;
-    case cc::Animation::Reverse:
-      return DirectionReverse;
-    case cc::Animation::Alternate:
-      return DirectionAlternate;
-    case cc::Animation::AlternateReverse:
-      return DirectionAlternateReverse;
-    default:
-      NOTREACHED();
-  }
-  return DirectionNormal;
-}
-
-void WebAnimationImpl::setDirection(Direction direction) {
-  switch (direction) {
-    case DirectionNormal:
-      animation_->set_direction(cc::Animation::Normal);
-      break;
-    case DirectionReverse:
-      animation_->set_direction(cc::Animation::Reverse);
-      break;
-    case DirectionAlternate:
-      animation_->set_direction(cc::Animation::Alternate);
-      break;
-    case DirectionAlternateReverse:
-      animation_->set_direction(cc::Animation::AlternateReverse);
-      break;
-  }
-}
-#else
 bool WebAnimationImpl::alternatesDirection() const {
-  return animation_->direction() == cc::Animation::Alternate;
+  return animation_->alternates_direction();
 }
 
 void WebAnimationImpl::setAlternatesDirection(bool alternates) {
-  return animation_->set_direction(cc::Animation::Alternate);
+  animation_->set_alternates_direction(alternates);
 }
-#endif
 
 scoped_ptr<cc::Animation> WebAnimationImpl::PassAnimation() {
   animation_->set_needs_synchronized_start_time(true);
diff --git a/webkit/renderer/compositor_bindings/web_animation_impl.h b/webkit/renderer/compositor_bindings/web_animation_impl.h
index 07d72c7..0c248fc 100644
--- a/webkit/renderer/compositor_bindings/web_animation_impl.h
+++ b/webkit/renderer/compositor_bindings/web_animation_impl.h
@@ -33,13 +33,8 @@ class WebAnimationImpl : public blink::WebAnimation {
   virtual void setStartTime(double monotonic_time);
   virtual double timeOffset() const;
   virtual void setTimeOffset(double monotonic_time);
-#if WEB_ANIMATION_SUPPORTS_FULL_DIRECTION
-  virtual Direction direction() const;
-  virtual void setDirection(Direction);
-#else
   virtual bool alternatesDirection() const;
   virtual void setAlternatesDirection(bool alternates);
-#endif
 
   scoped_ptr<cc::Animation> PassAnimation();