Revert 245663 "Revert 245645 "Define WebScrollOffsetAnimationCur..."

trunk/src/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"
 #include "third_party/WebKit/public/platform/WebAnimationCurve.h"
 #include "webkit/renderer/compositor_bindings/web_filter_animation_curve_impl.h"
 #include "webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h"
+#include "webkit/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h"
 #include "webkit/renderer/compositor_bindings/web_transform_animation_curve_impl.h"
 
 using cc::Animation;
 using cc::AnimationIdProvider;
 
 using blink::WebAnimation;
 using blink::WebAnimationCurve;
 
 namespace webkit {
 
@@ skipping 20 matching lines @@
           static_cast<const WebTransformAnimationCurveImpl*>(&web_curve);
       curve = transform_curve_impl->CloneToAnimationCurve();
       break;
     }
     case WebAnimationCurve::AnimationCurveTypeFilter: {
       const WebFilterAnimationCurveImpl* filter_curve_impl =
           static_cast<const WebFilterAnimationCurveImpl*>(&web_curve);
       curve = filter_curve_impl->CloneToAnimationCurve();
       break;
     }
+#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
+    case WebAnimationCurve::AnimationCurveTypeScrollOffset: {
+      const WebScrollOffsetAnimationCurveImpl* scroll_curve_impl =
+          static_cast<const WebScrollOffsetAnimationCurveImpl*>(&web_curve);
+      curve = scroll_curve_impl->CloneToAnimationCurve();
+      break;
+    }
+#endif
   }
   animation_ = Animation::Create(
       curve.Pass(),
       animation_id,
       group_id,
       static_cast<cc::Animation::TargetProperty>(target_property));
 }
 
 WebAnimationImpl::~WebAnimationImpl() {}
 
@@ skipping 38 matching lines @@
 #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