Changeset 266995 in webkit

Timestamp:

Sep 13, 2020 9:19:09 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Text run is at incorrect vertical position when parent inline box is stretched
​https://bugs.webkit.org/show_bug.cgi?id=216453

Reviewed by Antti Koivisto.

Text runs don't necessarily start at the top of the parent inline box. When the inline box is
stretched by some other content (nested inline box or atomic inline-level box) the run is pushed down.
This patch computes the correct vertical position by using the inline box's baseline (text always sits on the baseline).

• layout/inlineformatting/InlineLineBox.cpp:

(WebCore::Layout::LineBox::logicalRectForTextRun const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineLineBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-13  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Text run is at incorrect vertical position when parent inline box is stretched
+        https://bugs.webkit.org/show_bug.cgi?id=216453
+
+        Reviewed by Antti Koivisto.
+
+        Text runs don't necessarily start at the top of the parent inline box. When the inline box is
+        stretched by some other content (nested inline box or atomic inline-level box) the run is pushed down.
+        This patch computes the correct vertical position by using the inline box's baseline (text always sits on the baseline).
+
+        * layout/inlineformatting/InlineLineBox.cpp:
+        (WebCore::Layout::LineBox::logicalRectForTextRun const):
+
 2020-09-13  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineLineBox.cpp

@@ -148 +148 @@
     ASSERT(run.isText() || run.isLineBreak());
     auto& parentInlineBox = inlineBoxForLayoutBox(run.layoutBox().parent());
-    auto inlineBoxRect = parentInlineBox.logicalRect();
-    return { inlineBoxRect.top(), m_horizontalAlignmentOffset.valueOr(InlineLayoutUnit { }) + run.logicalLeft(), run.logicalWidth(), inlineBoxRect.height() };
+    auto& fontMetrics = parentInlineBox.fontMetrics();
+    auto runlogicalTop = parentInlineBox.logicalTop() + parentInlineBox.baseline() - fontMetrics.ascent();
+    InlineLayoutUnit logicalHeight = fontMetrics.height();
+    return { runlogicalTop, m_horizontalAlignmentOffset.valueOr(InlineLayoutUnit { }) + run.logicalLeft(), run.logicalWidth(), logicalHeight };
 }