| 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 cb91c77ae25656cf4af7011f34777fc99a0883c5..40a73063229febda21c317ad6095557fdccc6e43 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -490,8 +490,7 @@ public class AwContents {
|
| 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();
|
| @@ -1782,6 +1781,12 @@ public class AwContents {
|
| }
|
|
|
| @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);
|
| }
|
|
|