зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1080801 - fix browser_bug633691.js to work in e10s mode, r=MattN
This commit is contained in:
Родитель
0f541d7b81
Коммит
655ac4f94a
|
@ -248,7 +248,6 @@ skip-if = e10s # Bug 1093677 - automated form submission from the test doesn't s
|
||||||
[browser_bug623893.js]
|
[browser_bug623893.js]
|
||||||
[browser_bug624734.js]
|
[browser_bug624734.js]
|
||||||
[browser_bug633691.js]
|
[browser_bug633691.js]
|
||||||
skip-if = e10s # Bug ?????? - test directly manipulates content (eg, var expertDiv = gBrowser.contentDocument.getElementById("expertContent");)
|
|
||||||
[browser_bug647886.js]
|
[browser_bug647886.js]
|
||||||
skip-if = buildapp == 'mulet' || e10s # Bug 1093373 - Relies on browser.sessionHistory
|
skip-if = buildapp == 'mulet' || e10s # Bug 1093373 - Relies on browser.sessionHistory
|
||||||
[browser_bug655584.js]
|
[browser_bug655584.js]
|
||||||
|
|
|
@ -6,12 +6,15 @@ function test() {
|
||||||
waitForExplicitFinish();
|
waitForExplicitFinish();
|
||||||
gBrowser.selectedTab = gBrowser.addTab();
|
gBrowser.selectedTab = gBrowser.addTab();
|
||||||
// Open a html page with about:certerror in an iframe
|
// Open a html page with about:certerror in an iframe
|
||||||
window.content.addEventListener("load", testIframeCert, true);
|
gBrowser.selectedTab.linkedBrowser.addEventListener("load", testIframeCert, true);
|
||||||
content.location = "data:text/html,<iframe width='700' height='700' src='about:certerror'></iframe>";
|
content.location = "data:text/html,<iframe width='700' height='700' src='about:certerror'></iframe>";
|
||||||
}
|
}
|
||||||
|
|
||||||
function testIframeCert() {
|
function testIframeCert(e) {
|
||||||
window.content.removeEventListener("load", testIframeCert, true);
|
if (e.target.location.href == "about:blank") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
gBrowser.selectedTab.linkedBrowser.removeEventListener("load", testIframeCert, true);
|
||||||
// Confirm that the expert section is hidden
|
// Confirm that the expert section is hidden
|
||||||
var doc = gBrowser.contentDocument.getElementsByTagName('iframe')[0].contentDocument;
|
var doc = gBrowser.contentDocument.getElementsByTagName('iframe')[0].contentDocument;
|
||||||
var eC = doc.getElementById("expertContent");
|
var eC = doc.getElementById("expertContent");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче