Bug 1445337 - Send Reader:PushState message to the correct browser. r?gijs draft
authorDão Gottwald <dao@mozilla.com>
Tue, 13 Mar 2018 18:17:43 +0100
changeset 766938 750752efe90abb09f5345a1bdb3f2968d5686283
parent 766824 8f1b2f872f0ea358a0412eb8b8687f08d47f6621
push id102456
push userdgottwald@mozilla.com
push dateTue, 13 Mar 2018 17:18:15 +0000
reviewersgijs
bugs1445337
milestone61.0a1
Bug 1445337 - Send Reader:PushState message to the correct browser. r?gijs MozReview-Commit-ID: HmNFGgCgRTc
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5150,24 +5150,24 @@ var TabsProgressListener = {
           return;
         aBrowser.removeEventListener("pagehide", onPageHide, true);
         if (event.target.documentElement)
           event.target.documentElement.removeAttribute("hasBrowserHandlers");
       }, true);
     }
   },
 
-  onLocationChange(aBrowser, aWebProgress, aRequest, aLocationURI,
-                             aFlags) {
+  onLocationChange(aBrowser, aWebProgress, aRequest, aLocationURI, aFlags) {
     // Filter out location changes caused by anchor navigation
     // or history.push/pop/replaceState.
     if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) {
-      // Reader mode actually cares about these:
-      let mm = gBrowser.selectedBrowser.messageManager;
-      mm.sendAsyncMessage("Reader:PushState", {isArticle: gBrowser.selectedBrowser.isArticle});
+      // Reader mode cares about history.pushState and friends.
+      aBrowser.messageManager.sendAsyncMessage("Reader:PushState", {
+        isArticle: aBrowser.isArticle,
+      });
       return;
     }
 
     // Filter out location changes in sub documents.
     if (!aWebProgress.isTopLevel)
       return;
 
     // Only need to call locationChange if the PopupNotifications object