Attachment 356128 Details for Bug 192215 – Patch

[patch] Patch

Patch.txt (text/plain), 2.23 KB, created by zalan on 2018-11-29 21:36:25 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-11-29 21:36:25 PST

Size: 2.23 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f8d5b221ccd..ed4a434d623 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-11-29  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC] Geometry::inFlowNonReplacedHeightAndMargin should check for empty inline formatting context.
>+        https://bugs.webkit.org/show_bug.cgi?id=192215
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Check if the inline formatting context actually has any lines.
>+
>+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
>+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
>+
> 2018-11-29  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC][MarginCollapsing] Do not use computed display box values for border and padding
>diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp b/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
>index 9e694ca60ca..819f0303e09 100644
>--- a/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
>@@ -76,8 +76,9 @@ HeightAndMargin BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMarg
>         // 1. the bottom edge of the last line box, if the box establishes a inline formatting context with one or more lines
>         if (layoutBox.establishesInlineFormattingContext()) {
>             // This is temp and will be replaced by the correct display box once inline runs move over to the display tree.
>-            auto& lastInlineRun = downcast<InlineFormattingState>(layoutState.establishedFormattingState(layoutBox)).inlineRuns().last();
>-            return { lastInlineRun.logicalBottom(), nonCollapsedMargin, collapsedMargin };
>+            auto& inlineRuns = downcast<InlineFormattingState>(layoutState.establishedFormattingState(layoutBox)).inlineRuns();
>+            auto bottomEdge = inlineRuns.isEmpty() ? LayoutUnit() : inlineRuns.last().logicalBottom();
>+            return { bottomEdge, nonCollapsedMargin, collapsedMargin };
>         }
> 
>         // 2. the bottom edge of the bottom (possibly collapsed) margin of its last in-flow child, if the child's bottom margin...

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 192215: 356128