diff options
author | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 21:48:01 +0000 |
---|---|---|
committer | jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 21:48:01 +0000 |
commit | 635b0e91e682d7637c5b89398a9e76161f9b744a (patch) | |
tree | 1a08cbd5c04e31dbbd7da4e6f4ca6604f9ac0bad /cc/input | |
parent | 909a9d022d002e020ccdf27ba0100bfb58c393ee (diff) | |
download | chromium_src-635b0e91e682d7637c5b89398a9e76161f9b744a.zip chromium_src-635b0e91e682d7637c5b89398a9e76161f9b744a.tar.gz chromium_src-635b0e91e682d7637c5b89398a9e76161f9b744a.tar.bz2 |
Revert of Revert of Early terminate flings when scrolling impossible (https://codereview.chromium.org/213743004/)
Reason for revert:
The broken fling layout test has been fixed in: https://codereview.chromium.org/219243010/
Original issue's description:
> Revert of Early terminate flings when scrolling impossible (https://codereview.chromium.org/136173004/)
>
> Reason for revert:
> Broke a layout test, fast/events/touch/gesture/pad-gesture-fling.html
>
> http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20Blink&tests=fast%2Fevents%2Ftouch%2Fgesture%2Fpad-gesture-fling.html
>
>
> Original issue's description:
> > Early terminate flings when scrolling impossible
> >
> > Previously, flings were terminated early only if the root layer overscrolled.
> > Now, flings will terminate if the fling target's |scrollBy()| method returns
> > false, providing consistency between layer types and saving battery on
> > sites with scrolling sublayers.
> >
> > Also move |DidOverscrollParams| into content/ in anticipation of using it
> > directly in the overscroll IPC message.
> >
> > Corresponding Blink patch:
> > https://codereview.chromium.org/139493003/
> >
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260631
>
> TBR=aelias@chromium.org,jochen@chromium.org,jdduke@chromium.org
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260773
TBR=aelias@chromium.org,jochen@chromium.org,tkent@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/222353002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/input')
-rw-r--r-- | cc/input/input_handler.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h index fda17cd..b269345 100644 --- a/cc/input/input_handler.h +++ b/cc/input/input_handler.h @@ -24,12 +24,6 @@ namespace cc { class LayerScrollOffsetDelegate; -struct DidOverscrollParams { - gfx::Vector2dF accumulated_overscroll; - gfx::Vector2dF latest_overscroll_delta; - gfx::Vector2dF current_fling_velocity; -}; - class CC_EXPORT InputHandlerClient { public: virtual ~InputHandlerClient() {} @@ -41,7 +35,8 @@ class CC_EXPORT InputHandlerClient { // Called when scroll deltas reaching the root scrolling layer go unused. // The accumulated overscroll is scoped by the most recent call to // InputHandler::ScrollBegin. - virtual void DidOverscroll(const DidOverscrollParams& params) = 0; + virtual void DidOverscroll(const gfx::Vector2dF& accumulated_overscroll, + const gfx::Vector2dF& latest_overscroll_delta) = 0; protected: InputHandlerClient() {} @@ -94,8 +89,6 @@ class CC_EXPORT InputHandler { // ScrollIgnored if not. virtual ScrollStatus FlingScrollBegin() = 0; - virtual void NotifyCurrentFlingVelocity(const gfx::Vector2dF& velocity) = 0; - virtual void MouseMoveAt(const gfx::Point& mouse_position) = 0; // Stop scrolling the selected layer. Should only be called if ScrollBegin() |