зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1220929 - Remove crashed tab / browser count from SessionStore. r=Mossop
--HG-- extra : commitid : 7PaU6C9W6za extra : rebase_source : 4052db2057e86ff95866d86193bce45a5c1908da
This commit is contained in:
Родитель
1ed12ce37e
Коммит
c70576a28d
|
@ -201,10 +201,6 @@ this.SessionStore = {
|
||||||
return SessionStoreInternal.canRestoreLastSession;
|
return SessionStoreInternal.canRestoreLastSession;
|
||||||
},
|
},
|
||||||
|
|
||||||
get crashedTabCount() {
|
|
||||||
return SessionStoreInternal._crashedBrowsersCount;
|
|
||||||
},
|
|
||||||
|
|
||||||
set canRestoreLastSession(val) {
|
set canRestoreLastSession(val) {
|
||||||
SessionStoreInternal.canRestoreLastSession = val;
|
SessionStoreInternal.canRestoreLastSession = val;
|
||||||
},
|
},
|
||||||
|
@ -388,9 +384,6 @@ var SessionStoreInternal = {
|
||||||
// they get restored).
|
// they get restored).
|
||||||
_crashedBrowsers: new WeakSet(),
|
_crashedBrowsers: new WeakSet(),
|
||||||
|
|
||||||
// The number of crashed browsers.
|
|
||||||
_crashedBrowsersCount: 0,
|
|
||||||
|
|
||||||
// A map (xul:browser -> nsIFrameLoader) that maps a browser to the last
|
// A map (xul:browser -> nsIFrameLoader) that maps a browser to the last
|
||||||
// associated frameLoader we heard about.
|
// associated frameLoader we heard about.
|
||||||
_lastKnownFrameLoader: new WeakMap(),
|
_lastKnownFrameLoader: new WeakMap(),
|
||||||
|
@ -1580,10 +1573,6 @@ var SessionStoreInternal = {
|
||||||
if (!aNoNotification) {
|
if (!aNoNotification) {
|
||||||
this.saveStateDelayed(aWindow);
|
this.saveStateDelayed(aWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this._crashedBrowsers.has(browser.permanentKey)) {
|
|
||||||
this._crashedBrowsersCount++;
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1613,10 +1602,6 @@ var SessionStoreInternal = {
|
||||||
if (!aNoNotification) {
|
if (!aNoNotification) {
|
||||||
this.saveStateDelayed(aWindow);
|
this.saveStateDelayed(aWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this._crashedBrowsers.has(browser.permanentKey)) {
|
|
||||||
this._crashedBrowsersCount--;
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1797,7 +1782,6 @@ var SessionStoreInternal = {
|
||||||
*/
|
*/
|
||||||
onBrowserCrashed: function(aWindow, aBrowser) {
|
onBrowserCrashed: function(aWindow, aBrowser) {
|
||||||
this._crashedBrowsers.add(aBrowser.permanentKey);
|
this._crashedBrowsers.add(aBrowser.permanentKey);
|
||||||
this._crashedBrowsersCount++;
|
|
||||||
// If we never got around to restoring this tab, clear its state so
|
// If we never got around to restoring this tab, clear its state so
|
||||||
// that we don't try restoring if the user switches to it before
|
// that we don't try restoring if the user switches to it before
|
||||||
// reviving the crashed browser. This is throwing away the information
|
// reviving the crashed browser. This is throwing away the information
|
||||||
|
@ -2353,8 +2337,6 @@ var SessionStoreInternal = {
|
||||||
|
|
||||||
let data = TabState.collect(aTab);
|
let data = TabState.collect(aTab);
|
||||||
this.restoreTab(aTab, data);
|
this.restoreTab(aTab, data);
|
||||||
|
|
||||||
this._crashedBrowsersCount--;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2368,8 +2350,6 @@ var SessionStoreInternal = {
|
||||||
this.reviveCrashedTab(tab);
|
this.reviveCrashedTab(tab);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this._crashedBrowsersCount = 0;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче