зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1714594, fix test_reftests_with_caret.html to use SpecialPowers.spawn to adjust the parent frame, and re-enable in xorigin mode, r=emilio
Differential Revision: https://phabricator.services.mozilla.com/D117380
This commit is contained in:
Родитель
f5283149a6
Коммит
1dc3099144
|
@ -169,7 +169,6 @@ support-files = preserve3d_sorting_hit_testing_iframe.html
|
||||||
support-files = preserve3d_sorting_hit_testing2_iframe.html
|
support-files = preserve3d_sorting_hit_testing2_iframe.html
|
||||||
[test_reftests_with_caret.html]
|
[test_reftests_with_caret.html]
|
||||||
skip-if = toolkit == 'android' || tsan # android: Bug 1355842. tsan: Bug 1612707
|
skip-if = toolkit == 'android' || tsan # android: Bug 1355842. tsan: Bug 1612707
|
||||||
fail-if = xorigin
|
|
||||||
support-files =
|
support-files =
|
||||||
bug106855-1.html
|
bug106855-1.html
|
||||||
bug106855-2.html
|
bug106855-2.html
|
||||||
|
|
|
@ -97,9 +97,11 @@ function refTest(test,ref) {
|
||||||
};
|
};
|
||||||
|
|
||||||
var caretBlinkTime = null;
|
var caretBlinkTime = null;
|
||||||
function endTest() {
|
async function endTest() {
|
||||||
var parentDoc = window.parent.document;
|
await SpecialPowers.spawn(window.parent, [], () => {
|
||||||
parentDoc.styleSheets[parentDoc.styleSheets.length-1].deleteRule(0);
|
content.document.styleSheets[content.document.styleSheets.length-1].deleteRule(0);
|
||||||
|
});
|
||||||
|
|
||||||
// finish(), yet let the test actually end first, to be safe.
|
// finish(), yet let the test actually end first, to be safe.
|
||||||
SimpleTest.executeSoon(SimpleTest.finish);
|
SimpleTest.executeSoon(SimpleTest.finish);
|
||||||
}
|
}
|
||||||
|
@ -428,12 +430,13 @@ function nextTest() {
|
||||||
endTest();
|
endTest();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function runTests() {
|
async function runTests() {
|
||||||
try {
|
try {
|
||||||
if (window.parent) {
|
if (window.parent) {
|
||||||
var parentDoc = window.parent.document;
|
await SpecialPowers.spawn(window.parent, [], () => {
|
||||||
extraCSSRule = parentDoc.styleSheets[parentDoc.styleSheets.length-1]
|
content.document.styleSheets[content.document.styleSheets.length-1]
|
||||||
.insertRule("iframe#testframe{width:600px;height:400px}",0);
|
.insertRule("iframe#testframe{width:600px;height:400px}",0);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
caretBlinkTime = SpecialPowers.getIntPref("ui.caretBlinkTime");
|
caretBlinkTime = SpecialPowers.getIntPref("ui.caretBlinkTime");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче