Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java |
index 5dd539b41b8c70c30f94cba53db9474aa5c77fa7..0e0e76f53f414b1c1518b710b7425c5da419dfaa 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java |
@@ -290,7 +290,9 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState |
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; |
@@ -814,7 +816,7 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState |
public void onSizeChanged(float width, float height, float visibleViewportOffsetY, |
int orientation) { |
resizePanelContentViewCore(width, height); |
- onSizeChanged(width, height); |
+ onLayoutChanged(width, height, visibleViewportOffsetY); |
} |
/** |
@@ -824,15 +826,12 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState |
* @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)); |