Commit d969769c authored by Koji Ishii's avatar Koji Ishii Committed by Commit Bot

Fix invalid DCHECK for EmphasisMarkHeight

This patch fixes a case where |EmphasisMarkHeight| may return
zero. The same fix as r801476 crrev.com/c/2374918 but in a
different function.

Bug: 1124854
Change-Id: I987b91e4743a5856889d1e9ab5db6b020c1b373e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2395007
Auto-Submit: Koji Ishii <kojii@chromium.org>
Reviewed-by: default avatarYoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804694}
parent e29d3f9f
......@@ -338,7 +338,7 @@ base::Optional<PhysicalRect> NGInkOverflow::ComputeTextInkOverflow(
if (style.GetTextEmphasisMark() != TextEmphasisMark::kNone) {
LayoutUnit emphasis_mark_height =
LayoutUnit(font.EmphasisMarkHeight(style.TextEmphasisMarkString()));
DCHECK_GT(emphasis_mark_height, LayoutUnit());
DCHECK_GE(emphasis_mark_height, LayoutUnit());
if (style.GetTextEmphasisLineLogicalSide() == LineLogicalSide::kOver) {
ink_overflow.ShiftYEdgeTo(
std::min(ink_overflow.Y(), -emphasis_mark_height));
......
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