| 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 631d5ed27b689f950284c2e324918e315c897b9b..3fd5e82409eea8b65d2213474076fa5224e2ca73 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -489,8 +489,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();
|
| @@ -1777,6 +1776,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);
|
| }
|
|
|