diff options
| author | Martin Kosiba <mkosiba@google.com> | 2013-07-05 18:10:55 +0100 |
|---|---|---|
| committer | Martin Kosiba <mkosiba@google.com> | 2013-07-05 18:10:55 +0100 |
| commit | 3951fbadf5157dd3fe73decc879f9b763e780b09 (patch) | |
| tree | 31eb6b9c5dc3678350f7c68e03b8cae389ee80cc /chromium/java/com/android/webview | |
| parent | 2a5e561c09bd9fc7b369d99c9166fa588e20ed38 (diff) | |
| download | webview-3951fbadf5157dd3fe73decc879f9b763e780b09.tar.gz | |
Overscroll hookup [2/2]
This adds the InternalAccessAdapter implementations needed by
https://codereview.chromium.org/18717002/.
Change-Id: Ied89661e26e804b2d00452bde36c8b53809e54a8
Diffstat (limited to 'chromium/java/com/android/webview')
| -rw-r--r-- | chromium/java/com/android/webview/chromium/WebViewChromium.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index 9771c53..abe7ee4 100644 --- a/chromium/java/com/android/webview/chromium/WebViewChromium.java +++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java @@ -701,7 +701,7 @@ class WebViewChromium implements WebViewProvider, @Override public void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) { - UnimplementedWebViewApi.invoke(); + mAwContents.onContainerViewOverScrolled(scrollX, scrollY, clampedX, clampedY); } @Override @@ -953,8 +953,7 @@ class WebViewChromium implements WebViewProvider, mWebViewPrivate.onScrollChanged(l, t, oldl, oldt); } - // TODO(mkosiba): Uncomment once upstream CL lands. - // @Override + @Override public void overScrollBy(int deltaX, int deltaY, int scrollX, int scrollY, int scrollRangeX, int scrollRangeY, @@ -964,8 +963,7 @@ class WebViewChromium implements WebViewProvider, scrollRangeX, scrollRangeY, maxOverScrollX, maxOverScrollY, isTouchEvent); } - // TODO(mkosiba): Uncomment once upstream CL lands. - // @Override + @Override public void super_scrollTo(int scrollX, int scrollY) { mWebViewPrivate.super_scrollTo(scrollX, scrollY); } |