Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java |
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java |
index 4a3892673442c2b9ec08979ddb21ba8d4649b45a..bfe5e6a87a3bc432b3b6c734769a470f8d8c3ec3 100644 |
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java |
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java |
@@ -406,7 +406,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate |
// Make sure that we do not trigger any callbacks after destruction |
mContentsClientAdapter.setWebChromeClient(null); |
mContentsClientAdapter.setWebViewClient(null); |
- mContentsClientAdapter.setPictureListener(null); |
+ mContentsClientAdapter.setPictureListener(null, true); |
mContentsClientAdapter.setFindListener(null); |
mContentsClientAdapter.setDownloadListener(null); |
@@ -1294,9 +1294,9 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate |
}); |
return; |
} |
- mContentsClientAdapter.setPictureListener(listener); |
- mAwContents.enableOnNewPicture( |
- listener != null, mAppTargetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN_MR2); |
+ boolean invalidateOnly = mAppTargetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN_MR2; |
+ mContentsClientAdapter.setPictureListener(listener, invalidateOnly); |
+ mAwContents.enableOnNewPicture(listener != null, invalidateOnly); |
} |
@Override |