Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2485)

Unified Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

Issue 2376673002: When onPageFinished calls onNewPicture, pass null picture on SDK>=JB MR2. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698