Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 04:41:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1910600 - Minor clean-ups to test_img_picture_preload.html. r=smaug

Browse Source 
This doesn't change behavior, but I wrote them while debugging my patch
for bug 1076583. We no longer have the picture prefs and so on, and this
made it reasoning about it slightly easier.

Differential Revision: https://phabricator.services.mozilla.com/D218062
This commit is contained in:
Emilio Cobos Álvarez 2024-07-30 21:22:15 +00:00
parent 2de17a63fc
commit 19632d62f6
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser/htmlparser/tests/mochitest/file_img_picture_preload.html
View File

@ -11,7 +11,7 @@
<title>Test for Bug 1067345</title>
</head>
<body onload="afterLoad();">
<script type="text/javascript">
<script>
var is = window.parent.is;
var ok = window.parent.ok;
var SimpleTest = window.parent.SimpleTest;
@ -121,7 +121,7 @@
srcset="./file_img_picture_preload.sjs?img11:source1 10w, ./file_img_picture_preload.sjs?img11:source2 20w"
src="./file_img_picture_preload.sjs?img11:source3">
<script type="text/javascript">
<script>
function afterLoad() {
// All images should have picked a source of the format
// imgName:sourceName, ensure we have one source per image and

57
parser/htmlparser/tests/mochitest/test_img_picture_preload.html
View File

@ -6,7 +6,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1067345
<head>
<title>Test for Bug 1067345</title>
<script src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
</head>
<body>
<script>
@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1067345
SimpleTest.waitForExplicitFinish();
var testDPIs = [ "1.0", "0.5", "2.0", "1.5" ];
var testDPIs = ["1.0", "0.5", "2.0", "1.5"];
var iframe = document.createElement("iframe");
// These accessed by child frame
@ -23,13 +23,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1067345
document.body.appendChild(iframe);
SpecialPowers.pushPrefEnv({"set": [ [ "dom.image.srcset.enabled", true ],
[ "dom.image.picture.enabled", true ]] },
function() {
// Reset the sjs helper so repeat runs work
resetRequests();
setTimeout(nextTest, 0);
});
// Reset the sjs helper so repeat runs work
resetRequests();
setTimeout(nextTest, 0);
function resetRequests() {
// Ask the SJS to reset requests
@ -57,32 +53,29 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1067345
function nextTest() {
// Re-run test for each DPI level
if (testDPIs.length) {
currentDPI = testDPIs.pop();
info("Starting test for DPI: " + currentDPI);
// To avoid spurious image loads being reported when the resolution changes,
// load an intermediate iframe.
iframe.src = "about:blank";
iframe.addEventListener("load", function() {
SpecialPowers.pushPrefEnv({"set": [ [ "layout.css.devPixelsPerPx", currentDPI ]] },
function() {
// Make sure we trigger a layout flush so that the frame is sized
// appropriately after the DPI changes.
iframe.getBoundingClientRect();
// Clear image cache for next run (we don't try to validate cached items
// in preload).
SpecialPowers.Cc["@mozilla.org/image/tools;1"]
.getService(SpecialPowers.Ci.imgITools)
.getImgCacheForDocument(iframe.contentDocument)
.clearCache(false);
iframe.src = "./file_img_picture_preload.html?" + currentDPI;
});
}, {once: true});
} else {
if (!testDPIs.length) {
SimpleTest.finish();
return;
}
currentDPI = testDPIs.pop();
info("Starting test for DPI: " + currentDPI);
// To avoid spurious image loads being reported when the resolution changes,
// load an intermediate iframe.
iframe.src = "about:blank";
iframe.addEventListener("load", async function() {
await SpecialPowers.pushPrefEnv({"set": [ [ "layout.css.devPixelsPerPx", currentDPI ]] });
// Make sure we trigger a layout flush so that the frame is sized
// appropriately after the DPI changes.
iframe.getBoundingClientRect();
// Clear image cache for next run (we don't try to validate cached items
// in preload).
SpecialPowers.Cc["@mozilla.org/image/tools;1"]
.getService(SpecialPowers.Ci.imgITools)
.getImgCacheForDocument(iframe.contentDocument)
.clearCache(false);
iframe.src = "./file_img_picture_preload.html?" + currentDPI;
}, {once: true});
}
</script>
</body>
</html>