Use contents size for android_webview layout.

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ skipping 477 matching lines @@
             boolean isAccessFromFileURLsGrantedByDefault, AwLayoutSizer layoutSizer,
             boolean supportsLegacyQuirks) {
         mBrowserContext = browserContext;
         mContainerView = containerView;
         mInternalAccessAdapter = internalAccessAdapter;
         mContentsClient = contentsClient;
         mLayoutSizer = layoutSizer;
         mDIPScale = DeviceDisplayInfo.create(containerView.getContext()).getDIPScale();
         mLayoutSizer.setDelegate(new AwLayoutSizerDelegate());
         mLayoutSizer.setDIPScale(mDIPScale);
-        mWebContentsDelegate = new AwWebContentsDelegateAdapter(contentsClient,
-                mLayoutSizer.getPreferredSizeChangedListener(), mContainerView);
+        mWebContentsDelegate = new AwWebContentsDelegateAdapter(contentsClient, mContainerView);
         mContentsClientBridge = new AwContentsClientBridge(contentsClient);
         mZoomControls = new AwZoomControls(this);
         mIoThreadClient = new IoThreadClientImpl();
         mInterceptNavigationDelegate = new InterceptNavigationDelegateImpl();
 
         boolean hasInternetPermission = containerView.getContext().checkPermission(
                     android.Manifest.permission.INTERNET,
                     Process.myPid(),
                     Process.myUid()) == PackageManager.PERMISSION_GRANTED;
         AwSettings.ZoomSupportChangeListener zoomListener =
@@ skipping 1275 matching lines @@
         return result;
     }
 
     @CalledByNative
     private void onWebLayoutPageScaleFactorChanged(float webLayoutPageScaleFactor) {
         // This change notification comes from the renderer thread, not from the cc/ impl thread.
         mLayoutSizer.onPageScaleChanged(webLayoutPageScaleFactor);
     }
 
     @CalledByNative
+    private void onWebLayoutContentsSizeChanged(int widthCss, int heightCss) {
+        // This change notification comes from the renderer thread, not from the cc/ impl thread.
+        mLayoutSizer.onContentSizeChanged(widthCss, heightCss);
+    }
+
+    @CalledByNative
     private void scrollContainerViewTo(int x, int y) {
         mScrollOffsetManager.scrollContainerViewTo(x, y);
     }
 
     @CalledByNative
     private void setAwAutofillManagerDelegate(AwAutofillManagerDelegate delegate) {
         mAwAutofillManagerDelegate = delegate;
         delegate.init(mContentViewCore);
     }
 
@@ skipping 122 matching lines @@
 
     private native int nativeGetAwDrawGLViewContext(int nativeAwContents);
     private native int nativeCapturePicture(int nativeAwContents, int width, int height);
     private native void nativeEnableOnNewPicture(int nativeAwContents, boolean enabled);
 
     private native void nativeInvokeGeolocationCallback(
             int nativeAwContents, boolean value, String requestingFrame);
 
     private native void nativeSetJsOnlineProperty(int nativeAwContents, boolean networkUp);
 }