Changeset 245810 in webkit

Timestamp:

May 28, 2019, 7:48:57 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC[IFC] Ignore the initial strut's height when the line does not have any content.
​https://bugs.webkit.org/show_bug.cgi?id=198268
<rdar://problem/51150057>

Reviewed by Antti Koivisto.

The strut (​https://www.w3.org/TR/CSS22/visudet.html#leading) defines the initial logical height
for the line. This height should be ignored though when the line does not have any content.

• layout/inlineformatting/InlineFormattingContextLineLayout.cpp:

(WebCore::Layout::InlineFormattingContext::LineLayout::closeLine const):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-28  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC[IFC] Ignore the initial strut's height when the line does not have any content.
+        https://bugs.webkit.org/show_bug.cgi?id=198268
+        <rdar://problem/51150057>
+
+        Reviewed by Antti Koivisto.
+
+        The strut (https://www.w3.org/TR/CSS22/visudet.html#leading) defines the initial logical height
+        for the line. This height should be ignored though when the line does not have any content. 
+
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::LineLayout::closeLine const):
+
 2019-05-27  Antoine Quint  <graouts@apple.com>
 

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

@@ -471 +471 @@
     // 9.4.2 Inline formatting contexts
     // A line box is always tall enough for all of the boxes it contains.
-    auto lineBox = Display::Rect { line.logicalTop(), line.logicalLeft(), 0 , line.logicalHeight() };
+
+    // Ignore the initial strut.
+    auto lineBox = Display::Rect { line.logicalTop(), line.logicalLeft(), 0 , line.hasContent() ? line.logicalHeight() : LayoutUnit { } };
     // Create final display runs.
     for (unsigned index = 0; index < lineItems.size(); ++index) {