Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/blink/web_animation_impl.cc

 // Copyright 2014 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 "cc/blink/web_animation_impl.h"
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/blink/web_filter_animation_curve_impl.h"
@@ skipping 101 matching lines @@
   return animation_->time_offset().InSecondsF();
 }
 
 void WebCompositorAnimationImpl::setTimeOffset(double monotonic_time) {
   animation_->set_time_offset(base::TimeDelta::FromSecondsD(monotonic_time));
 }
 
 blink::WebCompositorAnimation::Direction WebCompositorAnimationImpl::direction()
     const {
   switch (animation_->direction()) {
-    case cc::Animation::DIRECTION_NORMAL:
+    case cc::Animation::Normal:
       return DirectionNormal;
-    case cc::Animation::DIRECTION_REVERSE:
+    case cc::Animation::Reverse:
       return DirectionReverse;
-    case cc::Animation::DIRECTION_ALTERNATE:
+    case cc::Animation::Alternate:
       return DirectionAlternate;
-    case cc::Animation::DIRECTION_ALTERNATE_REVERSE:
+    case cc::Animation::AlternateReverse:
       return DirectionAlternateReverse;
     default:
       NOTREACHED();
   }
   return DirectionNormal;
 }
 
 void WebCompositorAnimationImpl::setDirection(Direction direction) {
   switch (direction) {
     case DirectionNormal:
-      animation_->set_direction(cc::Animation::DIRECTION_NORMAL);
+      animation_->set_direction(cc::Animation::Normal);
       break;
     case DirectionReverse:
-      animation_->set_direction(cc::Animation::DIRECTION_REVERSE);
+      animation_->set_direction(cc::Animation::Reverse);
       break;
     case DirectionAlternate:
-      animation_->set_direction(cc::Animation::DIRECTION_ALTERNATE);
+      animation_->set_direction(cc::Animation::Alternate);
       break;
     case DirectionAlternateReverse:
-      animation_->set_direction(cc::Animation::DIRECTION_ALTERNATE_REVERSE);
+      animation_->set_direction(cc::Animation::AlternateReverse);
       break;
   }
 }
 
 double WebCompositorAnimationImpl::playbackRate() const {
   return animation_->playback_rate();
 }
 
 void WebCompositorAnimationImpl::setPlaybackRate(double playback_rate) {
   animation_->set_playback_rate(playback_rate);
 }
 
 blink::WebCompositorAnimation::FillMode WebCompositorAnimationImpl::fillMode()
     const {
   switch (animation_->fill_mode()) {
-    case cc::Animation::FILL_MODE_NONE:
+    case cc::Animation::FillModeNone:
       return FillModeNone;
-    case cc::Animation::FILL_MODE_FORWARDS:
+    case cc::Animation::FillModeForwards:
       return FillModeForwards;
-    case cc::Animation::FILL_MODE_BACKWARDS:
+    case cc::Animation::FillModeBackwards:
       return FillModeBackwards;
-    case cc::Animation::FILL_MODE_BOTH:
+    case cc::Animation::FillModeBoth:
       return FillModeBoth;
     default:
       NOTREACHED();
   }
   return FillModeNone;
 }
 
 void WebCompositorAnimationImpl::setFillMode(FillMode fill_mode) {
   switch (fill_mode) {
     case FillModeNone:
-      animation_->set_fill_mode(cc::Animation::FILL_MODE_NONE);
+      animation_->set_fill_mode(cc::Animation::FillModeNone);
       break;
     case FillModeForwards:
-      animation_->set_fill_mode(cc::Animation::FILL_MODE_FORWARDS);
+      animation_->set_fill_mode(cc::Animation::FillModeForwards);
       break;
     case FillModeBackwards:
-      animation_->set_fill_mode(cc::Animation::FILL_MODE_BACKWARDS);
+      animation_->set_fill_mode(cc::Animation::FillModeBackwards);
       break;
     case FillModeBoth:
-      animation_->set_fill_mode(cc::Animation::FILL_MODE_BOTH);
+      animation_->set_fill_mode(cc::Animation::FillModeBoth);
       break;
   }
 }
 
 scoped_ptr<cc::Animation> WebCompositorAnimationImpl::PassAnimation() {
   animation_->set_needs_synchronized_start_time(true);
   return animation_.Pass();
 }
 
 }  // namespace cc_blink