[android] Resize the android_webview if it's 0x0 initially.

android_webview/java/src/org/chromium/android_webview/AwLayoutSizer.java

Index: android_webview/java/src/org/chromium/android_webview/AwLayoutSizer.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwLayoutSizer.java b/android_webview/java/src/org/chromium/android_webview/AwLayoutSizer.java
index d5ff1085f25c6f11de2018988a91f85e905880f7..4bd85afac65dd4675e3823d1cdcc3832e8f389bd 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwLayoutSizer.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwLayoutSizer.java
@@ -19,9 +19,20 @@ public class AwLayoutSizer {
     private boolean mWidthMeasurementIsFixed;
     private boolean mHeightMeasurementIsFixed;
 
-    // Size of the rendered content, as reported by native, in physical pixels.
-    private int mContentHeight;
-    private int mContentWidth;
+    // Size of the rendered content, as reported by native.
+    private int mContentHeightCss;
+    private int mContentWidthCss;
+
+    // Page scale factor. This is set to zero initially so that we don't attempt to do a layout if
+    // we get the content size change notification first and a page scale change second.
+    private double mPageScaleFactor = 0.0;
+
+    // Whether to postpone layout requests.
+    private boolean mFreezeLayoutRequests;
+    // Did we try to request a layout since the last time mPostponeLayoutRequests was set to true.
+    private boolean mFrozenLayoutRequestPending;
+
+    private final double mDIPScale;
 
     // Callback object for interacting with the View.
     Delegate mDelegate;
@@ -31,25 +42,86 @@ public class AwLayoutSizer {
         void setMeasuredDimension(int measuredWidth, int measuredHeight);
     }
 
-    public AwLayoutSizer(Delegate delegate) {
+    public AwLayoutSizer(Delegate delegate, double dipScale) {
         mDelegate = delegate;
+        mDIPScale = dipScale;
+    }
+
+    /**
+     * This is used to register the AwLayoutSizer to preferred content size change notifications in
+     * the AwWebContentsDelegate.
+     */
+    public AwWebContentsDelegateAdapter.PreferredSizeChangedListener
+            getPreferredSizeChangedListener() {
+        return new AwWebContentsDelegateAdapter.PreferredSizeChangedListener() {
+            @Override
+            public void updatePreferredSize(int widthCss, int heightCss) {
+                onContentSizeChanged(widthCss, heightCss);
+            }
+        };
+    }
+
+    /**
+     * Postpone requesting layouts till unfreezeLayoutRequests is called.
+     */
+    public void freezeLayoutRequests() {
+        mFreezeLayoutRequests = true;
+        mFrozenLayoutRequestPending = false;
+    }
+
+    /**
+     * Stop postponing layout requests and request layout if such a request would have been made
+     * had the freezeLayoutRequests method not been called before.
+     */
+    public void unfreezeLayoutRequests() {
+        mFreezeLayoutRequests = false;
+        if (mFrozenLayoutRequestPending) {
+            mFrozenLayoutRequestPending = false;
+            mDelegate.requestLayout();
+        }
+    }
+
+    private void requestLayout() {
     }
 
     /**
      * Update the contents size.
      * This should be called whenever the content size changes (due to DOM manipulation or page
      * load, for example).
-     * The width and height should be in physical pixels.
+     * The width and height should be in CSS pixels.
      */
-    public void onContentSizeChanged(int width, int height) {
-        boolean layoutNeeded = (mContentWidth != width && !mWidthMeasurementIsFixed) ||
-            (mContentHeight != height && !mHeightMeasurementIsFixed);
+    public void onContentSizeChanged(int widthCss, int heightCss) {
+        doUpdate(widthCss, heightCss, mPageScaleFactor);
+    }
 
-        mContentWidth = width;
-        mContentHeight = height;
+    /**
+     * Update the contents page scale.
+     * This should be called whenever the content page scale factor changes (due to pinch zoom, for
+     * example).
+     */
+    public void onPageScaleChanged(double pageScaleFactor) {
+        doUpdate(mContentWidthCss, mContentHeightCss, pageScaleFactor);
+    }
+
+    private void doUpdate(int widthCss, int heightCss, double pageScaleFactor) {
+        // We want to request layout only if the size or scale change, however if any of the
+        // measurements are 'fixed', then changing the underlying size won't have any effect, so we
+        // ignore changes to dimensions that are 'fixed'.
+        boolean anyMeasurementNotFixed = !mWidthMeasurementIsFixed || !mHeightMeasurementIsFixed;
+        boolean layoutNeeded = (mContentWidthCss != widthCss && !mWidthMeasurementIsFixed) ||
+            (mContentHeightCss != heightCss && !mHeightMeasurementIsFixed) ||
+            (mPageScaleFactor != pageScaleFactor && anyMeasurementNotFixed);
+
+        mContentWidthCss = widthCss;
+        mContentHeightCss = heightCss;
+        mPageScaleFactor = pageScaleFactor;
 
         if (layoutNeeded) {
-            mDelegate.requestLayout();
+            if (mFreezeLayoutRequests) {
+                mFrozenLayoutRequestPending = true;
+            } else {
+                mDelegate.requestLayout();
+            }
         }
     }
 
@@ -66,6 +138,9 @@ public class AwLayoutSizer {
         int measuredHeight = heightSize;
         int measuredWidth = widthSize;
 
+        int contentHeightPix = (int) (mContentHeightCss * mPageScaleFactor * mDIPScale);
+        int contentWidthPix = (int) (mContentWidthCss * mPageScaleFactor * mDIPScale);

[joth, 2013/04/10 22:06:23]

I feel I'd benefit from a comment, but actually the code probably says it all.
(Think I'm just looking for some reassurance that we're not double correcting
these factors..)

+
         // Always use the given size unless unspecified. This matches WebViewClassic behavior.
         mWidthMeasurementIsFixed = (widthMode != MeasureSpec.UNSPECIFIED);
         // Freeze the height if an exact size is given by the parent or if the content size has
@@ -73,21 +148,21 @@ public class AwLayoutSizer {
         // TODO(mkosiba): Actually we'd like the reduction in content size to cause the WebView to
         // shrink back again but only as a result of a page load.
         mHeightMeasurementIsFixed = (heightMode == MeasureSpec.EXACTLY) ||
-            (heightMode == MeasureSpec.AT_MOST && mContentHeight > heightSize);
+            (heightMode == MeasureSpec.AT_MOST && contentHeightPix > heightSize);
 
         if (!mHeightMeasurementIsFixed) {
-            measuredHeight = mContentHeight;
+            measuredHeight = contentHeightPix;
         }
 
         if (!mWidthMeasurementIsFixed) {
-            measuredWidth = mContentWidth;
+            measuredWidth = contentWidthPix;
         }
 
-        if (measuredHeight < mContentHeight) {
+        if (measuredHeight < contentHeightPix) {
             measuredHeight |= View.MEASURED_STATE_TOO_SMALL;
         }
 
-        if (measuredWidth < mContentWidth) {
+        if (measuredWidth < contentWidthPix) {
             measuredWidth |= View.MEASURED_STATE_TOO_SMALL;
         }