| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| index 6921884b5d75c11cc065950abe13beaea525c7e4..f4bd279dd6072d0a028eb3bb8429bc4a432fceed 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| @@ -785,6 +785,7 @@ public class ContentViewCore
|
| };
|
|
|
| mRenderCoordinates.reset();
|
| + onRenderCoordinatesUpdated();
|
|
|
| initPopupZoomer(mContext);
|
| mImeAdapter = createImeAdapter(mContext);
|
| @@ -1433,9 +1434,9 @@ public class ContentViewCore
|
| x, y, computeHorizontalScrollOffset(), computeVerticalScrollOffset());
|
| }
|
|
|
| - @Override
|
| - public boolean hasFixedPageScale() {
|
| - return mRenderCoordinates.hasFixedPageScale();
|
| + private void onRenderCoordinatesUpdated() {
|
| + if (mContentViewGestureHandler == null) return;
|
| + mContentViewGestureHandler.updateHasFixedPageScale(mRenderCoordinates.hasFixedPageScale());
|
| }
|
|
|
| private void hidePopupDialog() {
|
| @@ -1937,8 +1938,8 @@ public class ContentViewCore
|
| mZoomManager.updateMultiTouchSupport(supportsMultiTouchZoom);
|
| }
|
|
|
| - public void updateDoubleTapDragSupport(boolean supportsDoubleTapDrag) {
|
| - mContentViewGestureHandler.updateDoubleTapDragSupport(supportsDoubleTapDrag);
|
| + public void updateDoubleTapSupport(boolean supportsDoubleTap) {
|
| + mContentViewGestureHandler.updateDoubleTapSupport(supportsDoubleTap);
|
| }
|
|
|
| public void selectPopupMenuItems(int[] indices) {
|
| @@ -2365,6 +2366,7 @@ public class ContentViewCore
|
| viewportWidth, viewportHeight,
|
| pageScaleFactor, minPageScaleFactor, maxPageScaleFactor,
|
| contentOffsetYPix);
|
| + onRenderCoordinatesUpdated();
|
|
|
| if (needTemporarilyHideHandles) temporarilyHideTextHandles();
|
| if (needUpdateZoomControls) mZoomControlsDelegate.updateZoomControls();
|
|
|