Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
index 93bcd93cea14d3f23e8e3539da8a3cda2e3873cb..1ed93699cb40b92e09193e1e60de702d9818fb0c 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java |
@@ -340,7 +340,6 @@ public final class Tab implements ViewGroup.OnHierarchyChangeListener, |
private FullscreenManager mFullscreenManager; |
private float mPreviousFullscreenTopControlsOffsetY = Float.NaN; |
private float mPreviousFullscreenContentOffsetY = Float.NaN; |
- private float mPreviousFullscreenOverdrawBottomHeight = Float.NaN; |
private int mFullscreenHungRendererToken = FullscreenManager.INVALID_TOKEN; |
private boolean mIsFullscreenWaitingForLoad = false; |
@@ -371,9 +370,8 @@ public final class Tab implements ViewGroup.OnHierarchyChangeListener, |
@Override |
public void onOffsetsForFullscreenChanged( |
- float topControlsOffsetY, float contentOffsetY, float overdrawBottomHeight) { |
- onOffsetsChanged(topControlsOffsetY, contentOffsetY, overdrawBottomHeight, |
- isShowingSadTab()); |
+ float topControlsOffsetY, float contentOffsetY) { |
+ onOffsetsChanged(topControlsOffsetY, contentOffsetY, isShowingSadTab()); |
} |
@Override |
@@ -1180,7 +1178,6 @@ public final class Tab implements ViewGroup.OnHierarchyChangeListener, |
mFullscreenManager.setPersistentFullscreenMode(false); |
mFullscreenManager.hideControlsPersistent(mFullscreenHungRendererToken); |
mFullscreenHungRendererToken = FullscreenManager.INVALID_TOKEN; |
- mPreviousFullscreenOverdrawBottomHeight = Float.NaN; |
} |
if (mTabUma != null) mTabUma.onHide(); |
@@ -2353,14 +2350,12 @@ public final class Tab implements ViewGroup.OnHierarchyChangeListener, |
* compositor. |
* @param topControlsOffsetY The Y offset of the top controls in physical pixels. |
* @param contentOffsetY The Y offset of the content in physical pixels. |
- * @param overdrawBottomHeight The overdraw height. |
* @param isNonFullscreenPage Whether a current page is non-fullscreen page or not. |
*/ |
private void onOffsetsChanged(float topControlsOffsetY, float contentOffsetY, |
- float overdrawBottomHeight, boolean isNonFullscreenPage) { |
+ boolean isNonFullscreenPage) { |
mPreviousFullscreenTopControlsOffsetY = topControlsOffsetY; |
mPreviousFullscreenContentOffsetY = contentOffsetY; |
- mPreviousFullscreenOverdrawBottomHeight = overdrawBottomHeight; |
if (mFullscreenManager == null) return; |
if (isNonFullscreenPage || isNativePage()) { |
@@ -2503,13 +2498,6 @@ public final class Tab implements ViewGroup.OnHierarchyChangeListener, |
} |
/** |
- * @return The most recent frame's overdraw bottom height in pixels. |
- */ |
- public float getFullscreenOverdrawBottomHeightPix() { |
- return mPreviousFullscreenOverdrawBottomHeight; |
- } |
- |
- /** |
* Add a new navigation entry for the current URL and page title. |
*/ |
void pushNativePageStateToNavigationEntry() { |