| 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 360df911cbc53281130f199a6a8bf030b5f058cb..23181f93b32bd5f35094c9e8cbe2edf7dabdb82b 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
|
| @@ -1029,6 +1029,14 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
|
| }
|
|
|
| /**
|
| + * @return Viewport height when the OSK is hidden in physical pixels as set from onSizeChanged.
|
| + */
|
| + @CalledByNative
|
| + public int getViewportHeightWithOSKHiddenPix() {
|
| + return mViewportHeightPix + getContentViewClient().getSystemWindowInsetBottom();
|
| + }
|
| +
|
| + /**
|
| * @return Width of underlying physical surface.
|
| */
|
| @CalledByNative
|
| @@ -1058,6 +1066,22 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
|
| }
|
|
|
| /**
|
| + * @return Current device scale factor (maps DIP pixels to physical pixels).
|
| + */
|
| + @VisibleForTesting
|
| + public float getDeviceScaleFactor() {
|
| + return mRenderCoordinates.getDeviceScaleFactor();
|
| + }
|
| +
|
| + /**
|
| + * @return Current page scale factor (maps CSS pixels to DIP pixels).
|
| + */
|
| + @VisibleForTesting
|
| + public float getPageScaleFactor() {
|
| + return mRenderCoordinates.getPageScaleFactor();
|
| + }
|
| +
|
| + /**
|
| * @see android.webkit.WebView#getContentHeight()
|
| */
|
| public float getContentHeightCss() {
|
|
|