[android_webview] Fixes for wrap_content layouts.

android_webview/java/src/org/chromium/android_webview/AwContents.java

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 18ba0cca75fc4727e16cdad3210af97f00d3ef2c..6773fa2d7fce7cce41d3dcbfa041c9bba5c113b7 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -344,6 +344,21 @@ public class AwContents {
         public void setMeasuredDimension(int measuredWidth, int measuredHeight) {
             mInternalAccessAdapter.setMeasuredDimension(measuredWidth, measuredHeight);
         }
+
+        @Override
+        public void setFixedLayoutOverride(boolean enable, int widthDip, int heightDip) {
+            nativeSetFixedLayoutOverride(mNativeAwContents, enable, widthDip, heightDip);
+        }
+
+        @Override
+        public void setViewportDipSizeOverride(boolean enable, int widthDip, int heightDip) {
+            nativeSetViewportDipSizeOverride(mNativeAwContents, enable, widthDip, heightDip);
+        }
+
+        @Override
+        public void setPhysicalBackingSize(int width, int height) {
+            mContentViewCore.onPhysicalBackingSizeChanged(width, height);
+        }
     }
 
     //--------------------------------------------------------------------------------------------
@@ -1505,7 +1520,7 @@ public class AwContents {
     public void onSizeChanged(int w, int h, int ow, int oh) {
         if (mNativeAwContents == 0) return;
         mScrollOffsetManager.setContainerViewSize(w, h);
-        mContentViewCore.onPhysicalBackingSizeChanged(w, h);
+        mLayoutSizer.onSizeChanged(w, h, ow, oh);
         mContentViewCore.onSizeChanged(w, h, ow, oh);
         nativeOnSizeChanged(mNativeAwContents, w, h, ow, oh);
     }
@@ -1905,6 +1920,10 @@ public class AwContents {
     private native void nativeSetDipScale(int nativeAwContents, float dipScale);
     private native void nativeSetDisplayedPageScaleFactor(int nativeAwContents,
             float pageScaleFactor);
+    private native void nativeSetFixedLayoutOverride(int nativeAwContents, boolean enable,
+            int widthDip, int heightDip);
+    private native void nativeSetViewportDipSizeOverride(int nativeAwContents, boolean enable,
+            int widthDip, int heightDip);
 
     // Returns null if save state fails.
     private native byte[] nativeGetOpaqueState(int nativeAwContents);