Skip to content

Commit

Permalink
Bug 1644863 - fix trailing whitespace in cross-tree tests, r=emilio,m…
Browse files Browse the repository at this point in the history
…arionette-reviewers,whimboo

Differential Revision: https://phabricator.services.mozilla.com/D79202
  • Loading branch information
gijsk committed Jun 17, 2020
1 parent dbd0ef4 commit 32b936a
Show file tree
Hide file tree
Showing 81 changed files with 431 additions and 431 deletions.
4 changes: 2 additions & 2 deletions caps/tests/mochitest/test_bug423375.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
-->
<head>
<title>Test for Bug 423375</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=423375">Mozilla Bug 423375</a>
<p id="display"></p>
<div id="content" style="display: none">
<iframe id="load-frame"></iframe>
<iframe id="load-frame"></iframe>
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
Expand Down
32 changes: 16 additions & 16 deletions dom/bindings/crashtests/1010658-1.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<script>
function boom()
{
window.__proto__ = null;
for (var i = 0; i < 10000; ++i) {
self.document;
}
}

</script></head>

<body onload="boom();"></body>
</html>
<!DOCTYPE html>
<html>
<head>
<script>
function boom()
{
window.__proto__ = null;
for (var i = 0; i < 10000; ++i) {
self.document;
}
}

</script></head>

<body onload="boom();"></body>
</html>
32 changes: 16 additions & 16 deletions dom/bindings/crashtests/1010658-2.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<script>
function boom()
{
window.__proto__ = function(){};
for (var i = 0; i < 10000; ++i) {
self.document;
}
}

</script></head>

<body onload="boom();"></body>
</html>
<!DOCTYPE html>
<html>
<head>
<script>
function boom()
{
window.__proto__ = function(){};
for (var i = 0; i < 10000; ++i) {
self.document;
}
}

</script></head>

<body onload="boom();"></body>
</html>
2 changes: 1 addition & 1 deletion dom/bindings/test/test_bug560072.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=560072">Mozilla Bug 560072</a>
<p id="display"></p>
<div id="content" style="display: none">

</div>
<pre id="test">
<script type="application/javascript">
Expand Down
2 changes: 1 addition & 1 deletion dom/bindings/test/test_bug759621.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=759621">Mozilla Bug 759621</a>
<p id="display"></p>
<div id="content" style="display: none">

</div>
<pre id="test">
<script type="application/javascript">
Expand Down
2 changes: 1 addition & 1 deletion dom/bindings/test/test_interfaceToString.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=742156">Mozilla Bug 742156</a>
<p id="display"></p>
<div id="content" style="display: none">

</div>
<pre id="test">
<script type="application/javascript">
Expand Down
2 changes: 1 addition & 1 deletion dom/bindings/test/test_lookupGetter.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=462428">Mozilla Bug 462428</a>
<p id="display"></p>
<div id="content" style="display: none">

</div>
<pre id="test">
<script type="application/javascript">
Expand Down
2 changes: 1 addition & 1 deletion dom/bindings/test/test_traceProtos.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=744772">Mozilla Bug 744772</a>
<p id="display"></p>
<div id="content" style="display: none">

</div>
<pre id="test">
<script type="application/javascript">
Expand Down
2 changes: 1 addition & 1 deletion dom/bindings/test/test_treat_non_object_as_null.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

var onvolumechange;
var x = {};

(function() {
onvolumechange = x;
is(onvolumechange, x,
Expand Down
18 changes: 9 additions & 9 deletions dom/ipc/test.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
y.addEventListener("MozAfterPaint", handleMozAfterPaint, true);
y.addEventListener("MozScrolledAreaChanged", handleMozScrolledAreaChanged, true);
}

function loadURL(url) {
document.getElementById('page').setAttribute('src', url);
}
Expand All @@ -77,7 +77,7 @@
function openWindow() {
window.open('chrome://global/content/test-ipc.xhtml', '_blank', 'chrome,resizable,width=800,height=800');
}

function closeWindow() {
window.close();
}
Expand All @@ -96,32 +96,32 @@
alert("Should have two child processes!");
}
var childprocessmm = ppm.getChildAt(1); // 0 is the in-process child process mm

childprocessmm.addMessageListener("ppm-sync",
function(m) {
if (m.target != childprocessmm) alert("Wrong target!");
document.getElementById("messageLog").value += "[SYNC1 PPM]";
document.getElementById("messageLog").value += "[SYNC1 PPM]";
}
);

ppm.addMessageListener("ppm-sync",
function(m) {
// Check that global process message manager gets the per-process mm as target.
if (m.target != childprocessmm) alert("Wrong target!");
document.getElementById("messageLog").value += "[SYNC2 PPM]";
document.getElementById("messageLog").value += "[SYNC2 PPM]";
}
);
childprocessmm.addMessageListener("ppm-async",
function(m) {
if (m.target != childprocessmm) alert("Wrong target!");
document.getElementById("messageLog").value += "[ASYNC1 PPM]";
document.getElementById("messageLog").value += "[ASYNC1 PPM]";
}
);
ppm.addMessageListener("ppm-async",
function(m) {
// Check that global process message manager gets the per-process mm as target.
if (m.target != childprocessmm) alert("Wrong target!");
document.getElementById("messageLog").value += "[ASYNC2 PPM]";
document.getElementById("messageLog").value += "[ASYNC2 PPM]";
}
);
messageManager.loadFrameScript("chrome://global/content/remote-test-ipc.js", true);
Expand All @@ -130,7 +130,7 @@
// 2. Test that adding message listener works, and that receiving a sync message works.
messageManager.addMessageListener("linkclick",
function(m) {
// This checks that json sending works in sync messages.
// This checks that json sending works in sync messages.
document.getElementById("messageLog").value = m.name + ": " + m.json.href;
return { message: "linkclick-received" };
});
Expand Down
2 changes: 1 addition & 1 deletion dom/serviceworkers/test/browser_cached_force_refresh.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}

addEventListener('load', function(event) {
if (!navigator.serviceWorker.controller) {
if (!navigator.serviceWorker.controller) {
return fail(window.location.href + ' is not controlled!');
}

Expand Down
2 changes: 1 addition & 1 deletion dom/serviceworkers/test/test_force_refresh.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<pre id="test"></pre>
<script class="testbody" type="text/javascript">
/**
*
*
*/
let iframe;
let registration;
Expand Down
2 changes: 1 addition & 1 deletion dom/serviceworkers/test/test_serviceworkermanager.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

SimpleTest.finish();
})();
});
});
}

]]>
Expand Down
28 changes: 14 additions & 14 deletions dom/vr/test/crashtests/enumerate_vr_on_dying_window.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<html>
<head>
<script>
window.onload = function(){
var frame = document.getElementById('test_iframe');
var win = frame.contentWindow;
frame.remove();
win.onvrdisplayactivate = function () {}
};
</script></head>
<body>
<iframe id="test_iframe"></iframe>
</body>
</html>
<html>
<head>
<script>
window.onload = function(){
var frame = document.getElementById('test_iframe');
var win = frame.contentWindow;
frame.remove();
win.onvrdisplayactivate = function () {}
};
</script></head>
<body>
<iframe id="test_iframe"></iframe>
</body>
</html>
100 changes: 50 additions & 50 deletions dom/vr/test/mochitest/test_vrDisplay_exitPresent.html
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
<!DOCTYPE html>
<html>
<head>
<title>VRDisplay ExitPresent</title>
<meta name="timeout" content="long"/>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="VRSimulationDriver.js"></script>
<script src="runVRTest.js"></script>
</head>
<body>
<script>
function testExitPresentOnOtherIframe(content) {
return content.navigator.getVRDisplays().then((displays) => {
content.vrDisplay = displays[0];
return content.vrDisplay.exitPresent();
});
}
var initVRPresentation = function(content) {
return VRSimulationDriver.AttachWebVRDisplay().then(() => {
return content.navigator.getVRDisplays().then((displays) => {
content.vrDisplay = displays[0];
content.canvas = content.document.createElement("canvas");
content.canvas.id = "vrCanvas";
return content.vrDisplay.requestPresent([{source:content.canvas}]);
});
});
}
function startTest() {
var ifr1 = document.getElementById("iframe1");
var ifr2 = document.getElementById("iframe2");
var frame1 = ifr1.contentWindow;
var frame2 = ifr2.contentWindow;
promise_test((test) => {
return VRSimulationDriver.AttachWebVRDisplay().then(() => {
return initVRPresentation(frame1).then(() => {
promise_test((test) => {
return promise_rejects(test, null, testExitPresentOnOtherIframe(frame2));
}, "We cannot exit VR presentation established by another content, this promise is expected to be rejected.")
});
});
}, "Finish running WebVR exitPresent test.");
}
runVRTest(startTest);
</script>

<iframe id="iframe1"></iframe>
<iframe id="iframe2"></iframe>
</body>
<!DOCTYPE html>
<html>
<head>
<title>VRDisplay ExitPresent</title>
<meta name="timeout" content="long"/>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="VRSimulationDriver.js"></script>
<script src="runVRTest.js"></script>
</head>
<body>
<script>
function testExitPresentOnOtherIframe(content) {
return content.navigator.getVRDisplays().then((displays) => {
content.vrDisplay = displays[0];
return content.vrDisplay.exitPresent();
});
}
var initVRPresentation = function(content) {
return VRSimulationDriver.AttachWebVRDisplay().then(() => {
return content.navigator.getVRDisplays().then((displays) => {
content.vrDisplay = displays[0];
content.canvas = content.document.createElement("canvas");
content.canvas.id = "vrCanvas";
return content.vrDisplay.requestPresent([{source:content.canvas}]);
});
});
}
function startTest() {
var ifr1 = document.getElementById("iframe1");
var ifr2 = document.getElementById("iframe2");
var frame1 = ifr1.contentWindow;
var frame2 = ifr2.contentWindow;
promise_test((test) => {
return VRSimulationDriver.AttachWebVRDisplay().then(() => {
return initVRPresentation(frame1).then(() => {
promise_test((test) => {
return promise_rejects(test, null, testExitPresentOnOtherIframe(frame2));
}, "We cannot exit VR presentation established by another content, this promise is expected to be rejected.")
});
});
}, "Finish running WebVR exitPresent test.");
}
runVRTest(startTest);
</script>

<iframe id="iframe1"></iframe>
<iframe id="iframe2"></iframe>
</body>
</html>
Loading

0 comments on commit 32b936a

Please sign in to comment.