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 59b664e24d2a301768417a7be97f4ca9a2c82a20..abebba74d0243ed09f218e36d21cdf6229ec8205 100644 |
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java |
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java |
@@ -77,7 +77,6 @@ import org.chromium.net.NetworkChangeNotifier; |
import org.chromium.ui.base.ActivityWindowAndroid; |
import org.chromium.ui.base.PageTransition; |
import org.chromium.ui.base.ViewAndroidDelegate; |
-import org.chromium.ui.base.ViewRoot; |
import org.chromium.ui.base.WindowAndroid; |
import org.chromium.ui.display.DisplayAndroid.DisplayAndroidObserver; |
@@ -362,8 +361,6 @@ public class AwContents implements SmartClipProvider, PostMessageSender.PostMess |
private static String sCurrentLocales = ""; |
- private ViewRoot mViewRoot; |
- |
private static final class AwContentsDestroyRunnable implements Runnable { |
private final long mNativeAwContents; |
// Hold onto a reference to the window (via its wrapper), so that it is not destroyed |
@@ -1203,7 +1200,6 @@ public class AwContents implements SmartClipProvider, PostMessageSender.PostMess |
mNativeAwContents = 0; |
mWebContents = null; |
mNavigationController = null; |
- mViewRoot = null; |
mCleanupReference.cleanupNow(); |
mCleanupReference = null; |
@@ -3207,7 +3203,7 @@ public class AwContents implements SmartClipProvider, PostMessageSender.PostMess |
// to enter fixedLayoutSize mode is sent before the first resize |
// update. |
mLayoutSizer.onSizeChanged(w, h, ow, oh); |
- getViewRoot().onPhysicalBackingSizeChanged(w, h); |
+ mContentViewCore.onPhysicalBackingSizeChanged(w, h); |
mContentViewCore.onSizeChanged(w, h, ow, oh); |
nativeOnSizeChanged(mNativeAwContents, w, h, ow, oh); |
} |
@@ -3283,13 +3279,6 @@ public class AwContents implements SmartClipProvider, PostMessageSender.PostMess |
} |
} |
- private ViewRoot getViewRoot() { |
- if (mViewRoot == null) { |
- mViewRoot = nativeGetViewRoot(mNativeAwContents); |
- } |
- return mViewRoot; |
- } |
- |
// Return true if the GeolocationPermissionAPI should be used. |
@CalledByNative |
private boolean useLegacyGeolocationPermissionAPI() { |
@@ -3393,5 +3382,4 @@ public class AwContents implements SmartClipProvider, PostMessageSender.PostMess |
private native void nativeGrantFileSchemeAccesstoChildProcess(long nativeAwContents); |
private native void nativeResumeLoadingCreatedPopupWebContents(long nativeAwContents); |
- private native ViewRoot nativeGetViewRoot(long nativeAwContents); |
} |