| Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| index 3a48355c0110b40112de4e3b5ef7fdf8f7af1141..d8c1708e4753d5293474702bdffb943f786f91b5 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -385,7 +385,7 @@ public class AwContents {
|
| //--------------------------------------------------------------------------------------------
|
| private class AwGestureStateListener extends GestureStateListener {
|
| @Override
|
| - public void onPinchGestureStart() {
|
| + public void onPinchStarted() {
|
| // While it's possible to re-layout the view during a pinch gesture, the effect is very
|
| // janky (especially that the page scale update notification comes from the renderer
|
| // main thread, not from the impl thread, so it's usually out of sync with what's on
|
| @@ -396,24 +396,18 @@ public class AwContents {
|
| }
|
|
|
| @Override
|
| - public void onPinchGestureEnd() {
|
| + public void onPinchEnded() {
|
| mLayoutSizer.unfreezeLayoutRequests();
|
| }
|
|
|
| @Override
|
| - public void onFlingStartGesture(
|
| - int velocityX, int velocityY, int scrollOffsetY, int scrollExtentY) {
|
| - mScrollOffsetManager.onFlingStartGesture(velocityX, velocityY);
|
| - }
|
| -
|
| - @Override
|
| public void onFlingCancelGesture() {
|
| mScrollOffsetManager.onFlingCancelGesture();
|
| }
|
|
|
| @Override
|
| - public void onUnhandledFlingStartEvent() {
|
| - mScrollOffsetManager.onUnhandledFlingStartEvent();
|
| + public void onUnhandledFlingStartEvent(int velocityX, int velocityY) {
|
| + mScrollOffsetManager.onUnhandledFlingStartEvent(velocityX, velocityY);
|
| }
|
|
|
| @Override
|
|
|