Resize only the virtual viewport when the OSK triggers a resize.

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
@@ skipping 484 matching lines @@
     private PastePopupMenu mPastePopupMenu;
     private boolean mWasPastePopupShowingOnInsertionDragStart;
 
     // Size of the viewport in physical pixels as set from onSizeChanged.
     private int mViewportWidthPix;
     private int mViewportHeightPix;
     private int mPhysicalBackingWidthPix;
     private int mPhysicalBackingHeightPix;
     private int mTopControlsHeightPix;
     private boolean mTopControlsShrinkBlinkSize;
+    private int mViewportHeightWithOSKHiddenPix;
 
     // Cached copy of all positions and scales as reported by the renderer.
     private final RenderCoordinates mRenderCoordinates;
 
     // Provides smooth gamepad joystick-driven scrolling.
     private final JoystickScrollProvider mJoystickScrollProvider;
 
     private boolean mIsMobileOptimizedHint;
 
     // Tracks whether a selection is currently active.  When applied to selected text, indicates
@@ skipping 566 matching lines @@
 
     /**
      * @return Viewport height in physical pixels as set from onSizeChanged.
      */
     @CalledByNative
     public int getViewportHeightPix() {
         return mViewportHeightPix;
     }
 
     /**
+     * @return Viewport height when the OSK is hidden in physical pixels as set from onSizeChanged.
+     */
+    @CalledByNative
+    public int getViewportHeightWithOSKHiddenPix() {
+        return mViewportHeightWithOSKHiddenPix;
+    }
+
+    /**
      * @return Width of underlying physical surface.
      */
     @CalledByNative
     public int getPhysicalBackingWidthPix() {
         return mPhysicalBackingWidthPix;
     }
 
     /**
      * @return Height of underlying physical surface.
      */
@@ skipping 511 matching lines @@
         }
     }
 
     /**
      * @see View#onSizeChanged(int, int, int, int)
      */
     @SuppressWarnings("javadoc")
     public void onSizeChanged(int wPix, int hPix, int owPix, int ohPix) {
         if (getViewportWidthPix() == wPix && getViewportHeightPix() == hPix) return;
 
+        boolean displayRectChanged = false;
+        boolean triggeredByOSKShow = false;
+        if (!mFocusPreOSKViewportRect.isEmpty()) {
+            Rect rect = new Rect();
+            getContainerView().getWindowVisibleDisplayFrame(rect);
+            displayRectChanged = !rect.equals(mFocusPreOSKViewportRect);
+            // Only assume the OSK triggered the onSizeChanged if width was preserved.
+            triggeredByOSKShow = displayRectChanged
+                    && rect.width() == mFocusPreOSKViewportRect.width();
+        }
+
+        // triggeredByOSKShow is true if we are resizing to show the OSK. In this case,
+        // mViewportHeightWithOSKHiddenPix is mViewportHeightPix because the OSK was originally
+        // hidden. Otherwise, we are either resizing to hide the OSK or the onSizeChanged is not
+        // triggered by OSK, in which case mViewportHeightWithoutOSK is hPix because there's no OSK
+        // to include in the height.
+        if (triggeredByOSKShow) {
+            mViewportHeightWithOSKHiddenPix = mViewportHeightPix;

[jdduke (slow), 2015/10/09 15:17:28]

Like I said, the current heuristic is less than perfect for guessing that this
is an OSK show. At some point we might need to tighten the logic for cases like
dual window (http://www.androidcentral.com/using-dual-window-lg-g4) where the
window is resized is a persistent way vertically, e.g., make sure the height
*decreases* for the OSK showing case.

+        } else {
+            mViewportHeightWithOSKHiddenPix = hPix;
+        }
+
         mViewportWidthPix = wPix;
         mViewportHeightPix = hPix;
         if (mNativeContentViewCore != 0) {
             nativeWasResized(mNativeContentViewCore);
         }
 
-        updateAfterSizeChanged();
+        mPopupZoomer.hide(false);
+
+        // Execute a delayed form focus operation because the OSK was brought
+        // up earlier.
+        if (triggeredByOSKShow) {
+            assert mWebContents != null;
+            mWebContents.scrollFocusedEditableNodeIntoView();
+        }
+        if (displayRectChanged) {
+            cancelRequestToScrollFocusedEditableNodeIntoView();
+        }
     }
 
     /**
      * Called when the underlying surface the compositor draws to changes size.
      * This may be larger than the viewport size.
      */
     public void onPhysicalBackingSizeChanged(int wPix, int hPix) {
         if (mPhysicalBackingWidthPix == wPix && mPhysicalBackingHeightPix == hPix) return;
 
         mPhysicalBackingWidthPix = wPix;
         mPhysicalBackingHeightPix = hPix;
 
         if (mNativeContentViewCore != 0) {
             nativeWasResized(mNativeContentViewCore);
         }
     }
 
     /* TODO(aelias): Remove this after downstream callers disappear. */
     public void onOverdrawBottomHeightChanged(int overdrawHeightPix) {
     }
 
-    private void updateAfterSizeChanged() {
-        mPopupZoomer.hide(false);
-
-        // Execute a delayed form focus operation because the OSK was brought
-        // up earlier.
-        if (!mFocusPreOSKViewportRect.isEmpty()) {
-            Rect rect = new Rect();
-            getContainerView().getWindowVisibleDisplayFrame(rect);
-            if (!rect.equals(mFocusPreOSKViewportRect)) {
-                // Only assume the OSK triggered the onSizeChanged if width was preserved.
-                if (rect.width() == mFocusPreOSKViewportRect.width()) {
-                    assert mWebContents != null;
-                    mWebContents.scrollFocusedEditableNodeIntoView();
-                }
-                cancelRequestToScrollFocusedEditableNodeIntoView();
-            }
-        }
-    }
-
     private void cancelRequestToScrollFocusedEditableNodeIntoView() {
-        // Zero-ing the rect will prevent |updateAfterSizeChanged()| from
+        // Zero-ing the rect will prevent |onSizeChanged()| from
         // issuing the delayed form focus event.
         mFocusPreOSKViewportRect.setEmpty();
     }
 
     /**
      * @see View#onWindowFocusChanged(boolean)
      */
     public void onWindowFocusChanged(boolean hasWindowFocus) {
         if (!hasWindowFocus) resetGestureDetection();
         if (mActionMode != null) mActionMode.onWindowFocusChanged(hasWindowFocus);
@@ skipping 1672 matching lines @@
     private native void nativeSetTextTrackSettings(long nativeContentViewCoreImpl,
             boolean textTracksEnabled, String textTrackBackgroundColor, String textTrackFontFamily,
             String textTrackFontStyle, String textTrackFontVariant, String textTrackTextColor,
             String textTrackTextShadow, String textTrackTextSize);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }