| Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
|
| index 3d0f4d85436aacfd275d5e7eedb73d71ed1bae2c..6a22e52302a7318b1648bb34d3a1c2ac711068be 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
|
| @@ -147,7 +147,6 @@ public class CompositorView
|
| @Override
|
| protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
|
| super.onLayout(changed, left, top, right, bottom);
|
| - mRenderHost.onOverdrawBottomHeightChanged(getOverdrawBottomHeight());
|
| }
|
|
|
| @Override
|
| @@ -164,21 +163,6 @@ public class CompositorView
|
| }
|
|
|
| /**
|
| - * @return The amount the surface view is overdrawing the window bounds.
|
| - */
|
| - public int getOverdrawBottomHeight() {
|
| - if (mRootActivityView == null) {
|
| - mRootActivityView = mRootView.findViewById(android.R.id.content);
|
| - }
|
| - if (mRootActivityView != null) {
|
| - int compositorHeight = getHeight();
|
| - int rootViewHeight = mRootActivityView.getHeight();
|
| - return Math.max(0, compositorHeight - rootViewHeight);
|
| - }
|
| - return 0;
|
| - }
|
| -
|
| - /**
|
| * Should be called for cleanup when the CompositorView instance is no longer used.
|
| */
|
| public void shutDown() {
|
| @@ -412,11 +396,7 @@ public class CompositorView
|
| provider.getViewportPixel(mCacheViewport);
|
| nativeSetLayoutViewport(mNativeCompositorView, mCacheViewport.left, mCacheViewport.top,
|
| mCacheViewport.width(), mCacheViewport.height(), mCacheVisibleViewport.left,
|
| - mCacheVisibleViewport.top, mRenderHost.getCurrentOverdrawBottomHeight(), 1.0f);
|
| -
|
| - mCacheVisibleViewport.right = mCacheVisibleViewport.left + mSurfaceWidth;
|
| - mCacheVisibleViewport.bottom = mCacheVisibleViewport.top
|
| - + Math.max(mSurfaceHeight - mRenderHost.getCurrentOverdrawBottomHeight(), 0);
|
| + mCacheVisibleViewport.top, 1.0f);
|
|
|
| // TODO(changwan): move to treeprovider.
|
| updateToolbarLayer(provider, forRotation, progressBarDrawingInfo);
|
| @@ -464,7 +444,7 @@ public class CompositorView
|
| private native void nativeSetNeedsComposite(long nativeCompositorView);
|
| private native void nativeSetLayoutViewport(long nativeCompositorView, float x, float y,
|
| float width, float height, float visibleXOffset, float visibleYOffset,
|
| - float overdrawBottomHeight, float dpToPixel);
|
| + float dpToPixel);
|
| private native void nativeUpdateToolbarLayer(long nativeCompositorView, int resourceId,
|
| int toolbarBackgroundColor, int urlBarResourceId, float urlBarAlpha, float topOffset,
|
| float brightness, boolean visible, boolean showShadow);
|
|
|