Attachment 370655 Details for Bug 198260 – Patch

[patch] Patch

bug-198260-20190526121739.patch (text/plain), 2.09 KB, created by zalan on 2019-05-26 12:17:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-05-26 12:17:42 PDT

Size: 2.09 KB

patch

obsolete

>Subversion Revision: 245776
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 46c9f03c8fcba8f6ab4ed91096d67fe8b91c2f62..771b5b983da07d89bef506a37e13b0cd8c604db3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-05-26  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][IFC] Ignore collapsed runs when setting the width on the associated display boxes.
>+        https://bugs.webkit.org/show_bug.cgi?id=198260
>+        <rdar://problem/51145704>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Collapsed runs don't contribute to the logical width of their containers.
>+
>+        Covered by existing tests.
>+
>+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
>+        (WebCore::Layout::InlineFormattingContext::LineLayout::closeLine const):
>+
> 2019-05-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Move intrinsic width computation from InlineFormattingContext to LineLayout
>diff --git a/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp b/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp
>index 2689631bc8532ae0b84c53d65b013e64462a8f80..5b0125557b6194e3615f0afbb6510f1b110fd7db 100644
>--- a/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp
>+++ b/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp
>@@ -574,9 +574,9 @@ void InlineFormattingContext::LineLayout::closeLine(Line& line) const
>         if (firstInlineRunForLayoutBox) {
>             // Setup display box for the associated layout box.
>             displayBox.setTopLeft(inlineRun.logicalTopLeft());
>-            displayBox.setContentBoxWidth(inlineRun.logicalWidth());
>+            displayBox.setContentBoxWidth(lineItem->isCollapsed ? LayoutUnit() : inlineRun.logicalWidth());
>             displayBox.setContentBoxHeight(inlineRun.logicalHeight());
>-        } else {
>+        } else if (!lineItem->isCollapsed) {
>             // FIXME fix it for multirun/multiline.
>             displayBox.setContentBoxWidth(displayBox.contentBoxWidth() + inlineRun.logicalWidth());
>         }

Actions: View | Formatted Diff | Diff

Attachments on bug 198260: 370655