Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1460423 - "New Tab" tab label is empty after restore previous session if restoring about:blank or new tabs set to "Blank Page" r=mikedeboer

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D8750

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Ed Lee 2018-10-17 11:16:38 +00:00
parent 1049c734a5
commit a62355e0b1
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/base/content/tabbrowser.js
View File

@ -1205,7 +1205,12 @@ window._gBrowser = {
};
},
setInitialTabTitle(aTab, aTitle, aOptions) {
setInitialTabTitle(aTab, aTitle, aOptions = {}) {
// Convert some non-content title (actually a url) to human readable title
if (!aOptions.isContentTitle && isBlankPageURL(aTitle)) {
aTitle = this.tabContainer.emptyTabTitle;
}
if (aTitle) {
if (!aTab.getAttribute("label")) {
aTab._labelIsInitialTitle = true;

2
browser/components/sessionstore/SessionStore.jsm
View File

@ -2767,7 +2767,7 @@ var SessionStoreInternal = {
if (activePageData.title &&
activePageData.title != activePageData.url) {
win.gBrowser.setInitialTabTitle(tab, activePageData.title, { isContentTitle: true });
} else if (activePageData.url != "about:blank") {
} else {
win.gBrowser.setInitialTabTitle(tab, activePageData.url);
}
}

8
browser/components/sessionstore/test/browser_tab_label_during_restore.js
View File

@ -20,6 +20,7 @@ add_task(async function() {
const ABOUT_ROBOTS_URI = "about:robots";
const ABOUT_ROBOTS_TITLE = "Gort! Klaatu barada nikto!";
const NO_TITLE_URL = "data:text/plain,foo";
const EMPTY_TAB_TITLE = gBrowser.tabContainer.emptyTabTitle;
function observeLabelChanges(tab, expectedLabels) {
let seenLabels = [tab.label];
@ -44,10 +45,11 @@ add_task(async function() {
{ entries: [{ url: ABOUT_ROBOTS_URI, triggeringPrincipal_base64 }] },
{ entries: [{ url: REMOTE_URL, triggeringPrincipal_base64 }] },
{ entries: [{ url: NO_TITLE_URL, triggeringPrincipal_base64 }] },
{ entries: [{ url: "about:blank", triggeringPrincipal_base64 }] },
],
}],
});
let [tab1, tab2, tab3, tab4] = gBrowser.tabs;
let [tab1, tab2, tab3, tab4, tab5] = gBrowser.tabs;
is(gBrowser.selectedTab, tab1, "first tab is selected");
await browserLoadedPromise;
@ -61,6 +63,7 @@ add_task(async function() {
ok(tab2.hasAttribute("pending"), "second tab is pending");
ok(tab3.hasAttribute("pending"), "third tab is pending");
ok(tab4.hasAttribute("pending"), "fourth tab is pending");
is(tab5.label, EMPTY_TAB_TITLE, "fifth tab dislpays empty tab title");
info("selecting the second tab");
// The fix for bug 1364127 caused about: pages' initial tab titles to show
@ -98,7 +101,7 @@ add_task(async function() {
gBrowser.selectedTab = tab3;
await TabStateFlusher.flushWindow(window);
await promiseBrowserState(SessionStore.getBrowserState());
[tab1, tab2, tab3, tab4] = gBrowser.tabs;
[tab1, tab2, tab3, tab4, tab5] = gBrowser.tabs;
is(tab3, gBrowser.selectedTab, "third tab is selected after restoring");
ok(document.title.startsWith(REMOTE_TITLE), "title bar displays content title");
ok(tab1.hasAttribute("pending"), "first tab is pending after restoring");
@ -108,6 +111,7 @@ add_task(async function() {
is(tab3.label, REMOTE_TITLE, "third tab displays content title in pending state");
ok(tab4.hasAttribute("pending"), "fourth tab is pending after restoring");
is(tab4.label, NO_TITLE_URL, "fourth tab displays URL");
is(tab5.label, EMPTY_TAB_TITLE, "fifth tab still displays empty tab title");
info("selecting the first tab");
finishObservingLabelChanges = observeLabelChanges(tab1, [REMOTE_TITLE]);