Refactor OverlayPanel height calculations

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

 // Copyright 2015 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.chrome.browser.compositor.bottombar;
 
 import android.app.Activity;
 import android.content.Context;
 import android.view.View;
 import android.view.View.MeasureSpec;
@@ skipping 272 matching lines @@
         return PanelPriority.MEDIUM;
     }
 
     /**
      * @return True if a panel can be suppressed. This should be overridden by each panel.
      */
     public boolean canBeSuppressed() {
         return false;
     }
 
-    @Override
+    /**
+     * @return The absolute amount in DP that the top controls have shifted off screen.
+     */
     protected float getTopControlsOffsetDp() {
         if (mActivity == null || mActivity.getFullscreenManager() == null) return 0.0f;
         return -mActivity.getFullscreenManager().getControlOffset() * mPxToDp;
     }
 
     /**
      * Set the visibility of the base page text selection controls. This will also attempt to
      * remove focus from the base page to clear any open controls.
      * TODO(mdjones): This should be replaced with focusing the panel's ContentViewCore.
      * @param visible If the text controls are visible.
@@ skipping 503 matching lines @@
 
     @Override
     public EventFilter getEventFilter() {
         return mEventFilter;
     }
 
     @Override
     public void onSizeChanged(float width, float height, float visibleViewportOffsetY,
             int orientation) {
         resizePanelContentViewCore(width, height);
-        onSizeChanged(width, height);
+        onLayoutChanged(width, height, visibleViewportOffsetY);
     }
 
     /**
      * Resize the panel's ContentViewCore manually since it is not attached to the view hierarchy.
      * TODO(mdjones): Remove the need for this method by supporting multiple ContentViewCores
      * existing simultaneously in the view hierarchy.
      * @param width The new width in dp.
      * @param height The new height in dp.
      */
-    private void resizePanelContentViewCore(float width, float height) {
+    protected void resizePanelContentViewCore(float width, float height) {
         if (!isShowing()) return;
         ContentViewCore panelContent = getContentViewCore();
         if (panelContent != null) {
-            // Take the height of the toolbar into consideration.
-            int toolbarHeightPx = getTopControlsOffsetDp() > 0
-                    ? 0 : (int) (getToolbarHeight() / mPxToDp);
             panelContent.onSizeChanged((int) (width / mPxToDp),
-                    (int) (height / mPxToDp) + toolbarHeightPx, panelContent.getViewportWidthPix(),
+                    (int) (height / mPxToDp), panelContent.getViewportWidthPix(),
                     panelContent.getViewportHeightPix());
             panelContent.onPhysicalBackingSizeChanged(
                     (int) (width / mPxToDp), (int) (height / mPxToDp));
         }
     }
 
     @Override
     public void getVirtualViews(List<VirtualView> views) {
         // TODO(mdjones): Add views for accessibility.
     }
@@ skipping 64 matching lines @@
 
     @Override
     public void tabPageLoadFinished(int id, boolean incognito) {}
 
     @Override
     public void tabLoadStarted(int id, boolean incognito) {}
 
     @Override
     public void tabLoadFinished(int id, boolean incognito) {}
 }