merge backout, CLOSED TREE AURORA_BASE_20110927
authorDão Gottwald <dao@mozilla.com>
Tue, 27 Sep 2011 18:31:41 +0200
changeset 77708 c0983049bcaa9551e5f276d5a77ce154c151e0b0
parent 77706 e6061eabd28cf4e9ecdbd639900b11175a229922 (current diff)
parent 77707 fa501d6681d2eed8c29019789646042984531b44 (diff)
child 77709 6e41c8259311f24f140d9a035ec841bd4f71f160
child 77756 f030249274c140f6d112deba7fcecee8277e8a89
push id21231
push userdgottwald@mozilla.com
push dateTue, 27 Sep 2011 16:32:27 +0000
treeherdermozilla-central@c0983049bcaa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone9.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
merge backout, CLOSED TREE
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -561,20 +561,20 @@
                 }
 
                 if (this.mBlank)
                   this.mBlank = false;
 
                 if (this.mTab.hasAttribute("busy")) {
                   this.mTab.removeAttribute("busy");
                   this.mTabBrowser._tabAttrModified(this.mTab);
-                  if (!this.mTab.selected) {
-                    this.mTab.setAttribute("unread", "true");
                 }
                 this.mTab.removeAttribute("progress");
+                if (!this.mTab.selected)
+                  this.mTab.setAttribute("unread", "true");
 
                 var location = aRequest.QueryInterface(nsIChannel).URI;
 
                 // 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.label == this.mTabBrowser.mStringBundle.getString("tabs.connecting"))
@@ -871,18 +871,17 @@
                 (!oldBrowser.pageReport && newBrowser.pageReport))
               updatePageReport = true;
 
             newBrowser.setAttribute("type", "content-primary");
             newBrowser.docShellIsActive =
               (window.windowState != window.STATE_MINIMIZED);
             this.mCurrentBrowser = newBrowser;
             this.mCurrentTab = this.selectedTab;
-            if (!this._previewMode)
-              this.mCurrentTab.removeAttribute("unread");
+            this.mCurrentTab.removeAttribute("unread");
             this.showTab(this.mCurrentTab);
 
             if (updatePageReport)
               this.mCurrentBrowser.updatePageReport();
 
             // Update the URL bar.
             var loc = this.mCurrentBrowser.currentURI;