Revert "Handle direction control in compositor Animations"

webkit/renderer/compositor_bindings/web_animation_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/renderer/compositor_bindings/web_animation_impl.h"
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_id_provider.h"
 #include "third_party/WebKit/public/platform/WebAnimation.h"
@@ skipping 77 matching lines @@
 }
 
 double WebAnimationImpl::timeOffset() const {
   return animation_->time_offset();
 }
 
 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);
   return animation_.Pass();
 }
 
 #define COMPILE_ASSERT_MATCHING_ENUMS(webkit_name, cc_name)                    \
     COMPILE_ASSERT(static_cast<int>(webkit_name) == static_cast<int>(cc_name), \
                    mismatching_enums)
 
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebAnimation::TargetPropertyTransform, Animation::Transform);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebAnimation::TargetPropertyOpacity, Animation::Opacity);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebAnimation::TargetPropertyFilter, Animation::Filter);
 #if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebAnimation::TargetPropertyScrollOffset, Animation::ScrollOffset);
 #endif
 
 }  // namespace webkit