Changeset 288015 in webkit

Timestamp:

Jan 14, 2022, 5:40:15 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Incorrect root inline box position when non-empty atomic inline level child box has height: 0px
​https://bugs.webkit.org/show_bug.cgi?id=235218
<rdar://84617690>

Reviewed by Antti Koivisto.

Source/WebCore:

Even if the atomic inline level box itself does not stetch the line box, it may still affect the root inline box position
through baseline "syncing" (This is mostly the case with 0 tall boxes as (non-empty) atomic inline boxes in general stretch the line box).

Test: fast/block/line-layout/non-empty-inline-block-with-zero-height.html

• layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp:

(WebCore::Layout::LineBoxVerticalAligner::computeRootInlineBoxVerticalPosition const):

LayoutTests:

• fast/block/line-layout/non-empty-inline-block-with-zero-height-expected.html: Added.
• fast/block/line-layout/non-empty-inline-block-with-zero-height.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/line-layout/non-empty-inline-block-with-zero-height-expected.html (added)
• LayoutTests/fast/block/line-layout/non-empty-inline-block-with-zero-height.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-01-14  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Incorrect root inline box position when non-empty atomic inline level child box has height: 0px
+        https://bugs.webkit.org/show_bug.cgi?id=235218
+        <rdar://84617690>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/block/line-layout/non-empty-inline-block-with-zero-height-expected.html: Added.
+        * fast/block/line-layout/non-empty-inline-block-with-zero-height.html: Added.
+
 2022-01-14  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-14  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Incorrect root inline box position when non-empty atomic inline level child box has height: 0px
+        https://bugs.webkit.org/show_bug.cgi?id=235218
+        <rdar://84617690>
+
+        Reviewed by Antti Koivisto.
+
+        Even if the atomic inline level box itself does not stetch the line box, it may still affect the root inline box position
+        through baseline "syncing" (This is mostly the case with 0 tall boxes as (non-empty) atomic inline boxes in general stretch the line box).
+
+        Test: fast/block/line-layout/non-empty-inline-block-with-zero-height.html
+
+        * layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp:
+        (WebCore::Layout::LineBoxVerticalAligner::computeRootInlineBoxVerticalPosition const):
+
 2022-01-14  Chris Lord  <clord@igalia.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBoxVerticalAligner.cpp

@@ -290 +290 @@
         }
         inlineLevelBoxAbsoluteBaselineOffsetMap.add(&inlineLevelBox, absoluteBaselineOffset);
-        auto affectsRootInlineBoxVerticalPosition = formattingGeometry.inlineLevelBoxAffectsLineBox(inlineLevelBox, lineBox);
+
+        auto inlineLevelBoxStrechesLineBox = formattingGeometry.inlineLevelBoxAffectsLineBox(inlineLevelBox, lineBox);
+        auto affectsRootInlineBoxVerticalPosition = inlineLevelBoxStrechesLineBox || (inlineLevelBox.isAtomicInlineLevelBox() && inlineLevelBox.baseline());
         if (affectsRootInlineBoxVerticalPosition) {
             auto topOffsetFromRootInlineBoxBaseline = absoluteBaselineOffset + inlineLevelBox.layoutBounds().ascent;