summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 01:03:47 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 01:03:47 +0000
commite40379643bea706de4a5d428711803975dd2ebee (patch)
treec52db23fb123840911af927966ddbc612b89f1f1 /android_webview
parent64ec24df27d3df442057782052e312cacf3dd1cc (diff)
downloadchromium_src-e40379643bea706de4a5d428711803975dd2ebee.zip
chromium_src-e40379643bea706de4a5d428711803975dd2ebee.tar.gz
chromium_src-e40379643bea706de4a5d428711803975dd2ebee.tar.bz2
[Android WebView] Null check syncOnNewPictureStateToNative
Make sure we don't call into native after the native pointer has been destroyed. Internal bug b/11555111 BUG= NOTRY=true R=kristianm@chromium.org Review URL: https://codereview.chromium.org/61763005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwContents.java1
1 files changed, 1 insertions, 0 deletions
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 d962d9f..f5ec02a 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -836,6 +836,7 @@ public class AwContents {
}
private void syncOnNewPictureStateToNative() {
+ if (mNativeAwContents == 0) return;
nativeEnableOnNewPicture(mNativeAwContents, mPictureListenerEnabled || mClearViewActive);
}