diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 18:06:24 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 18:06:24 +0000 |
| commit | 6270ac9740f599ecf63fd4ebb6c9dd1ed619fcfc (patch) | |
| tree | 6d3f29f70be4732e4f0e803ccca71d809d81e411 /android_webview/java/src | |
| parent | 462c09ecd24bcd00655a9c8e95b263563d8be2a3 (diff) | |
| download | chromium_src-6270ac9740f599ecf63fd4ebb6c9dd1ed619fcfc.zip chromium_src-6270ac9740f599ecf63fd4ebb6c9dd1ed619fcfc.tar.gz chromium_src-6270ac9740f599ecf63fd4ebb6c9dd1ed619fcfc.tar.bz2 | |
Make AwContents.destroy() idempotent
Follow-up to crrev.com/206516
As mCleanupReference is nulled out in destroy() it now must be
null-checked to allow repeat calls to destroy().
BUG=
Review URL: https://chromiumcodereview.appspot.com/17301002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/java/src')
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwContents.java | 2 |
1 files changed, 1 insertions, 1 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 49fb2d0..8cd9520 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -462,7 +462,7 @@ public class AwContents { // methods are called on it after it's been destroyed, and other // code relies on AwContents.mContentViewCore to be non-null. - mCleanupReference.cleanupNow(); + if (mCleanupReference != null) mCleanupReference.cleanupNow(); mNativeAwContents = 0; mCleanupReference = null; } |