| 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 e99a348c1c9000dca3f2f303c159c22d4631f683..fe7b3322c8d432de46a7e2e0e1765a938a96b778 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
|
| @@ -287,18 +287,18 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| * Start pinch zoom. You must call {@link #pinchEnd} to stop.
|
| */
|
| void pinchBegin(long timeMs, int x, int y) {
|
| - mContentViewCore.pinchBegin(timeMs, x, y);
|
| + mContentViewCore.getContentViewGestureHandler().pinchBegin(timeMs, x, y);
|
| }
|
|
|
| /**
|
| * Stop pinch zoom.
|
| */
|
| void pinchEnd(long timeMs) {
|
| - mContentViewCore.pinchEnd(timeMs);
|
| + mContentViewCore.getContentViewGestureHandler().pinchEnd(timeMs);
|
| }
|
|
|
| void setIgnoreSingleTap(boolean value) {
|
| - mContentViewCore.setIgnoreSingleTap(value);
|
| + mContentViewCore.getContentViewGestureHandler().setIgnoreSingleTap(value);
|
| }
|
|
|
| /**
|
| @@ -314,7 +314,7 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| * coordinate.
|
| */
|
| void pinchBy(long timeMs, int anchorX, int anchorY, float delta) {
|
| - mContentViewCore.pinchBy(timeMs, anchorX, anchorY, delta);
|
| + mContentViewCore.getContentViewGestureHandler().pinchBy(timeMs, anchorX, anchorY, delta);
|
| }
|
|
|
| /**
|
| @@ -345,6 +345,10 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
|
| super.onScrollChanged(l, t, oldl, oldt);
|
| }
|
|
|
| + @Override
|
| + public boolean onTouchEvent(MotionEvent event) {
|
| + return mContentViewCore.onTouchEvent(event);
|
| + }
|
| // End FrameLayout overrides.
|
|
|
| @Override
|
|
|