Removed reference to unnecessary WebFlingAnimator.

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_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/Source/Platform/chromium/public/WebFlingAnimator.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "ui/gfx/point.h"
 
 namespace WebKit {
 class WebGestureCurveTarget;
 }
 
 namespace webkit_glue {
 
-// TODO(rjkroege): Remove WebFlingAnimator once all of the gesture curve
-// implementation has moved to Chromium.
-class FlingAnimatorImpl : public WebKit::WebFlingAnimator,
-                          public WebKit::WebGestureCurve {
+class FlingAnimatorImpl : public WebKit::WebGestureCurve {
  public:
   FlingAnimatorImpl();
   virtual ~FlingAnimatorImpl();
 
   static FlingAnimatorImpl* CreateAndroidGestureCurve(
       const WebKit::WebFloatPoint& velocity,
       const WebKit::WebSize&);
 
-  // WebKit::WebFlingAnimator methods.
-  virtual void startFling(const WebKit::WebFloatPoint& velocity,
-                          const WebKit::WebRect& range);
-  // Returns true if the animation is not yet finished.
-  virtual bool updatePosition();
-  virtual WebKit::WebPoint getCurrentPosition();
-  virtual void cancelFling();
-
-  // WebKit::WebGestureCurve methods.
   virtual bool apply(double time,
                      WebKit::WebGestureCurveTarget* target);
  private:
+  void startFling(const WebKit::WebFloatPoint& velocity,

[jamesr, 2012/12/01 01:47:19]

if this isn't implementing exposed API and is just a chromium implementation, it
should be using gfx:: geometry types. I think you want gfx::PointF and gfx::Rect
here.

WebKit:: geometry types should be used only for crossing API boundaries - not
for logic on either side.

[rjkroege, 2012/12/03 16:55:09]

Done. And an assortment of other minor style nits.

+                          const WebKit::WebRect& range);

[jamesr, 2012/12/01 01:47:19]

indentation - this should be aligned with the opening "(" if it doesn't fit on
the same line

[rjkroege, 2012/12/03 16:55:09]

Done.

+  // Returns true if the animation is not yet finished.
+  bool updatePosition();
+  WebKit::WebPoint getCurrentPosition();
+  void cancelFling();
+
   bool is_active_;
 
   // Java OverScroller instance and methods.
   base::android::ScopedJavaGlobalRef<jobject> java_scroller_;
   jmethodID fling_method_id_;
   jmethodID abort_method_id_;
   jmethodID compute_method_id_;
   jmethodID getX_method_id_;
   jmethodID getY_method_id_;
 
   gfx::Point last_position_;
 
   DISALLOW_COPY_AND_ASSIGN(FlingAnimatorImpl);
 };
 
 } // namespace webkit_glue
 
 #endif // WEBKIT_GLUE_FLING_ANIMATOR_IMPL_ANDROID_H_