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 531519 - getBrowserState sometimes returns two entries for one window. r=zeniko

Browse Source
This commit is contained in:
Dão Gottwald 2009-12-12 18:22:13 +01:00
parent ecadcf59af
commit 30069007e2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/components/sessionstore/src/nsSessionStore.js
View File

@ -587,7 +587,7 @@ SessionStoreService.prototype = {
// ignore non-browser windows and windows opened while shutting down
if (aWindow.document.documentElement.getAttribute("windowtype") != "navigator:browser" ||
this._loadState == STATE_QUITTING)
this._loadState == STATE_QUITTING)
return;
// assign it a unique identifier (timestamp)
@ -595,6 +595,8 @@ SessionStoreService.prototype = {
// and create its data object
this._windows[aWindow.__SSi] = { tabs: [], selected: 0, _closedTabs: [] };
if (!this._isWindowLoaded(aWindow))
this._windows[aWindow.__SSi]._restoring = true;
if (!aWindow.toolbar.visible)
this._windows[aWindow.__SSi].isPopup = true;
@ -1742,6 +1744,8 @@ SessionStoreService.prototype = {
var nonPopupCount = 0;
var ix;
for (ix in this._windows) {
if (this._windows[ix]._restoring) // window data is still in _statesToRestore
continue;
total.push(this._windows[ix]);
windows.push(ix);
if (!this._windows[ix].isPopup)
@ -2033,6 +2037,7 @@ SessionStoreService.prototype = {
// from now on, the data will come from the actual window
delete this._statesToRestore[aWindow.__SS_restoreID];
delete aWindow.__SS_restoreID;
delete this._windows[aWindow.__SSi]._restoring;
}
// helper hash for ensuring unique frame IDs