Bug 1387976 - Fix merge and eslint issues with the landing of the patch on a CLOSED TREE. r=me
☠☠ backed out by 7c01c3875cae ☠ ☠
authorJared Wein <jwein@mozilla.com>
Mon, 05 Mar 2018 14:48:20 -0500
changeset 461664 b708ab55bc7258adf56d8c7c19ce3056bbf7a993
parent 461663 84dfd63e8aafad637b293239c3f2e57ea1f53ba7
child 461665 d91b6a40b32a811e56afc210161470c52ed0f093
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1387976
milestone60.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 1387976 - Fix merge and eslint issues with the landing of the patch on a CLOSED TREE. r=me
browser/base/content/tabbrowser.xml
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1857,25 +1857,25 @@
             modifiedAttrs.push("activemedia-blocked");
 
             browser.resumeMedia();
             hist.add(3 /* unblockByClickingIcon */);
             this.finishMediaBlockTimer();
           } else {
             if (browser.audioMuted) {
               if (this.linkedPanel) {
-+               //"Lazy Browser" should not invoke its unmute method
+                // "Lazy Browser" should not invoke its unmute method
                 browser.unmute();
               }
               this.removeAttribute("muted");
               BrowserUITelemetry.countTabMutingEvent("unmute", aMuteReason);
               hist.add(1 /* unmute */);
             } else {
               if (this.linkedPanel) {
-+               //"Lazy Browser" should not invoke its unmute method
+                // "Lazy Browser" should not invoke its unmute method
                 browser.mute();
               }
               this.setAttribute("muted", "true");
               BrowserUITelemetry.countTabMutingEvent("mute", aMuteReason);
               hist.add(0 /* mute */);
             }
             this.muteReason = aMuteReason || null;
             modifiedAttrs.push("muted");