| Index: cc/blink/web_animation_impl.cc
|
| diff --git a/cc/blink/web_animation_impl.cc b/cc/blink/web_animation_impl.cc
|
| index 85b851f97a6febaa2796f7cbbff5dd51abe5222f..5cda848afbf32aa2a5d08fe3de3fe4c7bc432fd2 100644
|
| --- a/cc/blink/web_animation_impl.cc
|
| +++ b/cc/blink/web_animation_impl.cc
|
| @@ -7,11 +7,11 @@
|
| #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"
|
| -#include "cc/blink/web_float_animation_curve_impl.h"
|
| -#include "cc/blink/web_scroll_offset_animation_curve_impl.h"
|
| -#include "cc/blink/web_transform_animation_curve_impl.h"
|
| -#include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h"
|
| +#include "third_party/WebKit/Source/platform/animation/WebCompositorAnimationCurve.h"
|
| +#include "third_party/WebKit/Source/platform/animation/WebFilterAnimationCurve.h"
|
| +#include "third_party/WebKit/Source/platform/animation/WebFloatAnimationCurve.h"
|
| +#include "third_party/WebKit/Source/platform/animation/WebScrollOffsetAnimationCurve.h"
|
| +#include "third_party/WebKit/Source/platform/animation/WebTransformAnimationCurve.h"
|
|
|
| using cc::Animation;
|
| using cc::AnimationIdProvider;
|
| @@ -35,26 +35,26 @@ WebCompositorAnimationImpl::WebCompositorAnimationImpl(
|
| scoped_ptr<cc::AnimationCurve> curve;
|
| switch (curve_type) {
|
| case WebCompositorAnimationCurve::AnimationCurveTypeFloat: {
|
| - const WebFloatAnimationCurveImpl* float_curve_impl =
|
| - static_cast<const WebFloatAnimationCurveImpl*>(&web_curve);
|
| + const blink::WebFloatAnimationCurve* float_curve_impl =
|
| + static_cast<const blink::WebFloatAnimationCurve*>(&web_curve);
|
| curve = float_curve_impl->CloneToAnimationCurve();
|
| break;
|
| }
|
| case WebCompositorAnimationCurve::AnimationCurveTypeTransform: {
|
| - const WebTransformAnimationCurveImpl* transform_curve_impl =
|
| - static_cast<const WebTransformAnimationCurveImpl*>(&web_curve);
|
| + const blink::WebTransformAnimationCurve* transform_curve_impl =
|
| + static_cast<const blink::WebTransformAnimationCurve*>(&web_curve);
|
| curve = transform_curve_impl->CloneToAnimationCurve();
|
| break;
|
| }
|
| case WebCompositorAnimationCurve::AnimationCurveTypeFilter: {
|
| - const WebFilterAnimationCurveImpl* filter_curve_impl =
|
| - static_cast<const WebFilterAnimationCurveImpl*>(&web_curve);
|
| + const blink::WebFilterAnimationCurve* filter_curve_impl =
|
| + static_cast<const blink::WebFilterAnimationCurve*>(&web_curve);
|
| curve = filter_curve_impl->CloneToAnimationCurve();
|
| break;
|
| }
|
| case WebCompositorAnimationCurve::AnimationCurveTypeScrollOffset: {
|
| - const WebScrollOffsetAnimationCurveImpl* scroll_curve_impl =
|
| - static_cast<const WebScrollOffsetAnimationCurveImpl*>(&web_curve);
|
| + const blink::WebScrollOffsetAnimationCurve* scroll_curve_impl =
|
| + static_cast<const blink::WebScrollOffsetAnimationCurve*>(&web_curve);
|
| curve = scroll_curve_impl->CloneToAnimationCurve();
|
| break;
|
| }
|
|
|