move webkit/glue/fling_* to webkit/child

webkit/child/fling_animator_impl_android.h

Index: webkit/child/fling_animator_impl_android.h
diff --git a/webkit/glue/fling_animator_impl_android.h b/webkit/child/fling_animator_impl_android.h
similarity index 87%
rename from webkit/glue/fling_animator_impl_android.h
rename to webkit/child/fling_animator_impl_android.h
index 63d4e0c2cc9fcc2a6ebc5cfc2005fc2728fd6af6..be7de22fc98fe8548b525de87774d9c8607fd4b1 100644
--- a/webkit/glue/fling_animator_impl_android.h
+++ b/webkit/child/fling_animator_impl_android.h
@@ -1,58 +1,58 @@
-// Copyright (c) 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.
-
-#ifndef WEBKIT_GLUE_FLING_ANIMATOR_IMPL_ANDROID_H_
-#define WEBKIT_GLUE_FLING_ANIMATOR_IMPL_ANDROID_H_
-
-#include "base/android/scoped_java_ref.h"
-#include "third_party/WebKit/public/platform/WebFloatPoint.h"
-#include "third_party/WebKit/public/platform/WebGestureCurve.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/point_f.h"
-#include "webkit/glue/webkit_glue_export.h"
-
-namespace WebKit {
-class WebGestureCurveTarget;
-}
-
-namespace webkit_glue {
-
-class WEBKIT_GLUE_EXPORT FlingAnimatorImpl : public WebKit::WebGestureCurve {
- public:
-  FlingAnimatorImpl();
-  virtual ~FlingAnimatorImpl();
-
-  static FlingAnimatorImpl* CreateAndroidGestureCurve(
-      const WebKit::WebFloatPoint& velocity,
-      const WebKit::WebSize&);
-
-  virtual bool apply(double time,
-                     WebKit::WebGestureCurveTarget* target);
-
-  static bool RegisterJni(JNIEnv*);
-
- private:
-  void StartFling(const gfx::PointF& velocity);
-  // Returns true if the animation is not yet finished.
-  bool UpdatePosition();
-  gfx::Point GetCurrentPosition();
-  float GetCurrentVelocity();
-  virtual void CancelFling();
-
-  bool is_active_;
-
-  // Java OverScroller instance and methods.
-  base::android::ScopedJavaGlobalRef<jobject> java_scroller_;
-
-  gfx::Point last_position_;
-  gfx::PointF last_velocity_;
-  double last_time_;
-
-  DISALLOW_COPY_AND_ASSIGN(FlingAnimatorImpl);
-};
-
-} // namespace webkit_glue
-
-#endif // WEBKIT_GLUE_FLING_ANIMATOR_IMPL_ANDROID_H_
+// Copyright (c) 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.
+
+#ifndef WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_
+#define WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_
+
+#include "base/android/scoped_java_ref.h"
+#include "third_party/WebKit/public/platform/WebFloatPoint.h"
+#include "third_party/WebKit/public/platform/WebGestureCurve.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
+#include "ui/gfx/point.h"
+#include "ui/gfx/point_f.h"
+#include "webkit/glue/webkit_glue_export.h"
+
+namespace WebKit {
+class WebGestureCurveTarget;
+}
+
+namespace webkit_glue {
+
+class WEBKIT_GLUE_EXPORT FlingAnimatorImpl : public WebKit::WebGestureCurve {

[jamesr, 2013/06/12 19:28:15]

why not WEBKIT_CHILD_EXPORT ?

[scottmg, 2013/06/12 19:31:10]

thanks, Done.

+ public:
+  FlingAnimatorImpl();
+  virtual ~FlingAnimatorImpl();
+
+  static FlingAnimatorImpl* CreateAndroidGestureCurve(
+      const WebKit::WebFloatPoint& velocity,
+      const WebKit::WebSize&);
+
+  virtual bool apply(double time,
+                     WebKit::WebGestureCurveTarget* target);
+
+  static bool RegisterJni(JNIEnv*);
+
+ private:
+  void StartFling(const gfx::PointF& velocity);
+  // Returns true if the animation is not yet finished.
+  bool UpdatePosition();
+  gfx::Point GetCurrentPosition();
+  float GetCurrentVelocity();
+  virtual void CancelFling();
+
+  bool is_active_;
+
+  // Java OverScroller instance and methods.
+  base::android::ScopedJavaGlobalRef<jobject> java_scroller_;
+
+  gfx::Point last_position_;
+  gfx::PointF last_velocity_;
+  double last_time_;
+
+  DISALLOW_COPY_AND_ASSIGN(FlingAnimatorImpl);
+};
+
+} // namespace webkit_glue
+
+#endif // WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_