| Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| index f5b4fb79b994a20c69acd4f637dd4d4f4b6ea039..40221a383bfe1cad7f47ca0e70b31cea25657966 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| @@ -236,24 +236,7 @@ public class ContentView extends FrameLayout
|
| */
|
| @VisibleForTesting
|
| public void fling(long timeMs, int x, int y, int velocityX, int velocityY) {
|
| - mContentViewCore.getContentViewGestureHandler().fling(timeMs, x, y, velocityX, velocityY);
|
| - }
|
| -
|
| - /**
|
| - * Modify the ContentView magnification level. The effect of calling this
|
| - * method is exactly as after "pinch zoom".
|
| - *
|
| - * @param timeMs The event time in milliseconds.
|
| - * @param delta The ratio of the new magnification level over the current
|
| - * magnification level.
|
| - * @param anchorX The magnification anchor (X) in the current view
|
| - * coordinate.
|
| - * @param anchorY The magnification anchor (Y) in the current view
|
| - * coordinate.
|
| - */
|
| - @VisibleForTesting
|
| - public void pinchBy(long timeMs, int anchorX, int anchorY, float delta) {
|
| - mContentViewCore.getContentViewGestureHandler().pinchBy(timeMs, anchorX, anchorY, delta);
|
| + mContentViewCore.flingForTest(timeMs, x, y, velocityX, velocityY);
|
| }
|
|
|
| /**
|
| @@ -475,11 +458,11 @@ public class ContentView extends FrameLayout
|
| }
|
|
|
| public int getSingleTapX() {
|
| - return mContentViewCore.getContentViewGestureHandler().getSingleTapX();
|
| + return mContentViewCore.getSingleTapX();
|
| }
|
|
|
| public int getSingleTapY() {
|
| - return mContentViewCore.getContentViewGestureHandler().getSingleTapY();
|
| + return mContentViewCore.getSingleTapY();
|
| }
|
|
|
| @Override
|
|
|