Index: content/renderer/gpu/input_handler_proxy.h |
diff --git a/content/renderer/gpu/input_handler_proxy.h b/content/renderer/gpu/input_handler_proxy.h |
index e307827bc00c799e0a690797da3fa4ad4759b74d..ec1c0294e306c5cb0959048e8953a4509d74006a 100644 |
--- a/content/renderer/gpu/input_handler_proxy.h |
+++ b/content/renderer/gpu/input_handler_proxy.h |
@@ -10,10 +10,7 @@ |
#include "base/memory/scoped_ptr.h" |
#include "cc/input/input_handler.h" |
#include "content/common/content_export.h" |
-#include "third_party/WebKit/public/web/WebActiveWheelFlingParameters.h" |
#include "third_party/WebKit/public/web/WebInputEvent.h" |
-#include "third_party/WebKit/public/platform/WebGestureCurve.h" |
-#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h" |
namespace content { |
@@ -24,8 +21,7 @@ class InputHandlerProxyClient; |
// on the compositor thread. Each InputHandler instance handles input events |
// intended for a specific WebWidget. |
class CONTENT_EXPORT InputHandlerProxy |
- : public cc::InputHandlerClient, |
- public NON_EXPORTED_BASE(WebKit::WebGestureCurveTarget) { |
+ : public cc::InputHandlerClient { |
public: |
explicit InputHandlerProxy(cc::InputHandler* input_handler); |
virtual ~InputHandlerProxy(); |
@@ -45,31 +41,13 @@ class CONTENT_EXPORT InputHandlerProxy |
// cc::InputHandlerClient implementation. |
virtual void WillShutdown() OVERRIDE; |
virtual void Animate(base::TimeTicks time) OVERRIDE; |
- virtual void MainThreadHasStoppedFlinging() OVERRIDE; |
virtual void DidOverscroll(const cc::DidOverscrollParams& params) OVERRIDE; |
- // WebKit::WebGestureCurveTarget implementation. |
- virtual void scrollBy(const WebKit::WebFloatSize& offset); |
- virtual void notifyCurrentFlingVelocity(const WebKit::WebFloatSize& velocity); |
- |
bool gesture_scroll_on_impl_thread_for_testing() const { |
return gesture_scroll_on_impl_thread_; |
} |
private: |
- EventDisposition HandleGestureFling(const WebKit::WebGestureEvent& event); |
- |
- // Returns true if we scrolled by the increment. |
- bool TouchpadFlingScroll(const WebKit::WebFloatSize& increment); |
- |
- // Returns true if we actually had an active fling to cancel. |
- bool CancelCurrentFling(); |
- |
- scoped_ptr<WebKit::WebGestureCurve> fling_curve_; |
- // Parameters for the active fling animation, stored in case we need to |
- // transfer it out later. |
- WebKit::WebActiveWheelFlingParameters fling_parameters_; |
- |
InputHandlerProxyClient* client_; |
cc::InputHandler* input_handler_; |
@@ -79,13 +57,6 @@ class CONTENT_EXPORT InputHandlerProxy |
#endif |
bool gesture_scroll_on_impl_thread_; |
bool gesture_pinch_on_impl_thread_; |
- // This is always false when there are no flings on the main thread, but |
- // conservative in the sense that we might not be actually flinging when it is |
- // true. |
- bool fling_may_be_active_on_main_thread_; |
- // The axes on which the current fling has overshot the bounds of the content. |
- bool fling_overscrolled_horizontally_; |
- bool fling_overscrolled_vertically_; |
DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); |
}; |