Bug 1446314 - Rename mIsBusy to _isBusy r?dao draft
authorVivek Dhingra <vivek3zero@gmail.com>
Fri, 30 Mar 2018 17:27:00 -0400
changeset 775309 b60d470827d8e1913aace1e5c367dec0756942cf
parent 775219 0405f6006f3a3f653dd42d587c3eefe08cffa37d
child 775327 6e570a8c4c62136935777d8441fb0cbe8619b997
push id104691
push userbmo:vivek3zero@gmail.com
push dateFri, 30 Mar 2018 21:27:47 +0000
reviewersdao
bugs1446314
milestone61.0a1
Bug 1446314 - Rename mIsBusy to _isBusy r?dao MozReview-Commit-ID: H1H4om8F6dt
browser/base/content/tabbrowser.js
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -79,17 +79,17 @@ window._gBrowser = {
   mProgressListeners: [],
 
   mTabsProgressListeners: [],
 
   _tabListeners: new Map(),
 
   _tabFilters: new Map(),
 
-  mIsBusy: false,
+  _isBusy: false,
 
   _outerWindowIDBrowserMap: new Map(),
 
   arrowKeysShouldWrap: AppConstants == "macosx",
 
   _autoScrollPopup: null,
 
   _previewMode: false,
@@ -985,29 +985,29 @@ window._gBrowser = {
       // (2) Call the current browser's unselectedTabHover() with false
       //     to dispatch an event.
       newTab.finishUnselectedTabHoverTimer();
       newBrowser.unselectedTabHover(false);
     }
 
     // If the new tab is busy, and our current state is not busy, then
     // we need to fire a start to all progress listeners.
-    if (newTab.hasAttribute("busy") && !this.mIsBusy) {
-      this.mIsBusy = true;
+    if (newTab.hasAttribute("busy") && !this._isBusy) {
+      this._isBusy = true;
       this._callProgressListeners(null, "onStateChange",
                                   [webProgress, null,
                                    Ci.nsIWebProgressListener.STATE_START |
                                    Ci.nsIWebProgressListener.STATE_IS_NETWORK, 0],
                                   true, false);
     }
 
     // If the new tab is not busy, and our current state is busy, then
     // we need to fire a stop to all progress listeners.
-    if (!newTab.hasAttribute("busy") && this.mIsBusy) {
-      this.mIsBusy = false;
+    if (!newTab.hasAttribute("busy") && this._isBusy) {
+      this._isBusy = false;
       this._callProgressListeners(null, "onStateChange",
                                   [webProgress, null,
                                    Ci.nsIWebProgressListener.STATE_STOP |
                                    Ci.nsIWebProgressListener.STATE_IS_NETWORK, 0],
                                   true, false);
     }
 
     // TabSelect events are suppressed during preview mode to avoid confusing extensions and other bits of code
@@ -3061,17 +3061,17 @@ window._gBrowser = {
       // Icon might have been set on DOMLinkAdded, don't override that.
       if (!ourBrowser.mIconURL && otherBrowser.mIconURL)
         this.setIcon(aOurTab, otherBrowser.mIconURL, otherBrowser.contentPrincipal, otherBrowser.contentRequestContextID);
       var isBusy = aOtherTab.hasAttribute("busy");
       if (isBusy) {
         aOurTab.setAttribute("busy", "true");
         modifiedAttrs.push("busy");
         if (aOurTab.selected)
-          this.mIsBusy = true;
+          this._isBusy = true;
       }
 
       this._swapBrowserDocShells(aOurTab, otherBrowser, Ci.nsIBrowser.SWAP_DEFAULT, stateFlags);
     }
 
     // Unregister the previously opened URI
     if (otherBrowser.registeredOpenURI) {
       this._unifiedComplete.unregisterOpenPage(otherBrowser.registeredOpenURI,
@@ -4347,17 +4347,17 @@ class TabProgressListener {
               }
               return { continueMonitoring };
             },
           });
           gBrowser.syncThrobberAnimations(this.mTab);
         }
 
         if (this.mTab.selected) {
-          gBrowser.mIsBusy = true;
+          gBrowser._isBusy = true;
         }
       }
     } else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP &&
                aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) {
 
       if (this.mTab.hasAttribute("busy")) {
         this.mTab.removeAttribute("busy");
         if (!document.querySelector(".tabbrowser-tab[busy]")) {
@@ -4418,17 +4418,17 @@ class TabProgressListener {
         }
       }
 
       // For keyword URIs clear the user typed value since they will be changed into real URIs
       if (location.scheme == "keyword")
         this.mBrowser.userTypedValue = null;
 
       if (this.mTab.selected)
-        gBrowser.mIsBusy = false;
+        gBrowser._isBusy = false;
     }
 
     if (ignoreBlank) {
       this._callProgressListeners("onUpdateCurrentBrowser",
                                   [aStateFlags, aStatus, "", 0],
                                   true, false);
     } else {
       this._callProgressListeners("onStateChange",