Attachment 370665 Details for Bug 198268 – Patch

[patch] Patch

bug-198268-20190526214020.patch (text/plain), 2.20 KB, created by zalan on 2019-05-26 21:40:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-05-26 21:40:23 PDT

Size: 2.20 KB

patch

obsolete

>Subversion Revision: 245776
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 771b5b983da07d89bef506a37e13b0cd8c604db3..f9d054cdb868d07ba3584eb27cd4cd0c0aedc4fd 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-26  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 NOBODY (OOPS!).
>+
>+        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-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Ignore collapsed runs when setting the width on the associated display boxes.
>diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp b/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp
>index 5b0125557b6194e3615f0afbb6510f1b110fd7db..acb29a3c7e0c024f5581a782433f07013b25c5c0 100644
>--- a/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp
>+++ b/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp
>@@ -501,7 +501,9 @@ void InlineFormattingContext::LineLayout::closeLine(Line& line) const
>     Optional<unsigned> previousLineLastRunIndex = inlineDisplayRuns.isEmpty() ? Optional<unsigned>() : inlineDisplayRuns.size() - 1;
>     // 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) {
>         auto& lineItem = lineItems.at(index);

Actions: View | Formatted Diff | Diff

Attachments on bug 198268: 370665