Attachment 372186 Details for Bug 198884 – Patch

[patch] Patch

bug-198884-20190615010024.patch (text/plain), 1.67 KB, created by zalan on 2019-06-15 01:00:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-06-15 01:00:26 PDT

Size: 1.67 KB

patch

obsolete

>Subversion Revision: 246456
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5b874274a8716dcc63c9857c13eaf21346a6e75e..6eadfbd59247b05eda7140ed749f2d5083de31a6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC[MarginCollapsing] Anonymous boxes never collapse their margins with siblings.
>+        https://bugs.webkit.org/show_bug.cgi?id=198884
>+        <rdar://problem/51773509>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * layout/blockformatting/BlockMarginCollapse.cpp:
>+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginBeforeCollapsesWithPreviousSiblingMarginAfter):
>+
> 2019-06-15  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][MarginCollapsing] Add check for computed height value in MarginCollapse::marginsCollapseThrough
>diff --git a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>index 715d3df711137c83ec7bbaf4518fd051a18f51fa..a385e67c298b32270fac7da17645d432d11f5f70 100644
>--- a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>@@ -158,6 +158,9 @@ bool BlockFormattingContext::MarginCollapse::marginBeforeCollapsesWithPreviousSi
>         return false;
> 
>     auto& previousInFlowSibling = *layoutBox.previousInFlowSibling();
>+    if (previousInFlowSibling.isAnonymous())
>+        return false;
>+
>     // Margins between a floated box and any other box do not collapse.
>     if (layoutBox.isFloatingPositioned() || previousInFlowSibling.isFloatingPositioned())
>         return false;

Actions: View | Formatted Diff | Diff

Attachments on bug 198884: 372186