summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYusuf Ozuysal <yusufo@google.com>2016-02-29 16:45:36 -0800
committerYusuf Ozuysal <yusufo@google.com>2016-03-01 00:47:16 +0000
commitfbcba8d410d4f2c4560ee17a895909418aa45d22 (patch)
tree5f312f1c133003d8a123d9849d8fd0155a1a1948
parent244179281ecd1c36ece3c67a05cf1aa9fecd8265 (diff)
downloadchromium_src-fbcba8d410d4f2c4560ee17a895909418aa45d22.zip
chromium_src-fbcba8d410d4f2c4560ee17a895909418aa45d22.tar.gz
chromium_src-fbcba8d410d4f2c4560ee17a895909418aa45d22.tar.bz2
Call super.destroy for ReaderModeManager
While reparenting a tab, reader mode manager from the old activity gets destroyed but since we never call super.destroy() the observer itself doesn't get removed and keeps getting updates. This change fixes that by calling super.destroy() BUG=590673 Review URL: https://codereview.chromium.org/1747063002 . Cr-Commit-Position: refs/branch-heads/2661@{#17} Cr-Branched-From: ef6f6ae5e4c96622286b563658d5cd62a6cf1197-refs/heads/master@{#378081}
-rw-r--r--chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java
index 0ee3288..27c8dfe 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java
@@ -105,7 +105,9 @@ public class ReaderModeManager extends TabModelSelectorTabObserver
/**
* Clear the status map and references to other objects.
*/
+ @Override
public void destroy() {
+ super.destroy();
for (Map.Entry<Integer, ReaderModeTabInfo> e : mTabStatusMap.entrySet()) {
if (e.getValue().getWebContentsObserver() != null) {
e.getValue().getWebContentsObserver().destroy();