forked from mirrors/gecko-dev
781f548ab2
NOTE: The '__SSi' and '__SS_lastSessionWindowID' properties on windows are kept,
because they are expected to stick around longer during application shutdown.
The benefits is are:
1. Cleaner code - Sessionstore implementation details are not leaked outside its
module.
2. Observing the lifetime of objects becomes unnecessary, because the WeakMaps are
cleaned up when objects are GC'd, making leakage of their references impossible
and Sessionstore can't hold objects hostage anymore.
3. Simplification - all state is now maintained in SessionStore.jsm, which allows
for additional refactoring later on to simplify the implementation further.
MozReview-Commit-ID: C1II8qHkQ6F
--HG--
extra : rebase_source : e5fc6984558bd455a33e275f7060d42c93c21720
99 lines
2.6 KiB
JavaScript
99 lines
2.6 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
var stateBackup = ss.getBrowserState();
|
|
|
|
var statePinned = {windows: [{tabs: [
|
|
{entries: [{url: "http://example.com#1", triggeringPrincipal_base64}], pinned: true}
|
|
]}]};
|
|
|
|
var state = {windows: [{tabs: [
|
|
{entries: [{url: "http://example.com#1", triggeringPrincipal_base64}]},
|
|
{entries: [{url: "http://example.com#2", triggeringPrincipal_base64}]},
|
|
{entries: [{url: "http://example.com#3", triggeringPrincipal_base64}]},
|
|
{entries: [{url: "http://example.com#4", triggeringPrincipal_base64}]},
|
|
]}]};
|
|
|
|
function test() {
|
|
waitForExplicitFinish();
|
|
|
|
registerCleanupFunction(function() {
|
|
TabsProgressListener.uninit();
|
|
ss.setBrowserState(stateBackup);
|
|
});
|
|
|
|
|
|
TabsProgressListener.init();
|
|
|
|
window.addEventListener("SSWindowStateReady", function() {
|
|
let firstProgress = true;
|
|
|
|
TabsProgressListener.setCallback(function(needsRestore, isRestoring) {
|
|
if (firstProgress) {
|
|
firstProgress = false;
|
|
is(isRestoring, 3, "restoring 3 tabs concurrently");
|
|
} else {
|
|
ok(isRestoring <= 3, "restoring max. 2 tabs concurrently");
|
|
}
|
|
|
|
if (0 == needsRestore) {
|
|
TabsProgressListener.unsetCallback();
|
|
waitForFocus(finish);
|
|
}
|
|
});
|
|
|
|
ss.setBrowserState(JSON.stringify(state));
|
|
}, {once: true});
|
|
|
|
ss.setBrowserState(JSON.stringify(statePinned));
|
|
}
|
|
|
|
function countTabs() {
|
|
let needsRestore = 0, isRestoring = 0;
|
|
let windowsEnum = Services.wm.getEnumerator("navigator:browser");
|
|
|
|
while (windowsEnum.hasMoreElements()) {
|
|
let window = windowsEnum.getNext();
|
|
if (window.closed)
|
|
continue;
|
|
|
|
for (let i = 0; i < window.gBrowser.tabs.length; i++) {
|
|
let browserState = ss.getInternalObjectState(window.gBrowser.tabs[i].linkedBrowser);
|
|
if (browserState == TAB_STATE_RESTORING)
|
|
isRestoring++;
|
|
else if (browserState == TAB_STATE_NEEDS_RESTORE)
|
|
needsRestore++;
|
|
}
|
|
}
|
|
|
|
return [needsRestore, isRestoring];
|
|
}
|
|
|
|
var TabsProgressListener = {
|
|
init() {
|
|
Services.obs.addObserver(this, "sessionstore-debug-tab-restored");
|
|
},
|
|
|
|
uninit() {
|
|
Services.obs.removeObserver(this, "sessionstore-debug-tab-restored");
|
|
this.unsetCallback();
|
|
},
|
|
|
|
setCallback(callback) {
|
|
this.callback = callback;
|
|
},
|
|
|
|
unsetCallback() {
|
|
delete this.callback;
|
|
},
|
|
|
|
observe(browser, topic, data) {
|
|
TabsProgressListener.onRestored(browser);
|
|
},
|
|
|
|
onRestored(browser) {
|
|
if (this.callback && ss.getInternalObjectState(browser) == TAB_STATE_RESTORING) {
|
|
this.callback.apply(null, countTabs());
|
|
}
|
|
}
|
|
};
|