Android: Fix overlay width for multi-window mode

The reported bug uncovered an issue about non-full-width overlay panel
having a wrong, full width when toggling (or resizing while in)
multi-window mode. The new panel width calculated from the new size
should have been used, but the raw, full width value was passed to
resizing logic of the content layer. This is a new corner case where
non-full-width overlay panel is preserved across size change.

This CL fixes it to ensure that the right values from
|OverlayPanelBase.getContentView{Width|Height}Px()| are used.
Also did a cleanup removing some dup'ed codes and combined WebContents/
native backing size updates as they are always done together.


Bug: 855386
Change-Id: I0a982dd21a083bbec7b9e0d5838a866ebcce31cb
Reviewed-on: https://chromium-review.googlesource.com/1127918Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574019}

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java

@@ -814,32 +814,28 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
             int orientation) {
         // Filter events that don't change the viewport width or height.
         if (height != mViewportHeight || width != mViewportWidth) {
-          // We only care if the orientation is changing or we're shifting in/out of multi-window.
-          // In either case the screen's viewport width or height will certainly change.
+            // We only care if the orientation is changing or we're shifting in/out of multi-window.
+            // In either case the screen's viewport width or height will certainly change.
             mViewportWidth = width;
             mViewportHeight = height;
-            resizePanelContentView(width, height);
+
             onLayoutChanged(width, height, visibleViewportOffsetY);
+            resizePanelContentView();
         }
     }
 
     /**
      * Resize the panel's ContentView. Apply adjusted bar size to the height.
-     * @param width The new width in dp.
-     * @param height The new height in dp.
      */
-    protected void resizePanelContentView(float width, float height) {
+    protected void resizePanelContentView() {
         if (!isShowing()) return;
+
         OverlayPanelContent panelContent = getOverlayPanelContent();
-        int widthPx = (int) (width / mPxToDp);
-        int heightPx = (int) (height / mPxToDp);
 
         // Device could have been rotated before panel webcontent creation. Update content size.
-        panelContent.setContentViewSize(widthPx, heightPx, isFullWidthSizePanel());
-
-        if (isFullWidthSizePanel()) heightPx = (int) ((height - getBarHeight()) / mPxToDp);
-        panelContent.onSizeChanged(widthPx, heightPx);
-        panelContent.onPhysicalBackingSizeChanged(widthPx, heightPx);
+        panelContent.setContentViewSize(
+                getContentViewWidthPx(), getContentViewHeightPx(), isFullWidthSizePanel());
+        panelContent.resizePanelContentView();
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

@@ -365,9 +365,7 @@ public class OverlayPanelContent {
                 mNativeOverlayPanelContentPtr, mInterceptNavigationDelegate, mWebContents);
 
         mContentDelegate.onContentViewCreated();
-        int viewHeight = mContentViewHeight - (mSubtractBarHeight ? mBarHeightPx : 0);
-        onPhysicalBackingSizeChanged(mContentViewWidth, viewHeight);
-        mWebContents.setSize(mContentViewWidth, viewHeight);
+        resizePanelContentView();
         mActivity.getCompositorViewHolder().addView(mContainerView, 1);
     }
 
@@ -502,17 +500,13 @@ public class OverlayPanelContent {
         return mContainerView;
     }
 
-    void onSizeChanged(int width, int height) {
-        if (getWebContents() == null) return;
-        getWebContents().setSize(width, height);
-    }
-
-    void onPhysicalBackingSizeChanged(int width, int height) {
+    void resizePanelContentView() {
         WebContents webContents = getWebContents();
-        if (webContents != null) {
-            nativeOnPhysicalBackingSizeChanged(
-                    mNativeOverlayPanelContentPtr, webContents, width, height);
-        }
+        if (webContents == null) return;
+        int viewHeight = mContentViewHeight - (mSubtractBarHeight ? mBarHeightPx : 0);
+        nativeOnPhysicalBackingSizeChanged(
+                mNativeOverlayPanelContentPtr, webContents, mContentViewWidth, viewHeight);
+        mWebContents.setSize(mContentViewWidth, viewHeight);
     }
 
     /**

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java

@@ -162,7 +162,7 @@ public class OverlayPanelEventFilterTest {
         }
 
         @Override
-        protected void resizePanelContentView(float width, float height) {}
+        protected void resizePanelContentView() {}
 
         @Override
         protected void animatePanelTo(float height, long duration) {