Bug 1497479 - Fix indentation in discardBrowser r=dao
authorAndrew Gregory <andrewjgregoryajg@gmail.com>
Wed, 17 Oct 2018 10:31:38 +0000
changeset 500112 745dab0eb0111f2c0d537e51db67cf6bcf4ad0ac
parent 500111 5cc98bf772f726daa10abb0f5e3305c6466c6c53
child 500113 ee2d80610d72755a8b2b58c6c8e8cd11a323da47
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1497479
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1497479 - Fix indentation in discardBrowser r=dao Differential Revision: https://phabricator.services.mozilla.com/D8559
browser/base/content/tabbrowser.js
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -2113,22 +2113,22 @@ window._gBrowser = {
   discardBrowser(aBrowser, aForceDiscard) {
     "use strict";
 
     let tab = this.getTabForBrowser(aBrowser);
 
     let permitUnloadFlags = aForceDiscard ? aBrowser.dontPromptAndUnload : aBrowser.dontPromptAndDontUnload;
 
     if (!tab ||
-      tab.selected ||
-      tab.closing ||
-      this._windowIsClosing ||
-      !aBrowser.isConnected ||
-      !aBrowser.isRemoteBrowser ||
-      !aBrowser.permitUnload(permitUnloadFlags).permitUnload) {
+        tab.selected ||
+        tab.closing ||
+        this._windowIsClosing ||
+        !aBrowser.isConnected ||
+        !aBrowser.isRemoteBrowser ||
+        !aBrowser.permitUnload(permitUnloadFlags).permitUnload) {
       return;
     }
 
     // Reset webrtc sharing state.
     if (tab._sharingState) {
       this.setBrowserSharing(aBrowser, {});
     }
     webrtcUI.forgetStreamsFromBrowser(aBrowser);
@@ -5476,9 +5476,8 @@ var TabContextMenu = {
     }
     if (this.contextTab.muted) {
       if (!newTab.muted) {
         newTab.toggleMuteAudio(this.contextTab.muteReason);
       }
     }
   },
 };
-