Remove #ifs related to WebScrollOffsetAnimationCurve

This removes "#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED"
lines added in http://crrev.com/112933005. These are no longer
needed since http://crrev.com/365903004 (which #defines
WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED) has landed.

BUG=243871

Review URL: https://codereview.chromium.org/383503003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282354 0039d316-1c4b-4281-b951-d872f2087c98

content/child/assert_matching_enums.cc

@@ -53,9 +53,7 @@ COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyOpacity,
     cc::Animation::Opacity);
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyFilter,
     cc::Animation::Filter);
-#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
 COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyScrollOffset,
     cc::Animation::ScrollOffset);
-#endif
 
 } // namespace content

content/renderer/compositor_bindings/web_animation_impl.cc

@@ -52,14 +52,12 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& 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(),

content/renderer/compositor_bindings/web_compositor_support_impl.cc

@@ -40,9 +40,7 @@ using blink::WebScrollbar;
 using blink::WebScrollbarLayer;
 using blink::WebScrollbarThemeGeometry;
 using blink::WebScrollbarThemePainter;
-#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
 using blink::WebScrollOffsetAnimationCurve;
-#endif
 using blink::WebSolidColorLayer;
 using blink::WebTransformAnimationCurve;
 using blink::WebTransformOperations;
@@ -115,14 +113,12 @@ WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() {
   return new WebFloatAnimationCurveImpl();
 }
 
-#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
 WebScrollOffsetAnimationCurve*
 WebCompositorSupportImpl::createScrollOffsetAnimationCurve(
     blink::WebFloatPoint target_value,
     blink::WebAnimationCurve::TimingFunctionType timing_function) {
   return new WebScrollOffsetAnimationCurveImpl(target_value, timing_function);
 }
-#endif
 
 WebTransformAnimationCurve*
 WebCompositorSupportImpl::createTransformAnimationCurve() {

content/renderer/compositor_bindings/web_compositor_support_impl.h

@@ -48,12 +48,10 @@ class CONTENT_EXPORT WebCompositorSupportImpl
       int animation_id);
   virtual blink::WebFilterAnimationCurve* createFilterAnimationCurve();
   virtual blink::WebFloatAnimationCurve* createFloatAnimationCurve();
-#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
   virtual blink::WebScrollOffsetAnimationCurve*
       createScrollOffsetAnimationCurve(
           blink::WebFloatPoint target_value,
           blink::WebAnimationCurve::TimingFunctionType timing_function);
-#endif
   virtual blink::WebTransformAnimationCurve* createTransformAnimationCurve();
   virtual blink::WebTransformOperations* createTransformOperations();
   virtual blink::WebFilterOperations* createFilterOperations();

content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.cc

@@ -4,8 +4,6 @@
 
 #include "content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h"
 
-#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
-
 #include "cc/animation/scroll_offset_animation_curve.h"
 #include "cc/animation/timing_function.h"
 #include "content/renderer/compositor_bindings/web_animation_curve_common.h"
@@ -51,5 +49,3 @@ WebScrollOffsetAnimationCurveImpl::CloneToAnimationCurve() const {
 
 }  // namespace content
 
-#endif  // WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
-

content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h

@@ -5,10 +5,6 @@
 #ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
 #define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
 
-#include "third_party/WebKit/public/platform/WebAnimationCurve.h"
-
-#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
-
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebScrollOffsetAnimationCurve.h"
@@ -46,7 +42,5 @@ class WebScrollOffsetAnimationCurveImpl
 
 }  // namespace content
 
-#endif  // WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
-
 #endif  // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_