Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: webkit/glue/fling_animator_impl_android.h

Issue 11280255: Removed reference to unnecessary WebFlingAnimator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: proof-reading Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/glue/fling_animator_impl_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/fling_animator_impl_android.h
diff --git a/webkit/glue/fling_animator_impl_android.h b/webkit/glue/fling_animator_impl_android.h
index a4adfe41c158cf51cb36fef925bb663d9967aa8a..8d3758b60385370a312ce020faa418d5eb36c344 100644
--- a/webkit/glue/fling_animator_impl_android.h
+++ b/webkit/glue/fling_animator_impl_android.h
@@ -6,13 +6,11 @@
#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"
+#include "ui/gfx/point_f.h"
namespace WebKit {
class WebGestureCurveTarget;
@@ -20,10 +18,7 @@ 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();
@@ -32,18 +27,15 @@ class FlingAnimatorImpl : public WebKit::WebFlingAnimator,
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 gfx::PointF& velocity);
+ // Returns true if the animation is not yet finished.
+ bool UpdatePosition();
+ gfx::Point GetCurrentPosition();
+ virtual void CancelFling();
+
bool is_active_;
// Java OverScroller instance and methods.
« no previous file with comments | « no previous file | webkit/glue/fling_animator_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698