| Index: content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h
|
| diff --git a/webkit/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h b/content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h
|
| similarity index 73%
|
| rename from webkit/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h
|
| rename to content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h
|
| index ae1c8b075f21287f02b4b94d89e16a4c638fa04a..4c29f8fdd76b5960edff89c3bfaec89762423213 100644
|
| --- a/webkit/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h
|
| +++ b/content/renderer/compositor_bindings/web_scroll_offset_animation_curve_impl.h
|
| @@ -2,28 +2,28 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
|
| -#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
|
| +#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"
|
| -#include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h"
|
|
|
| namespace cc {
|
| class AnimationCurve;
|
| class ScrollOffsetAnimationCurve;
|
| }
|
|
|
| -namespace webkit {
|
| +namespace content {
|
|
|
| class WebScrollOffsetAnimationCurveImpl
|
| : public blink::WebScrollOffsetAnimationCurve {
|
| public:
|
| - WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebScrollOffsetAnimationCurveImpl(
|
| + CONTENT_EXPORT WebScrollOffsetAnimationCurveImpl(
|
| blink::WebFloatPoint target_value,
|
| TimingFunctionType timing_function);
|
| virtual ~WebScrollOffsetAnimationCurveImpl();
|
| @@ -44,8 +44,9 @@ class WebScrollOffsetAnimationCurveImpl
|
| DISALLOW_COPY_AND_ASSIGN(WebScrollOffsetAnimationCurveImpl);
|
| };
|
|
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|
| #endif // WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
|
|
|
| -#endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
|
| +#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLL_OFFSET_ANIMATION_CURVE_IMPL_H_
|
| +
|
|
|