Merge last PGO-green changeset of mozilla-inbound to mozilla-central (3b62c548) · Commits · Tommy Webb / Tor Browser

browser/components/sessionstore/test/Makefile.in

+9 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,15 @@ MOCHITEST_BROWSER_FILES = \
		browser_581593.js \
		browser_581937.js \
		browser_586147.js \
		browser_586068-cascaded_restore.js \
		browser_586068-apptabs.js \
		browser_586068-apptabs_ondemand.js \
		browser_586068-browser_state_interrupted.js \
		browser_586068-cascade.js \
		browser_586068-multi_window.js \
		browser_586068-reload.js \
		browser_586068-select.js \
		browser_586068-window_state.js \
		browser_586068-window_state_override.js \
		browser_588426.js \
		browser_590268.js \
		browser_590563.js \

browser/components/sessionstore/test/browser_586068-apptabs.js

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		/* This Source Code Form is subject to the terms of the Mozilla Public
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

		const PREF_RESTORE_ON_DEMAND = "browser.sessionstore.restore_on_demand";

		let stateBackup = ss.getBrowserState();

		function test() {
		waitForExplicitFinish();

		Services.prefs.setBoolPref(PREF_RESTORE_ON_DEMAND, true);
		registerCleanupFunction(function () {
		Services.prefs.clearUserPref(PREF_RESTORE_ON_DEMAND);
		});

		let state = { windows: [{ tabs: [
		{ entries: [{ url: "http://example.org/#1" }], extData: { "uniq": r() }, pinned: true },
		{ entries: [{ url: "http://example.org/#2" }], extData: { "uniq": r() }, pinned: true },
		{ entries: [{ url: "http://example.org/#3" }], extData: { "uniq": r() }, pinned: true },
		{ entries: [{ url: "http://example.org/#4" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org/#5" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org/#6" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org/#7" }], extData: { "uniq": r() } },
		], selected: 5 }] };

		let loadCount = 0;
		gProgressListener.setCallback(function (aBrowser, aNeedRestore, aRestoring, aRestored) {
		loadCount++;

		// We'll make sure that the loads we get come from pinned tabs or the
		// the selected tab.

		// get the tab
		let tab;
		for (let i = 0; i < window.gBrowser.tabs.length; i++) {
		if (!tab && window.gBrowser.tabs[i].linkedBrowser == aBrowser)
		tab = window.gBrowser.tabs[i];
		}

		ok(tab.pinned \|\| gBrowser.selectedTab == tab,
		"load came from pinned or selected tab");

		// We should get 4 loads: 3 app tabs + 1 normal selected tab
		if (loadCount < 4)
		return;

		gProgressListener.unsetCallback();
		executeSoon(function () {
		waitForBrowserState(JSON.parse(stateBackup), finish);
		});
		});

		ss.setBrowserState(JSON.stringify(state));
		}

browser/components/sessionstore/test/browser_586068-apptabs_ondemand.js

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/* This Source Code Form is subject to the terms of the Mozilla Public
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

		const PREF_RESTORE_ON_DEMAND = "browser.sessionstore.restore_on_demand";
		const PREF_RESTORE_PINNED_TABS_ON_DEMAND = "browser.sessionstore.restore_pinned_tabs_on_demand";

		let stateBackup = ss.getBrowserState();

		function test() {
		waitForExplicitFinish();

		Services.prefs.setBoolPref(PREF_RESTORE_ON_DEMAND, true);
		Services.prefs.setBoolPref(PREF_RESTORE_PINNED_TABS_ON_DEMAND, true);

		registerCleanupFunction(function () {
		Services.prefs.clearUserPref(PREF_RESTORE_ON_DEMAND);
		Services.prefs.clearUserPref(PREF_RESTORE_PINNED_TABS_ON_DEMAND);
		});

		let state = { windows: [{ tabs: [
		{ entries: [{ url: "http://example.org/#1" }], extData: { "uniq": r() }, pinned: true },
		{ entries: [{ url: "http://example.org/#2" }], extData: { "uniq": r() }, pinned: true },
		{ entries: [{ url: "http://example.org/#3" }], extData: { "uniq": r() }, pinned: true },
		{ entries: [{ url: "http://example.org/#4" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org/#5" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org/#6" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org/#7" }], extData: { "uniq": r() } },
		], selected: 5 }] };

		gProgressListener.setCallback(function (aBrowser, aNeedRestore, aRestoring, aRestored) {
		// get the tab
		let tab;
		for (let i = 0; i < window.gBrowser.tabs.length; i++) {
		if (!tab && window.gBrowser.tabs[i].linkedBrowser == aBrowser)
		tab = window.gBrowser.tabs[i];
		}

		// Check that the load only comes from the selected tab.
		ok(gBrowser.selectedTab == tab, "load came from selected tab");
		is(aNeedRestore, 6, "six tabs left to restore");
		is(aRestoring, 1, "one tab is restoring");
		is(aRestored, 0, "no tabs have been restored, yet");

		gProgressListener.unsetCallback();
		executeSoon(function () {
		waitForBrowserState(JSON.parse(stateBackup), finish);
		});
		});

		ss.setBrowserState(JSON.stringify(state));
		}

browser/components/sessionstore/test/browser_586068-browser_state_interrupted.js

0 → 100644

+111 −0

Original line number	Diff line number	Diff line
		/* This Source Code Form is subject to the terms of the Mozilla Public
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

		const PREF_RESTORE_ON_DEMAND = "browser.sessionstore.restore_on_demand";

		let stateBackup = ss.getBrowserState();

		function test() {
		waitForExplicitFinish();

		Services.prefs.setBoolPref(PREF_RESTORE_ON_DEMAND, false);
		registerCleanupFunction(function () {
		Services.prefs.clearUserPref(PREF_RESTORE_ON_DEMAND);
		});

		// The first state will be loaded using setBrowserState, followed by the 2nd
		// state also being loaded using setBrowserState, interrupting the first restore.
		let state1 = { windows: [
		{
		tabs: [
		{ entries: [{ url: "http://example.org#1" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org#2" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org#3" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org#4" }], extData: { "uniq": r() } }
		],
		selected: 1
		},
		{
		tabs: [
		{ entries: [{ url: "http://example.com#1" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com#2" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com#3" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com#4" }], extData: { "uniq": r() } },
		],
		selected: 3
		}
		] };
		let state2 = { windows: [
		{
		tabs: [
		{ entries: [{ url: "http://example.org#5" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org#6" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org#7" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.org#8" }], extData: { "uniq": r() } }
		],
		selected: 3
		},
		{
		tabs: [
		{ entries: [{ url: "http://example.com#5" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com#6" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com#7" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com#8" }], extData: { "uniq": r() } },
		],
		selected: 1
		}
		] };

		// interruptedAfter will be set after the selected tab from each window have loaded.
		let interruptedAfter = 0;
		let loadedWindow1 = false;
		let loadedWindow2 = false;
		let numTabs = state2.windows[0].tabs.length + state2.windows[1].tabs.length;

		let loadCount = 0;
		gProgressListener.setCallback(function (aBrowser, aNeedRestore, aRestoring, aRestored) {
		loadCount++;

		if (aBrowser.currentURI.spec == state1.windows[0].tabs[2].entries[0].url)
		loadedWindow1 = true;
		if (aBrowser.currentURI.spec == state1.windows[1].tabs[0].entries[0].url)
		loadedWindow2 = true;

		if (!interruptedAfter && loadedWindow1 && loadedWindow2) {
		interruptedAfter = loadCount;
		ss.setBrowserState(JSON.stringify(state2));
		return;
		}

		if (loadCount < numTabs + interruptedAfter)
		return;

		// We don't actually care about load order in this test, just that they all
		// do load.
		is(loadCount, numTabs + interruptedAfter, "all tabs were restored");
		is(aNeedRestore, 0, "there are no tabs left needing restore");

		// Remove the progress listener from this window, it will be removed from
		// theWin when that window is closed (in setBrowserState).
		gProgressListener.unsetCallback();
		executeSoon(function () {
		closeAllButPrimaryWindow();
		waitForBrowserState(JSON.parse(stateBackup), finish);
		});
		});

		// We also want to catch the extra windows (there should be 2), so we need to observe domwindowopened
		Services.ww.registerNotification(function observer(aSubject, aTopic, aData) {
		if (aTopic == "domwindowopened") {
		let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
		win.addEventListener("load", function onLoad() {
		win.removeEventListener("load", onLoad);
		Services.ww.unregisterNotification(observer);
		win.gBrowser.addTabsProgressListener(gProgressListener);
		});
		}
		});

		ss.setBrowserState(JSON.stringify(state1));
		}

browser/components/sessionstore/test/browser_586068-cascade.js

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/* This Source Code Form is subject to the terms of the Mozilla Public
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

		const PREF_RESTORE_ON_DEMAND = "browser.sessionstore.restore_on_demand";

		let stateBackup = ss.getBrowserState();

		function test() {
		waitForExplicitFinish();

		Services.prefs.setBoolPref(PREF_RESTORE_ON_DEMAND, false);
		registerCleanupFunction(function () {
		Services.prefs.clearUserPref(PREF_RESTORE_ON_DEMAND);
		});

		let state = { windows: [{ tabs: [
		{ entries: [{ url: "http://example.com" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com" }], extData: { "uniq": r() } },
		{ entries: [{ url: "http://example.com" }], extData: { "uniq": r() } }
		] }] };

		let expectedCounts = [
		[3, 3, 0],
		[2, 3, 1],
		[1, 3, 2],
		[0, 3, 3],
		[0, 2, 4],
		[0, 1, 5]
		];

		let loadCount = 0;
		gProgressListener.setCallback(function (aBrowser, aNeedRestore, aRestoring, aRestored) {
		loadCount++;
		let expected = expectedCounts[loadCount - 1];

		is(aNeedRestore, expected[0], "load " + loadCount + " - # tabs that need to be restored");
		is(aRestoring, expected[1], "load " + loadCount + " - # tabs that are restoring");
		is(aRestored, expected[2], "load " + loadCount + " - # tabs that has been restored");

		if (loadCount == state.windows[0].tabs.length) {
		gProgressListener.unsetCallback();
		executeSoon(function () {
		waitForBrowserState(JSON.parse(stateBackup), finish);
		});
		}
		});

		ss.setBrowserState(JSON.stringify(state));
		}