Bug 1605432 [wpt PR 20892] - Revert LayoutInline::CollectLineBoxRects, a=testonly

Automatic update from web-platform-tests
Revert LayoutInline::CollectLineBoxRects

This patch reverts |LayoutInline::CollectLineBoxRects| not to
use |NGInlineCursor|, by manually merging parts of r706815
<crrev.com/c/1862534> and r710694 <crrev.com/c/1888624>.

|NGInlineCursor| is rapidly changing that reverting is not
easy. This patch reverts not to use it for |getClientRects|
and a few other callers.

Testing more on culled inline box indicates that the phase 1
of LayoutNG regressed some cases from legacy, and
|NGInlineCursor| work regressed further. We might want to fix
when NGFragmentItem ships, but better not to change the
behavior until then.

Bug: 1036358
Change-Id: I47a60f5d3a505d4b43eba0d8b5adc64e02cbcd28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1971632
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728433}

--

wpt-commits: 280816c7465a6593f06f9f5651a70eb857f9f774
wpt-pr: 20892
This commit is contained in:
Koji Ishii 2020-01-06 16:11:25 +00:00 committed by moz-wptsync-bot
parent 0b34676bf2
commit c0c3159a7a

View File

@ -0,0 +1,52 @@
<!DOCTYPE html>
<link rel="help" href="https://drafts.csswg.org/cssom-view-1/#dom-element-getclientrects">
<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<body>
<div>
<span>test</span>
<span id="vertical-align-sub-as-grand-child"
title="sub element in a child inline box should not be included">
<span>
<sub class="not-include" style="vertical-align: sub">subscript</sub>
</span>
</span>
<span>test</span>
</div>
<script>
testTargetDoesNotInclude('vertical-align-sub-as-grand-child');
function testTargetDoesNotInclude(target) {
target = document.getElementById(target);
test(() => {
let target_rects = target.getClientRects();
let not_include_rects = [];
for (let element of target.querySelectorAll('.not-include')) {
for (let rect of element.getClientRects())
not_include_rects.push(rect);
}
for (let rect of target_rects) {
for (let not_include_rect of not_include_rects) {
assert_rect_not_equals(rect, not_include_rect);
}
}
}, target.title);
}
function assert_rect_not_equals(rect1, rect2) {
assert_false(rectEquals(rect1, rect2),
`${rectToString(rect1)} and ${rectToString(rect2)} are not equal`);
}
function rectEquals(rect1, rect2) {
return rect1.x === rect2.x && rect1.y === rect2.y &&
rect1.width === rect2.width && rect1.height === rect2.height;
}
function rectToString(rect) {
return `{${rect.x}, ${rect.y} ${rect.width}x${rect.height}}`;
}
</script>
</body>