| 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 d962d9f292d144a1577c06d4da1afe675f3961b7..61e0f14d8ff94d477ad0c449a4e864ea9ac39a51 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -5,15 +5,12 @@
|
| package org.chromium.android_webview;
|
|
|
| import android.content.ComponentCallbacks2;
|
| -import android.content.Context;
|
| -import android.content.pm.PackageManager;
|
| import android.content.res.Configuration;
|
| import android.graphics.Bitmap;
|
| import android.graphics.Canvas;
|
| import android.graphics.Color;
|
| import android.graphics.Picture;
|
| import android.graphics.Rect;
|
| -import android.graphics.drawable.Drawable;
|
| import android.net.http.SslCertificate;
|
| import android.os.AsyncTask;
|
| import android.os.Build;
|
| @@ -25,7 +22,6 @@ import android.view.KeyEvent;
|
| import android.view.MotionEvent;
|
| import android.view.View;
|
| import android.view.ViewGroup;
|
| -import android.view.ViewTreeObserver;
|
| import android.view.accessibility.AccessibilityEvent;
|
| import android.view.accessibility.AccessibilityNodeInfo;
|
| import android.view.accessibility.AccessibilityNodeProvider;
|
| @@ -40,8 +36,9 @@ import com.google.common.annotations.VisibleForTesting;
|
| import org.chromium.base.CalledByNative;
|
| import org.chromium.base.JNINamespace;
|
| import org.chromium.base.ThreadUtils;
|
| +import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
|
| +import org.chromium.components.navigation_interception.NavigationParams;
|
| import org.chromium.content.browser.ContentSettings;
|
| -import org.chromium.content.browser.ContentVideoView;
|
| import org.chromium.content.browser.ContentViewClient;
|
| import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content.browser.ContentViewStatics;
|
| @@ -49,18 +46,15 @@ import org.chromium.content.browser.LoadUrlParams;
|
| import org.chromium.content.browser.NavigationHistory;
|
| import org.chromium.content.browser.PageTransitionTypes;
|
| import org.chromium.content.common.CleanupReference;
|
| -import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
|
| -import org.chromium.components.navigation_interception.NavigationParams;
|
| -import org.chromium.net.GURLUtils;
|
| import org.chromium.ui.gfx.DeviceDisplayInfo;
|
|
|
| import java.io.File;
|
| import java.lang.annotation.Annotation;
|
| import java.net.MalformedURLException;
|
| import java.net.URL;
|
| -import java.util.concurrent.Callable;
|
| import java.util.ArrayList;
|
| import java.util.List;
|
| +import java.util.concurrent.Callable;
|
|
|
| /**
|
| * Exposes the native AwContents class, and together these classes wrap the ContentViewCore
|
| @@ -172,7 +166,7 @@ public class AwContents {
|
| // Must call nativeUpdateLastHitTestData first to update this before use.
|
| private final HitTestData mPossiblyStaleHitTestData = new HitTestData();
|
|
|
| - private DefaultVideoPosterRequestHandler mDefaultVideoPosterRequestHandler;
|
| + private final DefaultVideoPosterRequestHandler mDefaultVideoPosterRequestHandler;
|
|
|
| // Bound method for suppling Picture instances to the AwContentsClient. Will be null if the
|
| // picture listener API has not yet been enabled, or if it is using invalidation-only mode.
|
| @@ -195,7 +189,7 @@ public class AwContents {
|
| private ComponentCallbacks2 mComponentCallbacks;
|
|
|
| private static final class DestroyRunnable implements Runnable {
|
| - private int mNativeAwContents;
|
| + private final int mNativeAwContents;
|
| private DestroyRunnable(int nativeAwContents) {
|
| mNativeAwContents = nativeAwContents;
|
| }
|
| @@ -1132,7 +1126,7 @@ public class AwContents {
|
| * @see android.webkit.WebView#reload()
|
| */
|
| public void reload() {
|
| - mContentViewCore.reload();
|
| + mContentViewCore.reload(true);
|
| }
|
|
|
| /**
|
|
|