mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1364364 - Part 5.2: Remove browser.sessionhistory.cache_subframes and fix test cases relying on it. r=smaug 

browser.sessionhistory.cache_subframes has been disabled for 12yrs. It's not
actually maintained and it leaks content viewers. Using this unreliable feature
in test cases is a bad practice, so remove the pref completely and fix existing
test cases.

MozReview-Commit-ID: 3tQLpsqmmaq

--HG--
extra : rebase_source : ce6e27c7d422f32dec858712eba5ed8011ee8039
This commit is contained in:
Samael Wang 2017-09-05 16:02:04 +08:00
Родитель 252b861c8b
Коммит a175a57a4e
18 изменённых файлов: 178 добавлений и 227 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -8314,16 +8314,11 @@ nsDocShell::CanSavePresentation(uint32_t aLoadType,
return false;
}
// Don't cache the content viewer if we're in a subframe and the subframe
// pref is disabled.
bool cacheFrames =
Preferences::GetBool("browser.sessionhistory.cache_subframes", false);
if (!cacheFrames) {
nsCOMPtr<nsIDocShellTreeItem> root;
GetSameTypeParent(getter_AddRefs(root));
if (root && root != this) {
return false; // this is a subframe load
}
// Don't cache the content viewer if we're in a subframe.
nsCOMPtr<nsIDocShellTreeItem> root;
GetSameTypeParent(getter_AddRefs(root));
if (root && root != this) {
return false; // this is a subframe load
}
// If the document does not want its presentation cached, then don't.

10
docshell/test/chrome/bug608669.xul
Просмотреть файл

@ -1,6 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<window title="Mozilla Bug 608669 - Blank page"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="notifyOpener();">
<description flex="1" value="This window is intentionally left blank"/>
<script type="application/javascript">
function notifyOpener() {
if (opener) {
opener.postMessage("load", "*");
}
}
</script>
</window>

66
docshell/test/chrome/test_bug608669.xul
Просмотреть файл

@ -18,27 +18,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=608669
<!-- test code goes here -->
<script type="application/javascript"><![CDATA[
var gOrigMaxTotalViewers = undefined;
function setCachePref(enabled) {
var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
if (enabled) {
is(typeof gOrigMaxTotalViewers, "undefined", "don't double-enable bfcache");
prefBranch.setBoolPref("browser.sessionhistory.cache_subframes", true);
gOrigMaxTotalViewers = prefBranch.getIntPref("browser.sessionhistory.max_total_viewers");
prefBranch.setIntPref("browser.sessionhistory.max_total_viewers", 10);
}
else {
is(typeof gOrigMaxTotalViewers, "number", "don't double-disable bfcache");
prefBranch.setIntPref("browser.sessionhistory.max_total_viewers", gOrigMaxTotalViewers);
gOrigMaxTotalViewers = undefined;
try {
prefBranch.clearUserPref("browser.sessionhistory.cache_subframes");
} catch (e) { /* Pref didn't exist, meh */ }
}
}
/** Test for Bug 608669 **/
SimpleTest.waitForExplicitFinish();
@ -51,10 +30,6 @@ function nextTest() {
}
function* doTest() {
var container = document.getElementById('container');
setCachePref(true);
var notificationCount = 0;
var observer = {
observe: function(aSubject, aTopic, aData) {
@ -73,44 +48,31 @@ function* doTest() {
is(notificationCount, 0, "initial count");
// create a new iframe
var iframe = document.createElement("iframe");
container.appendChild(iframe);
iframe.contentWindow.x = "y";
is(notificationCount, 1, "after created iframe");
// Try loading in an iframe
iframe.setAttribute("src", "bug608669.xul");
iframe.onload = nextTest;
// create a new window
var testWin = window.open("", "bug 608669", "chrome,width=600,height=600");
testWin.x = "y";
is(notificationCount, 1, "after created window");
// Try loading in the window
testWin.location = "bug608669.xul";
window.onmessage = nextTest;
yield undefined;
is(notificationCount, 1, "after first load");
is(iframe.contentWindow.x, "y", "reused window");
is(testWin.x, "y", "reused window");
// Try loading again in an iframe
iframe.setAttribute("src", "bug608669.xul?x");
iframe.onload = nextTest;
// Try loading again in the window
testWin.location = "bug608669.xul?x";
window.onmessage = nextTest;
yield undefined;
is(notificationCount, 2, "after second load");
is("x" in iframe.contentWindow, false, "didn't reuse window");
is("x" in testWin, false, "didn't reuse window");
// Open a new window using window.open
popup = window.open("bug608669.xul", "bug 608669",
"chrome,width=600,height=600");
popup.onload = nextTest;
yield undefined;
is(notificationCount, 3, "after window.open load");
popup.close();
testWin.close();
setCachePref(false);
os.removeObserver(observer, "chrome-document-global-created");
os.removeObserver(observer, "content-document-global-created");
SimpleTest.finish();
}
]]></script>
<vbox id="container" flex="1">
<description>Below will an iframe be added</description>
</vbox>
</window>

4
dom/indexedDB/test/bfcache_page1.html
Просмотреть файл

@ -2,7 +2,7 @@
<html>
<head>
<script>
var request = indexedDB.open(parent.location, 1);
var request = indexedDB.open(opener.location, 1);
request.onupgradeneeded = function(e) {
var db = e.target.result;
// This should never be called
@ -16,7 +16,7 @@
var store = db.createObjectStore("mystore");
store.add({ hello: "world" }, 42);
trans.oncomplete = function() {
parent.postMessage("go", "http://mochi.test:8888");
opener.postMessage("go", "http://mochi.test:8888");
}
};
</script>

4
dom/indexedDB/test/bfcache_page2.html
Просмотреть файл

@ -3,7 +3,7 @@
<head>
<script>
var res = {};
var request = indexedDB.open(parent.location, 2);
var request = indexedDB.open(opener.location, 2);
request.onblocked = function() {
res.blockedFired = true;
}
@ -17,7 +17,7 @@
res.value = JSON.stringify(e.target.result);
}
trans.oncomplete = function() {
parent.postMessage(JSON.stringify(res), "http://mochi.test:8888");
opener.postMessage(JSON.stringify(res), "http://mochi.test:8888");
}
};

32
dom/indexedDB/test/test_bfcache.html
Просмотреть файл

@ -10,41 +10,16 @@
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="text/javascript">
/* import-globals-from helpers.js */
var gOrigMaxTotalViewers = undefined;
function setCachePref(enabled) {
if (enabled) {
is(typeof gOrigMaxTotalViewers, "undefined",
"don't double-enable bfcache");
SpecialPowers.setBoolPref("browser.sessionhistory.cache_subframes",
true);
gOrigMaxTotalViewers =
SpecialPowers.getIntPref("browser.sessionhistory.max_total_viewers");
SpecialPowers.setIntPref("browser.sessionhistory.max_total_viewers",
10);
}
else {
is(typeof gOrigMaxTotalViewers, "number",
"don't double-disable bfcache");
SpecialPowers.setIntPref("browser.sessionhistory.max_total_viewers",
gOrigMaxTotalViewers);
gOrigMaxTotalViewers = undefined;
try {
SpecialPowers.clearUserPref("browser.sessionhistory.cache_subframes");
} catch (e) { /* Pref didn't exist, meh */ }
}
}
function* testSteps()
{
var iframe = $("iframe");
setCachePref(true);
window.onmessage = grabEventAndContinueHandler;
iframe.src = "bfcache_iframe1.html";
let testWin = window.open("bfcache_page1.html", "testWin");
var event = yield undefined;
is(event.data, "go", "set up database successfully");
iframe.src = "bfcache_iframe2.html";
testWin.location = "bfcache_page2.html";
let res = JSON.parse((yield).data);
is(res.version, 2, "version was set correctly");
is(res.storeCount, 1, "correct set of stores");
@ -52,7 +27,7 @@
is(res.value, JSON.stringify({ hello: "world" }),
"correct value found in store");
setCachePref(false);
testWin.close();
finishTest();
}
</script>
@ -61,7 +36,6 @@
</head>
<body onload="runTest();">
<iframe id="iframe"></iframe>
</body>
</html>

2
dom/media/webspeech/synth/test/file_bfcache_page1.html
Просмотреть файл

@ -7,7 +7,7 @@
var u = new SpeechSynthesisUtterance('hello');
u.lang = 'it-IT-noend';
u.addEventListener('start', function() {
location = "file_bfcache_frame2.html";
location = "file_bfcache_page2.html";
});
speechSynthesis.speak(u);
});

4
dom/media/webspeech/synth/test/file_bfcache_page2.html
Просмотреть файл

@ -3,8 +3,8 @@
var frameUnloaded = function() {
var u = new SpeechSynthesisUtterance('hi');
u.addEventListener('end', function () {
parent.ok(true, 'Successfully spoke utterance from new frame.');
parent.onDone();
opener.ok(true, 'Successfully spoke utterance from new frame.');
opener.onDone();
});
speechSynthesis.speak(u);
};

17
dom/media/webspeech/synth/test/test_bfcache.html
Просмотреть файл

@ -13,9 +13,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1230533
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1230533">Mozilla Bug 1230533</a>
<p id="display"></p>
<iframe id="testFrame"></iframe>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
@ -23,20 +22,22 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1230533
/** Test for Bug 525444 **/
SimpleTest.waitForExplicitFinish();
var iframe;
let testWin;
function onDone() {
testWin.close();
SimpleTest.finish();
}
SpecialPowers.pushPrefEnv({ set: [
['media.webspeech.synth.enabled', true],
['media.webspeech.synth.force_global_queue', true],
['browser.sessionhistory.cache_subframes', true],
['browser.sessionhistory.max_total_viewers', 10]] },
['media.webspeech.synth.force_global_queue', true]] },
function() {
loadSpeechTest("file_bfcache_frame.html");
testWin = window.open("about:blank", "testWin");
testWin.onload = function(e) {
waitForVoices(testWin)
.then(() => testWin.location = "file_bfcache_page1.html")
};
});
</script>

2
dom/workers/test/WorkerDebugger_frozen_window1.html
Просмотреть файл

@ -5,7 +5,7 @@
<script>
var worker = new Worker("WorkerDebugger_frozen_worker1.js");
worker.onmessage = function () {
parent.postMessage("ready", "*");
opener.postMessage("ready", "*");
};
</script>
</head>

2
dom/workers/test/WorkerDebugger_frozen_window2.html
Просмотреть файл

@ -5,7 +5,7 @@
<script>
var worker = new Worker("WorkerDebugger_frozen_worker2.js");
worker.onmessage = function () {
parent.postMessage("ready", "*");
opener.postMessage("ready", "*");
};
</script>
</head>

15
dom/workers/test/blank.html Normal file
Просмотреть файл

@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Blank</title>
</head>
<body onload="notifyOnload();">
<script type="application/javascript">
function notifyOnload() {
opener.postMessage({event: 'load'}, '*');
}
</script>
</body>
</html>

1
dom/workers/test/mochitest.ini
Просмотреть файл

@ -2,6 +2,7 @@
support-files =
WorkerTest_badworker.js
atob_worker.js
blank.html
bug978260_worker.js
bug1014466_data1.txt
bug1014466_data2.txt

24
dom/workers/test/multi_sharedWorker_frame.html
Просмотреть файл

@ -7,15 +7,31 @@
<head>
<title>Test for SharedWorker</title>
</head>
<body>
<body onload="notifyOpenerLoadEvent();">
<script type="text/javascript">
"use strict";
function postMessageToParentOrOpener(message) {
if (parent != window) {
parent.postMessage(message, "*");
}
if (opener) {
opener.postMessage(message, "*");
}
}
// Used by test_multi_sharedWorker_lifetimes.html
function notifyOpenerLoadEvent() {
if (opener) {
opener.postMessage({event: "load"}, "*");
}
}
function debug(message) {
if (typeof(message) != "string") {
throw new Error("debug() only accepts strings!");
}
parent.postMessage(message, "*");
postMessageToParentOrOpener(message);
}
let worker;
@ -35,12 +51,12 @@
lineno: event.lineno,
isErrorEvent: event instanceof ErrorEvent
};
parent.postMessage(data, "*");
postMessageToParentOrOpener(data);
};
worker.port.onmessage = function(event) {
debug("Worker message: " + JSON.stringify(event.data));
parent.postMessage(event.data, "*");
postMessageToParentOrOpener(event.data);
};
}

25
dom/workers/test/test_WorkerDebugger_frozen.xul
Просмотреть файл

@ -16,11 +16,8 @@
<script type="application/javascript">
<![CDATA[
const CACHE_SUBFRAMES = "browser.sessionhistory.cache_subframes";
const MAX_TOTAL_VIEWERS = "browser.sessionhistory.max_total_viewers";
const IFRAME1_URL = "WorkerDebugger_frozen_iframe1.html";
const IFRAME2_URL = "WorkerDebugger_frozen_iframe2.html";
const WINDOW1_URL = "WorkerDebugger_frozen_window1.html";
const WINDOW2_URL = "WorkerDebugger_frozen_window2.html";
const WORKER1_URL = "WorkerDebugger_frozen_worker1.js";
const WORKER2_URL = "WorkerDebugger_frozen_worker2.js";
@ -29,18 +26,14 @@
(async function() {
SimpleTest.waitForExplicitFinish();
var oldMaxTotalViewers = SpecialPowers.getIntPref(MAX_TOTAL_VIEWERS);
SpecialPowers.setBoolPref(CACHE_SUBFRAMES, true);
SpecialPowers.setIntPref(MAX_TOTAL_VIEWERS, 10);
let iframe = $("iframe");
SpecialPowers.pushPrefEnv({set:
[["browser.sessionhistory.max_total_viewers", 10]]});
let promise = waitForMultiple([
waitForRegister(WORKER1_URL),
waitForWindowMessage(window, "ready"),
]);
iframe.src = IFRAME1_URL;
let testWin = window.open(WINDOW1_URL, "testWin");;
let [dbg1] = await promise;
is(dbg1.isClosed, false,
"debugger for worker on page 1 should not be closed");
@ -51,7 +44,7 @@
waitForRegister(WORKER2_URL),
waitForWindowMessage(window, "ready"),
]);
iframe.src = IFRAME2_URL;
testWin.location = WINDOW2_URL;
let [,, dbg2] = await promise;
is(dbg1.isClosed, true,
"debugger for worker on page 1 should be closed");
@ -63,16 +56,13 @@
waitForDebuggerClose(dbg2),
waitForRegister(WORKER1_URL)
]);
iframe.contentWindow.history.back();
testWin.history.back();
[,, dbg1] = await promise;
is(dbg1.isClosed, false,
"debugger for worker on page 1 should not be closed");
is(dbg2.isClosed, true,
"debugger for worker on page 2 should be closed");
SpecialPowers.clearUserPref(CACHE_SUBFRAMES);
SpecialPowers.setIntPref(MAX_TOTAL_VIEWERS, oldMaxTotalViewers);
SimpleTest.finish();
})();
}
@ -84,7 +74,6 @@
<p id="display"></p>
<div id="content" style="display:none;"></div>
<pre id="test"></pre>
<iframe id="iframe"></iframe>
</body>
<label id="test-result"/>
</window>

99
dom/workers/test/test_multi_sharedWorker_lifetimes.html
Просмотреть файл

@ -12,21 +12,20 @@
"use strict";
const scrollbarPref = "layout.testing.overlay-scrollbars.always-visible";
const bfCacheEnabledPref = "browser.sessionhistory.cache_subframes";
const bfCacheDepthPref = "browser.sessionhistory.max_total_viewers";
const bfCacheDepth = 10;
const viewersPref = "browser.sessionhistory.max_total_viewers";
const frameRelativeURL = "multi_sharedWorker_frame.html";
const windowRelativeURL = "multi_sharedWorker_frame.html";
const storedData = "0123456789abcdefghijklmnopqrstuvwxyz";
let testGenerator = (function*() {
SimpleTest.waitForExplicitFinish();
// Force scrollbar to always be shown. The scrollbar setting is
// necessary to avoid the fade-in/fade-out from evicting our document
// from the BF cache below. If bug 1049277 is fixed, then we can
// stop setting the scrollbar pref here.
SpecialPowers.pushPrefEnv({ set: [[scrollbarPref, true]] },
// Force scrollbar to always be shown. The scrollbar setting is
// necessary to avoid the fade-in/fade-out from evicting our document
// from the BF cache below. If bug 1049277 is fixed, then we can
// stop setting the scrollbar pref here.
SpecialPowers.pushPrefEnv({ set: [[scrollbarPref, true],
[viewersPref, 10]] },
sendToGenerator);
yield undefined;
@ -38,76 +37,62 @@
}
});
let frame = document.getElementById("frame");
frame.src = frameRelativeURL;
frame.onload = sendToGenerator;
let testWin = window.open(windowRelativeURL, "testWin");
yield undefined;
frame = frame.contentWindow;
frame.postMessage({ command: "retrieve" }, "*");
testWin.postMessage({ command: "retrieve" }, "*");
let event = yield undefined;
ok(event instanceof MessageEvent, "Got a MessageEvent");
is(event.source, frame, "Correct window got the event");
is(event.source, testWin, "Correct window got the event");
is(event.data.type, "result", "Got a result message");
is(event.data.data, undefined, "No data stored yet");
frame.postMessage({ command: "store", data: storedData }, "*");
frame.postMessage({ command: "retrieve" }, "*");
testWin.postMessage({ command: "store", data: storedData }, "*");
testWin.postMessage({ command: "retrieve" }, "*");
event = yield undefined;
ok(event instanceof MessageEvent, "Got a MessageEvent");
is(event.source, frame, "Correct window got the event");
is(event.source, testWin, "Correct window got the event");
is(event.data.type, "result", "Got a result message");
is(event.data.data, storedData, "Got stored data");
// Navigate when the bfcache is disabled.
info("Navigating to about:blank");
frame = document.getElementById("frame");
frame.onload = sendToGenerator;
frame.src = "about:blank";
frame.contentWindow.document.body.offsetTop;
info("Navigating to a blank page");
testWin.onunload = function(){};;
testWin.location = "blank.html";
testWin.document.body.offsetTop;
yield undefined;
info("Navigating to " + frameRelativeURL);
frame.src = frameRelativeURL;
frame.contentWindow.document.body.offsetTop;
info("Navigating to " + windowRelativeURL);
testWin.onunload = function(){};
testWin.location = windowRelativeURL;
testWin.document.body.offsetTop;
yield undefined;
frame = frame.contentWindow;
frame.postMessage({ command: "retrieve" }, "*");
testWin.postMessage({ command: "retrieve" }, "*");
event = yield undefined;
ok(event instanceof MessageEvent, "Got a MessageEvent");
is(event.source, frame, "Correct window got the event");
is(event.source, testWin, "Correct window got the event");
is(event.data.type, "result", "Got a result message");
is(event.data.data, undefined, "No data stored");
frame.postMessage({ command: "store", data: storedData }, "*");
frame.postMessage({ command: "retrieve" }, "*");
testWin.postMessage({ command: "store", data: storedData }, "*");
testWin.postMessage({ command: "retrieve" }, "*");
event = yield undefined;
ok(event instanceof MessageEvent, "Got a MessageEvent");
is(event.source, frame, "Correct window got the event");
is(event.source, testWin, "Correct window got the event");
is(event.data.type, "result", "Got a result message");
is(event.data.data, storedData, "Got stored data");
info("Enabling '" + bfCacheEnabledPref + "' pref");
SpecialPowers.pushPrefEnv({ set: [[bfCacheEnabledPref, true],
[bfCacheDepthPref, bfCacheDepth]] },
sendToGenerator);
yield undefined;
// Navigate when the bfcache is enabled.
frame = document.getElementById("frame");
frame.onload = sendToGenerator;
info("Navigating to about:blank");
frame.src = "about:blank";
frame.contentWindow.document.body.offsetTop;
info("Navigating to a blank page");
testWin.location = "blank.html";
testWin.document.body.offsetTop;
yield undefined;
@ -116,32 +101,33 @@
SpecialPowers.exactGC(sendToGenerator);
yield undefined;
// It seems using SpecialPowers.executeSoon() would make the
// entryGlobal being the TabChildGlobal (and that would make the
// baseURI in the location assignment below being incorrect);
// setTimeout on the otherhand ensures the entryGlobal is this
// window.
info("Waiting the event queue to clear");
SpecialPowers.executeSoon(sendToGenerator);
setTimeout(sendToGenerator, 0);
yield undefined;
}
info("Navigating to " + frameRelativeURL);
frame.src = frameRelativeURL;
frame.contentWindow.document.body.offsetTop;
info("Navigating to " + windowRelativeURL);
testWin.location = windowRelativeURL;
testWin.document.body.offsetTop;
yield undefined;
frame = frame.contentWindow;
frame.postMessage({ command: "retrieve" }, "*");
testWin.postMessage({ command: "retrieve" }, "*");
event = yield undefined;
ok(event instanceof MessageEvent, "Got a MessageEvent");
is(event.source, frame, "Correct window got the event");
is(event.source, testWin, "Correct window got the event");
is(event.data.type, "result", "Got a result message");
is(event.data.data, storedData, "Still have data stored");
info("Resetting '" + bfCacheEnabledPref + "' pref");
SpecialPowers.popPrefEnv(sendToGenerator);
yield undefined;
window.removeEventListener("message", sendToGenerator);
testWin.close();
SimpleTest.finish();
})();
@ -150,6 +136,5 @@
</script>
</head>
<body onload="testGenerator.next();">
<iframe id="frame"></iframe>
</body>
</html>

11
dom/workers/test/test_onLine.html
Просмотреть файл

@ -26,7 +26,16 @@ addLoadEvent(function() {
w.onmessage = function(e) {
if (e.data.type === 'ready') {
doTest();
// XXX Important trick here.
//
// Setting iosvc.offline would trigger a sync notifyObservers call, and if
// there exists a preloaded about:newtab (see tabbrowser._handleNewTab),
// that tab will be notified.
//
// This implies a sync call across different tabGroups, and will hit the
// assertion in SchedulerGroup::ValidateAccess(). So use executeSoon to
// re-dispatch an unlabeled runnable to the event queue.
SpecialPowers.executeSoon(doTest);
} else if (e.data.type === 'ok') {
ok(e.data.test, e.data.message);
} else if (e.data.type === 'finished') {

72
dom/workers/test/test_suspend.html
Просмотреть файл

@ -14,13 +14,12 @@
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
<iframe id="workerFrame" src="suspend_iframe.html" onload="subframeLoaded();">
</iframe>
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var iframe;
const BLANK_URI = location.href.replace("test_suspend.html", "blank.html");
var lastCount;
var suspended = false;
@ -31,29 +30,39 @@
var oldMessageCount;
var waitCount = 0;
var testWin = window.open("suspend_window.html", "testWin");
testWin.onload = testWinLoaded;
window.addEventListener("message", msg => {
if (suspended) {
badOnloadCallback();
} else {
suspendCallback();
}
})
function finishTest() {
if (finished) {
return;
}
finished = true;
SpecialPowers.flushPrefEnv(function () {
iframe.terminateWorker();
SimpleTest.finish();
});
testWin.terminateWorker();
testWin.close();
SimpleTest.finish();
}
function waitInterval() {
if (finished) {
return;
}
is(String(iframe.location), "about:blank", "Wrong url!");
is(testWin.location.href, BLANK_URI, "Wrong url!");
is(suspended, true, "Not suspended?");
is(resumed, false, "Already resumed?!");
is(lastCount, oldMessageCount, "Received a message while suspended!");
if (++waitCount == 5) {
clearInterval(interval);
resumed = true;
iframe.history.back();
testWin.history.back();
}
}
@ -61,7 +70,7 @@
if (finished) {
return;
}
ok(false, "We don't want suspend_iframe.html to fire a new load event, we want it to come out of the bfcache!");
ok(false, "We don't want suspend_window.html to fire a new load event, we want it to come out of the bfcache!");
finishTest();
}
@ -69,16 +78,12 @@
if (finished) {
return;
}
is(String(iframe.location), "about:blank", "Wrong url!");
is(testWin.location.href, BLANK_URI, "Wrong url!");
is(suspended, false, "Already suspended?");
is(resumed, false, "Already resumed?");
SpecialPowers.popPrefEnv(function () {
suspended = true;
var iframeElement = document.getElementById("workerFrame");
iframeElement.onload = badOnloadCallback;
oldMessageCount = lastCount;
interval = setInterval(waitInterval, 1000);
});
suspended = true;
oldMessageCount = lastCount;
interval = setInterval(waitInterval, 1000);
}
function messageCallback(data) {
@ -91,21 +96,18 @@
"Got good data, lastCount = " + lastCount + ", data = " + data);
lastCount = data;
if (lastCount == 25) {
SpecialPowers.pushPrefEnv({"set": [["browser.sessionhistory.cache_subframes", true]]}, function () {
iframe.location = "about:blank";
// We want suspend_iframe.html to go into bfcache, so we need to flush
// out all pending notifications. Otherwise, if they're flushed too
// late, they could kick us out of the bfcache again.
iframe.document.body.offsetTop;
});
testWin.location = "blank.html";
// We want suspend_window.html to go into bfcache, so we need to flush
// out all pending notifications. Otherwise, if they're flushed too
// late, they could kick us out of the bfcache again.
testWin.document.body.offsetTop;
}
return;
}
var newLocation =
window.location.toString().replace("test_suspend.html",
"suspend_iframe.html");
is(newLocation.indexOf(iframe.location.toString()), 0, "Wrong url!");
var newLocation = location.href.replace("test_suspend.html",
"suspend_window.html");
is(testWin.location.href, newLocation, "Wrong url!");
is(resumed, true, "Got message before resumed!");
is(lastCount, data - 1, "Missed a message, suspend failed!");
finishTest();
@ -115,21 +117,15 @@
if (finished) {
return;
}
ok(false, "Iframe had an error: '" + data + "'");
ok(false, "testWin had an error: '" + data + "'");
finishTest();
}
function subframeLoaded() {
function testWinLoaded() {
if (finished) {
return;
}
var iframeElement = document.getElementById("workerFrame");
iframeElement.onload = suspendCallback;
iframe = iframeElement.contentWindow;
ok(iframe, "No iframe?!");
iframe.startWorker(messageCallback, errorCallback);
testWin.startWorker(messageCallback, errorCallback);
}
</script>