wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 930269 - Move saving of tab attributes (r=smacleod)

Browse Source
This commit is contained in:
Bill McCloskey 2013-11-12 15:02:39 -08:00
parent feb3b0ef1f
commit 21861341c0
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
browser/components/sessionstore/src/SessionStore.jsm
View File

@ -2552,6 +2552,17 @@ let SessionStoreInternal = {
// out of date now that we're restoring it.
TabState.dropPendingCollections(tab);
if (!tabData.entries) {
tabData.entries = [];
}
if (tabData.extData) {
tab.__SS_extdata = {};
for (let key in tabData.extData)
tab.__SS_extdata[key] = tabData.extData[key];
} else {
delete tab.__SS_extdata;
}
browser.__SS_tabStillLoading = true;
// keep the data around to prevent dataloss in case
@ -2561,11 +2572,7 @@ let SessionStoreInternal = {
browser.setAttribute("pending", "true");
tab.setAttribute("pending", "true");
// Make sure that set/getTabValue will set/read the correct data by
// wiping out any current value in tab.__SS_extdata.
delete tab.__SS_extdata;
if (!tabData.entries || tabData.entries.length == 0) {
if (tabData.entries.length == 0) {
// make sure to blank out this tab's content
// (just purging the tab's history won't be enough)
browser.loadURIWithFlags("about:blank",
@ -2600,6 +2607,16 @@ let SessionStoreInternal = {
tab.crop = "center";
}
}
// Restore tab attributes.
if ("attributes" in tabData) {
TabAttributes.set(tab, tabData.attributes);
}
// Restore the tab icon.
if ("image" in tabData) {
tabbrowser.setIcon(tab, tabData.image);
}
}
function restoreNextHistory() {
@ -2654,17 +2671,6 @@ let SessionStoreInternal = {
browser.__SS_shistoryListener = new SessionStoreSHistoryListener(tab);
history.addSHistoryListener(browser.__SS_shistoryListener);
if (!tabData.entries) {
tabData.entries = [];
}
if (tabData.extData) {
tab.__SS_extdata = {};
for (let key in tabData.extData)
tab.__SS_extdata[key] = tabData.extData[key];
} else {
delete tab.__SS_extdata;
}
let idMap = { used: {} };
let docIdentMap = {};
for (var i = 0; i < tabData.entries.length; i++) {
@ -2679,16 +2685,6 @@ let SessionStoreInternal = {
let disallow = new Set(tabData.disallow && tabData.disallow.split(","));
DocShellCapabilities.restore(browser.docShell, disallow);
// Restore tab attributes.
if ("attributes" in tabData) {
TabAttributes.set(tab, tabData.attributes);
}
// Restore the tab icon.
if ("image" in tabData) {
window.gBrowser.setIcon(tab, tabData.image);
}
if (tabData.storage && browser.docShell instanceof Ci.nsIDocShell)
SessionStorage.deserialize(browser.docShell, tabData.storage);