diff options
| author | kkimlabs <kkimlabs@chromium.org> | 2015-08-10 15:04:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-10 22:04:33 +0000 |
| commit | 365484962c8cd7f4d5d4c42dec40edf88e95bcab (patch) | |
| tree | f0d3d0e89ccfab85127c1170954a09d0d31f9925 | |
| parent | 5c41bb91844967ff9a7a94b87f8098b9e7f805af (diff) | |
| download | chromium_src-365484962c8cd7f4d5d4c42dec40edf88e95bcab.zip chromium_src-365484962c8cd7f4d5d4c42dec40edf88e95bcab.tar.gz chromium_src-365484962c8cd7f4d5d4c42dec40edf88e95bcab.tar.bz2 | |
[Android] Make native pages crash when it is destroyed multiple times.
In this way we will be able to catch such cases more easily.
BUG=513035
Review URL: https://codereview.chromium.org/1257823002
Cr-Commit-Position: refs/heads/master@{#342704}
3 files changed, 4 insertions, 1 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPage.java index 1998635..7d62b25 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkPage.java @@ -25,7 +25,7 @@ public class EnhancedBookmarkPage implements NativePage, EnhancedBookmarkStateCh private final Tab mTab; private final String mTitle; private final int mBackgroundColor; - private final EnhancedBookmarkManager mManager; + private EnhancedBookmarkManager mManager; /** * Create a new instance of an enhanced bookmark page. @@ -91,6 +91,7 @@ public class EnhancedBookmarkPage implements NativePage, EnhancedBookmarkStateCh @Override public void destroy() { mManager.destroy(); + mManager = null; } @Override diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java index f024b3e..80c3369 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/BookmarksPage.java @@ -535,6 +535,7 @@ public class BookmarksPage implements NativePage, InvalidationAwareThumbnailProv */ @Override public void destroy() { + assert !mIsDestroyed; if (mFaviconHelper != null) { mFaviconHelper.destroy(); mFaviconHelper = null; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java index 38e73cd..526192e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java @@ -517,6 +517,7 @@ public class NewTabPage @Override public void destroy() { + assert !mIsDestroyed; assert getView().getParent() == null : "Destroy called before removed from window"; if (mFaviconHelper != null) { mFaviconHelper.destroy(); |