Issue #1620 - Use Intrinsic Aspect Ratio for Images

https://bugzilla.mozilla.org/show_bug.cgi?id=1547231
https://bugzilla.mozilla.org/show_bug.cgi?id=1559094
https://bugzilla.mozilla.org/show_bug.cgi?id=1633434
https://bugzilla.mozilla.org/show_bug.cgi?id=1565690
https://bugzilla.mozilla.org/show_bug.cgi?id=1602047

Make use of Aspect Ratios in Image frames before Images are loaded.
- Check for width and height HTML properties and create a ratio with them.
- Overwrite HTML size values with actual image dimensions on load.
- Collapse any frames with srcless images.

Comments:
dom/html/nsGenericHTMLElement.cpp:1483
layout/generic/nsImageFrame.cpp:289
This commit is contained in:
Andy 2020-08-04 13:54:01 -07:00 committed by Roy Tam
commit be1f68f39e
17 changed files with 381 additions and 143 deletions

View file

@ -0,0 +1,21 @@
<!doctype html>
<title>CSS Test Reference</title>
<style>
body { margin: 0 }
.first {
width: 100px;
height: 50px;
background: lime;
}
.space {
height: 50px;
}
.second {
width: 100px;
height: 100px;
background: lime;
}
</style>
<div class="first"></div>
<div class="space"></div>
<div class="second"></div>

View file

@ -0,0 +1,38 @@
<!DOCTYPE html>
<title>CSS Test: background-size: cover with zero-sized background positioning area.</title>
<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#valdef-background-size-cover">
<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/4049">
<link rel="help" href=" https://bugzilla.mozilla.org/show_bug.cgi?id=1559094">
<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
<link rel="author" href="https://mozilla.org" title="Mozilla">
<link rel="match" href="background-size-cover-003-ref.html">
<style>
body { margin: 0 }
div {
background-size: cover;
background-repeat: no-repeat;
background-position: top left;
background-origin: content-box;
background-image: url(/images/green-100x50.png);
}
#test1 {
height: 0;
width: 100px;
padding-bottom: 100px;
}
#test2 {
height: 100px;
width: 0;
padding-right: 100px;
}
#test3 {
height: 0;
width: 0;
padding-right: 100px;
padding-bottom: 100px;
}
</style>
<div id="test1"></div>
<div id="test2"></div>
<div id="test3"></div>

View file

@ -0,0 +1,60 @@
<!doctype html>
<title>Image width and height attributes are used to infer aspect-ratio</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
img {
width: 100%;
max-width: 100px;
height: auto;
}
</style>
<img src="/images/green.png">
<img src="/images/green.png" width=100 height=125>
<img src="" width=100 height=125>
<img src="error.png" width=100 height=125>
<img src="error.png">
<script>
let t = async_test("Image width and height attributes are used to infer aspect-ratio");
function assert_ratio(img, expected) {
let epsilon = 0.001;
assert_approx_equals(parseFloat(getComputedStyle(img).width, 10) / parseFloat(getComputedStyle(img).height, 10), expected, epsilon);
}
// Create and append a new image and immediately check the ratio.
// This is not racy because the spec requires the user agent to queue a task:
// https://html.spec.whatwg.org/multipage/images.html#updating-the-image-data
t.step(function() {
var img = new Image();
img.width = 250;
img.height = 100;
img.src = "/images/blue.png";
document.body.appendChild(img);
assert_ratio(img, 2.5);
img = new Image();
img.setAttribute("width", "0.8");
img.setAttribute("height", "0.2");
img.src = "/images/blue.png";
document.body.appendChild(img);
// Decimals are apparently ignored?
assert_equals(getComputedStyle(img).height, "0px");
img = new Image();
img.setAttribute("width", "50%");
img.setAttribute("height", "25%");
img.src = "/images/blue.png";
document.body.appendChild(img);
// Percentages should be ignored.
assert_equals(getComputedStyle(img).height, "0px");
});
onload = t.step_func_done(function() {
let images = document.querySelectorAll("img");
assert_ratio(images[0], 2.0); // Loaded image's aspect ratio, at least by default, overrides width / height ratio.
assert_ratio(images[1], 2.0); // 2.0 is the original aspect ratio of green.png
assert_equals(getComputedStyle(images[2]).height, "0px"); // aspect-ratio doesn't override intrinsic size of images that don't have any src.
assert_equals(getComputedStyle(images[3]).height, "125px"); // what intrinsic size?
assert_equals(getComputedStyle(images[4]).height, "100px"); // what aspect ratio?
assert_ratio(images[5], 133/106); // The original aspect ratio of blue.png
});
</script>