Skip to content

Commit e28d1db

Browse files
author
jdduke@chromium.org
committed
Interface cleanup for WebGestureCurveTarget
This is the final patch in a three-part series towards early termination of flings when scrolling is impossible, cleaning up now unused portions of the WebGestureCurveTarget interface. Blink patch (#1) https://codereview.chromium.org/139493003/ Chromium patch (#2): https://codereview.chromium.org/136173004/ Review URL: https://codereview.chromium.org/217893004 git-svn-id: svn://svn.chromium.org/blink/trunk@170887 bbb929c8-8fbe-4397-9dbb-9b2b20218538
1 parent 782b8c5 commit e28d1db

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

Source/web/WebViewImpl.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -596,11 +596,6 @@ bool WebViewImpl::scrollBy(const WebFloatSize& delta, const WebFloatSize& veloci
596596
return false;
597597
}
598598

599-
void WebViewImpl::scrollBy(const WebFloatSize& delta)
600-
{
601-
scrollBy(delta, WebFloatSize());
602-
}
603-
604599
bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
605600
{
606601
bool eventSwallowed = false;

Source/web/WebViewImpl.h

-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ class WebViewImpl FINAL : public WebView
360360

361361
// WebGestureCurveTarget implementation for fling.
362362
virtual bool scrollBy(const WebFloatSize& delta, const WebFloatSize& velocity) OVERRIDE;
363-
virtual void scrollBy(const WebFloatSize& delta) OVERRIDE;
364363

365364
// Handles context menu events orignated via the the keyboard. These
366365
// include the VK_APPS virtual key and the Shift+F10 combine. Code is

public/platform/WebGestureCurveTarget.h

+1-8
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@ namespace blink {
3232

3333
class WebGestureCurveTarget {
3434
public:
35-
// TODO(jdduke): Make pure virtual when crrev.com/136173004 lands.
36-
virtual bool scrollBy(const WebFloatSize& delta, const WebFloatSize& velocity) { return false; }
37-
38-
// TODO(jdduke): Remove when crrev.com/136173004 lands.
39-
virtual void scrollBy(const WebFloatSize& delta) { }
40-
41-
// TODO(jdduke): Remove when crrev.com/136173004 lands.
42-
virtual void notifyCurrentFlingVelocity(const WebFloatSize& velocity) { }
35+
virtual bool scrollBy(const WebFloatSize& delta, const WebFloatSize& velocity) = 0;
4336

4437
protected:
4538
virtual ~WebGestureCurveTarget() { }

0 commit comments

Comments
 (0)