| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| index d51e32f303eb6f4bf2248e4e6e07fc28bd275303..6f3295f7ccadb7617752f542d5a265cb274f7c28 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| @@ -87,9 +87,6 @@ import java.util.Map;
|
| * Provides a Java-side 'wrapper' around a WebContent (native) instance.
|
| * Contains all the major functionality necessary to manage the lifecycle of a ContentView without
|
| * being tied to the view system.
|
| - *
|
| - * WARNING: ContentViewCore is in the process of being broken up. Please do not add new stuff.
|
| - * See https://crbug.com/598880.
|
| */
|
| @JNINamespace("content")
|
| public class ContentViewCore implements AccessibilityStateChangeListener, DisplayAndroidObserver,
|
| @@ -302,6 +299,8 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
|
| // Size of the viewport in physical pixels as set from onSizeChanged.
|
| private int mViewportWidthPix;
|
| private int mViewportHeightPix;
|
| + private int mPhysicalBackingWidthPix;
|
| + private int mPhysicalBackingHeightPix;
|
| private int mTopControlsHeightPix;
|
| private int mBottomControlsHeightPix;
|
| private boolean mTopControlsShrinkBlinkSize;
|
| @@ -879,6 +878,22 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
|
| }
|
|
|
| /**
|
| + * @return Width of underlying physical surface.
|
| + */
|
| + @CalledByNative
|
| + private int getPhysicalBackingWidthPix() {
|
| + return mPhysicalBackingWidthPix;
|
| + }
|
| +
|
| + /**
|
| + * @return Height of underlying physical surface.
|
| + */
|
| + @CalledByNative
|
| + private int getPhysicalBackingHeightPix() {
|
| + return mPhysicalBackingHeightPix;
|
| + }
|
| +
|
| + /**
|
| * @return The amount that the viewport size given to Blink is shrunk by the URL-bar..
|
| */
|
| @CalledByNative
|
| @@ -1422,6 +1437,21 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
|
| updateAfterSizeChanged();
|
| }
|
|
|
| + /**
|
| + * Called when the underlying surface the compositor draws to changes size.
|
| + * This may be larger than the viewport size.
|
| + */
|
| + public void onPhysicalBackingSizeChanged(int wPix, int hPix) {
|
| + if (mPhysicalBackingWidthPix == wPix && mPhysicalBackingHeightPix == hPix) return;
|
| +
|
| + mPhysicalBackingWidthPix = wPix;
|
| + mPhysicalBackingHeightPix = hPix;
|
| +
|
| + if (mNativeContentViewCore != 0) {
|
| + nativeWasResized(mNativeContentViewCore);
|
| + }
|
| + }
|
| +
|
| private void updateAfterSizeChanged() {
|
| mPopupZoomer.hide(false);
|
|
|
|
|