Skip to content

GitLab

T
tangled
Commit 166592a2 authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot
Browse files
Options

HTMLImageElement: Zoom should not affect 'width' and 'height' 

- Don't apply PixelSnappedWidth() and PixelSnappedHeight() as the
  sources
- Adjust LayoutUnit with zoom level, then round it.
- Apply testharness.js to images/zoomed-img-size.html
  This CL doesn't fix cases of 1% and 2%.  It's expected.

Bug: 1113987
Change-Id: Ib9cbd7c6beea2b5e7219eb87cfd32d6cc120595c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2465350
Auto-Submit: Kent Tamura <tkent@chromium.org>
Commit-Queue: Joey Arhar <jarhar@chromium.org>
Reviewed-by: default avatarJoey Arhar <jarhar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816225}
parent bfa75811
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 231 deletions
third_party/blink/renderer/core/html/html_image_element.cc
View file @ 166592a2
......@@ -553,15 +553,17 @@ unsigned HTMLImageElement::naturalHeight() const {
unsigned HTMLImageElement::LayoutBoxWidth() const {
LayoutBox* box = GetLayoutBox();
return box ? AdjustForAbsoluteZoom::AdjustInt(
box->PhysicalContentBoxRect().PixelSnappedWidth(), box)
return box ? AdjustForAbsoluteZoom::AdjustLayoutUnit(box->ContentWidth(),
*box)
.Round()
: 0;
}
unsigned HTMLImageElement::LayoutBoxHeight() const {
LayoutBox* box = GetLayoutBox();
return box ? AdjustForAbsoluteZoom::AdjustInt(
box->PhysicalContentBoxRect().PixelSnappedHeight(), box)
return box ? AdjustForAbsoluteZoom::AdjustLayoutUnit(box->ContentHeight(),
*box)
.Round()
: 0;
}
......
third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/images/zoomed-img-size-expected.txt
View file @ 166592a2
Ideally, all ovals below should be reported as having width=37, height=33. Currently rounding prevents us from doing this.
This is a testharness.js-based test.
FAIL Zoom 1% should not affect width/height of images. assert_equals: zoom: 1% expected 37 but got 67
PASS Zoom 2% should not affect width/height of images.
PASS Zoom 3% should not affect width/height of images.
PASS Zoom 4% should not affect width/height of images.
PASS Zoom 5% should not affect width/height of images.
PASS Zoom 30% should not affect width/height of images.
PASS Zoom 33% should not affect width/height of images.
PASS Zoom 50% should not affect width/height of images.
PASS Zoom 70% should not affect width/height of images.
PASS Zoom 100% should not affect width/height of images.
PASS Zoom 111% should not affect width/height of images.
PASS Zoom 150% should not affect width/height of images.
PASS Zoom 333% should not affect width/height of images.
PASS Zoom 400% should not affect width/height of images.
PASS Zoom 1234% should not affect width/height of images.
Harness: the test ran to completion.
Zoom 1% FAIL: 66x66 not close enough to 37x33
Zoom 2% FAIL: 33x33 not close enough to 37x33
Zoom 3% FAIL: 44x22 not close enough to 37x33
Zoom 4% FAIL: 33x33 not close enough to 37x33
Zoom 5% FAIL: 40x26 not close enough to 37x33
Zoom 30% FAIL: 37x33 not close enough to 37x33
Zoom 33% FAIL: 36x32 not close enough to 37x33
Zoom 50% FAIL: 37x33 not close enough to 37x33
Zoom 70% FAIL: 37x33 not close enough to 37x33
Zoom 100% PASS: 37x33
Zoom 111% PASS: 37x33
Zoom 150% PASS: 37x33
Zoom 333% PASS: 37x33
Zoom 400% PASS: 37x33
Zoom 1234% PASS: 37x33
third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/virtual/exotic-color-space/images/zoomed-img-size-expected.txt deleted 100644 → 0
View file @ bfa75811
Ideally, all ovals below should be reported as having width=37, height=33. Currently rounding prevents us from doing this.
Zoom 1% FAIL: 66x66 not close enough to 37x33
Zoom 2% FAIL: 33x33 not close enough to 37x33
Zoom 3% FAIL: 44x22 not close enough to 37x33
Zoom 4% FAIL: 33x33 not close enough to 37x33
Zoom 5% FAIL: 40x26 not close enough to 37x33
Zoom 30% FAIL: 37x33 not close enough to 37x33
Zoom 33% FAIL: 36x32 not close enough to 37x33
Zoom 50% FAIL: 37x33 not close enough to 37x33
Zoom 70% FAIL: 37x33 not close enough to 37x33
Zoom 100% PASS: 37x33
Zoom 111% PASS: 37x33
Zoom 150% PASS: 37x33
Zoom 333% PASS: 37x33
Zoom 400% PASS: 37x33
Zoom 1234% PASS: 37x33
third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/virtual/gpu-rasterization/images/zoomed-img-size-expected.txt deleted 100644 → 0
View file @ bfa75811
Ideally, all ovals below should be reported as having width=37, height=33. Currently rounding prevents us from doing this.
Zoom 1% FAIL: 66x66 not close enough to 37x33
Zoom 2% FAIL: 33x33 not close enough to 37x33
Zoom 3% FAIL: 44x22 not close enough to 37x33
Zoom 4% FAIL: 33x33 not close enough to 37x33
Zoom 5% FAIL: 40x26 not close enough to 37x33
Zoom 30% FAIL: 37x33 not close enough to 37x33
Zoom 33% FAIL: 36x32 not close enough to 37x33
Zoom 50% FAIL: 37x33 not close enough to 37x33
Zoom 70% FAIL: 37x33 not close enough to 37x33
Zoom 100% PASS: 37x33
Zoom 111% PASS: 37x33
Zoom 150% PASS: 37x33
Zoom 333% PASS: 37x33
Zoom 400% PASS: 37x33
Zoom 1234% PASS: 37x33
third_party/blink/web_tests/images/zoomed-img-size-expected.txt
View file @ 166592a2
Ideally, all ovals below should be reported as having width=37, height=33. Currently rounding prevents us from doing this.
This is a testharness.js-based test.
FAIL Zoom 1% should not affect width/height of images. assert_equals: zoom: 1% expected 37 but got 100
FAIL Zoom 2% should not affect width/height of images. assert_equals: zoom: 2% expected 37 but got 50
PASS Zoom 3% should not affect width/height of images.
PASS Zoom 4% should not affect width/height of images.
PASS Zoom 5% should not affect width/height of images.
PASS Zoom 30% should not affect width/height of images.
PASS Zoom 33% should not affect width/height of images.
PASS Zoom 50% should not affect width/height of images.
PASS Zoom 70% should not affect width/height of images.
PASS Zoom 100% should not affect width/height of images.
PASS Zoom 111% should not affect width/height of images.
PASS Zoom 150% should not affect width/height of images.
PASS Zoom 333% should not affect width/height of images.
PASS Zoom 400% should not affect width/height of images.
PASS Zoom 1234% should not affect width/height of images.
Harness: the test ran to completion.
Zoom 1% PASS: 100x100 close enough to 37x33
Zoom 2% PASS: 50x50 close enough to 37x33
Zoom 3% PASS: 33x33 close enough to 37x33
Zoom 4% PASS: 25x25 close enough to 37x33
Zoom 5% PASS: 40x40 close enough to 37x33
Zoom 30% PASS: 36x33 close enough to 37x33
Zoom 33% PASS: 36x33 close enough to 37x33
Zoom 50% PASS: 38x34 close enough to 37x33
Zoom 70% PASS: 37x32 close enough to 37x33
Zoom 100% PASS: 37x33
Zoom 111% PASS: 37x33
Zoom 150% PASS: 37x33
Zoom 333% PASS: 37x33
Zoom 400% PASS: 37x33
Zoom 1234% PASS: 37x33
third_party/blink/web_tests/images/zoomed-img-size.html
View file @ 166592a2
<!DOCTYPE html>
<html>
<head>
<script type="text/javascript">
if (window.testRunner)
testRunner.dumpAsText();
function update() {
// These arrays will become unnecessary if we fix the rounding issues that make us not always report "37x33".
var expectedWidths, expectedHeights;
expectedWidths = [100, 50, 33, 25, 40, 36, 36, 38, 37, 37, 37, 37, 37, 37, 37];
expectedHeights = [100, 50, 33, 25, 40, 33, 33, 34, 32, 33, 33, 33, 33, 33, 33];
for (i = 0; i < 15; ++i) {
var oval = document.getElementById('oval' + i);
var status = document.getElementById('status' + i);
var sizes = document.getElementById('sizes' + i);
if ((oval.width == expectedWidths[i]) && (oval.height == expectedHeights[i])) {
status.style.color = "green";
status.innerHTML = "PASS";
sizes.innerHTML = oval.width + "x" + oval.height + (((oval.width != 37) || (oval.height != 33)) ? " close enough to 37x33" : "");
} else {
status.style.color = "red";
status.innerHTML = "FAIL";
sizes.innerHTML = oval.width + "x" + oval.height + " not close enough to 37x33";
}
}
}
window.onload = update;
</script>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
</head>
<body>
<p>Ideally, all ovals below should be reported as having width=37, height=33. Currently rounding prevents us from doing this.</p>
<img id="oval0" src="resources/oval.png" style="zoom: 1%">
<p>Zoom 1% <span id="status0"></span>: <span id="sizes0"></span></p>
<img id="oval1" src="resources/oval.png" style="zoom: 2%">
<p>Zoom 2% <span id="status1"></span>: <span id="sizes1"></span></p>
<img id="oval2" src="resources/oval.png" style="zoom: 3%">
<p>Zoom 3% <span id="status2"></span>: <span id="sizes2"></span></p>
<img id="oval3" src="resources/oval.png" style="zoom: 4%">
<p>Zoom 4% <span id="status3"></span>: <span id="sizes3"></span></p>
<img id="oval4" src="resources/oval.png" style="zoom: 5%">
<p>Zoom 5% <span id="status4"></span>: <span id="sizes4"></span></p>
<img id="oval5" src="resources/oval.png" style="zoom: 30%">
<p>Zoom 30% <span id="status5"></span>: <span id="sizes5"></span></p>
<img id="oval6" src="resources/oval.png" style="zoom: 33%">
<p>Zoom 33% <span id="status6"></span>: <span id="sizes6"></span></p>
<img id="oval7" src="resources/oval.png" style="zoom: 50%">
<p>Zoom 50% <span id="status7"></span>: <span id="sizes7"></span></p>
<img id="oval8" src="resources/oval.png" style="zoom: 70%">
<p>Zoom 70% <span id="status8"></span>: <span id="sizes8"></span></p>
<img id="oval9" src="resources/oval.png" style="zoom: 100%">
<p>Zoom 100% <span id="status9"></span>: <span id="sizes9"></span></p>
<img id="oval10" src="resources/oval.png" style="zoom: 111%">
<p>Zoom 111% <span id="status10"></span>: <span id="sizes10"></span></p>
<img id="oval11" src="resources/oval.png" style="zoom: 150%">
<p>Zoom 150% <span id="status11"></span>: <span id="sizes11"></span></p>
<img id="oval12" src="resources/oval.png" style="zoom: 333%">
<p>Zoom 333% <span id="status12"></span>: <span id="sizes12"></span></p>
<img id="oval13" src="resources/oval.png" style="zoom: 400%">
<p>Zoom 400% <span id="status13"></span>: <span id="sizes13"></span></p>
<img id="oval14" src="resources/oval.png" style="zoom: 1234%">
<p>Zoom 1234% <span id="status14"></span>: <span id="sizes14"></span></p>
<script>
const EXPECTED_WIDTH = 37;
const EXPECTED_HEIGHT = 33;
for (i = 0; i < 15; ++i) {
const oval = document.getElementById('oval' + i);
const testDesc = `Zoom ${oval.style.zoom} should not affect width/height of images.`;
const testBody = () => {
assert_equals(oval.width, EXPECTED_WIDTH, oval.getAttribute('style'));
assert_equals(oval.height, EXPECTED_HEIGHT, oval.getAttribute('style'));
};
if (oval.complete) {
test(testBody, testDesc);
} else {
async_test(t => {
oval.onload = t.step_func_done(testBody);
}, testDesc);
}
}
</script>
</body>
</html>
third_party/blink/web_tests/virtual/exotic-color-space/images/zoomed-img-size-expected.txt deleted 100644 → 0
View file @ bfa75811
Ideally, all ovals below should be reported as having width=37, height=33. Currently rounding prevents us from doing this.
Zoom 1% PASS: 100x100 close enough to 37x33
Zoom 2% PASS: 50x50 close enough to 37x33
Zoom 3% PASS: 33x33 close enough to 37x33
Zoom 4% PASS: 25x25 close enough to 37x33
Zoom 5% PASS: 40x40 close enough to 37x33
Zoom 30% PASS: 36x33 close enough to 37x33
Zoom 33% PASS: 36x33 close enough to 37x33
Zoom 50% PASS: 38x34 close enough to 37x33
Zoom 70% PASS: 37x32 close enough to 37x33
Zoom 100% PASS: 37x33
Zoom 111% PASS: 37x33
Zoom 150% PASS: 37x33
Zoom 333% PASS: 37x33
Zoom 400% PASS: 37x33
Zoom 1234% PASS: 37x33
third_party/blink/web_tests/virtual/gpu-rasterization/images/zoomed-img-size-expected.txt deleted 100644 → 0
View file @ bfa75811
Ideally, all ovals below should be reported as having width=37, height=33. Currently rounding prevents us from doing this.
Zoom 1% PASS: 100x100 close enough to 37x33
Zoom 2% PASS: 50x50 close enough to 37x33
Zoom 3% PASS: 33x33 close enough to 37x33
Zoom 4% PASS: 25x25 close enough to 37x33
Zoom 5% PASS: 40x40 close enough to 37x33
Zoom 30% PASS: 36x33 close enough to 37x33
Zoom 33% PASS: 36x33 close enough to 37x33
Zoom 50% PASS: 38x34 close enough to 37x33
Zoom 70% PASS: 37x32 close enough to 37x33
Zoom 100% PASS: 37x33
Zoom 111% PASS: 37x33
Zoom 150% PASS: 37x33
Zoom 333% PASS: 37x33
Zoom 400% PASS: 37x33
Zoom 1234% PASS: 37x33
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment