Skip to content

merge_pr_49
Compare
Choose a tag to compare
@github-actions github-actions released this 28 Nov 05:30
merge_pr_49
38526f6

Revert "[LayoutNG] Fix hyphens when rewinding occurs"

This reverts commit 957329b6eeba01be943a4991c8bd082a87ac1417.

Reason for revert: r708894 fixed the case where hyphens are
not rendered under certain conditions, but caused the
infinite rewind loop in |NGLineBreaker| when there are
negative margins on inline boxes.

This patch reverts the fix. I will work on the new fix for
the issue 1015297 after this revert.

Original change's description:

[LayoutNG] Fix hyphens when rewinding occurs

This patch removes |NGLineInfo::LineEndFragment|, which was
introduced to support hyphens and ellipsis with the single
code. However, ellipsis was changed to use different code,
and |LineEndFragment| ended up with non-optimal way to handle
hyphens.

Although hyphens appear at most once in a line, storing this
to |NGLineInfo| makes harder to keep it in sync with the
hyphenated item. This patch changes it to a field in
|NGInlineItemResult|.

Bug: 1015297
Change-Id: I0706cf54bebfa967661dc40123c6dfd5887ff59c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1868534
Commit-Queue: Koji Ishii kojii@chromium.org
Reviewed-by: Ian Kilpatrick ikilpatrick@chromium.org
Cr-Commit-Position: refs/heads/master@{#708894}

TBR=kojii@chromium.org,ikilpatrick@chromium.org

Bug: 1015297, 1028817
Change-Id: I5f116288b935f3fd296f4c25c1bf0457779a8e84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1940323
Reviewed-by: Ian Kilpatrick ikilpatrick@chromium.org
Reviewed-by: Koji Ishii kojii@chromium.org
Commit-Queue: Koji Ishii kojii@chromium.org
Cr-Commit-Position: refs/heads/master@{#719869}

Assets 5