Attachment 372184 Details for Bug 198882 – Patch

[patch] Patch

bug-198882-20190615005526.patch (text/plain), 2.61 KB, created by zalan on 2019-06-15 00:55:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-06-15 00:55:28 PDT

Size: 2.61 KB

patch

obsolete

>Subversion Revision: 246456
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 19828a540c8298bc6ba1c41ac18c46ce60bf7a2e..5cc7b9c79cda3d1d0f5a4bd5552bd33cd8839cb9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][MarginCollapsing] Remove redundant checks in MarginCollapse::marginBefore/AfterCollapsesWith*
>+        https://bugs.webkit.org/show_bug.cgi?id=198882
>+        <rdar://problem/51773334>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        In-flow child can neither be floating nor out-of-flow positioned.
>+
>+        * layout/blockformatting/BlockMarginCollapse.cpp:
>+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginBeforeCollapsesWithFirstInFlowChildMarginBefore):
>+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowChildMarginAfter):
>+
> 2019-06-15  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Add limited quirks mode to LayoutState.
>diff --git a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>index 00e0a0f44ade82da21d3656000a0c6d21fc56ef2..00ae5b68013493db40ad5e36c9ba31d213e3d1f2 100644
>--- a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>@@ -209,14 +209,6 @@ bool BlockFormattingContext::MarginCollapse::marginBeforeCollapsesWithFirstInFlo
>     if (hasClearance(layoutState, firstInFlowChild))
>         return false;
> 
>-    // Margins between a floated box and any other box do not collapse.
>-    if (firstInFlowChild.isFloatingPositioned())
>-        return false;
>-
>-    // Margins of absolutely positioned boxes do not collapse.
>-    if (firstInFlowChild.isOutOfFlowPositioned())
>-        return false;
>-
>     // Margins of inline-block boxes do not collapse.
>     if (firstInFlowChild.isInlineBlockBox())
>         return false;
>@@ -347,14 +339,6 @@ bool BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowC
>         && (marginAfterCollapsesWithParentMarginBefore(layoutState, lastInFlowChild) || hasClearance(layoutState, lastInFlowChild)))
>         return false;
> 
>-    // Margins between a floated box and any other box do not collapse.
>-    if (lastInFlowChild.isFloatingPositioned())
>-        return false;
>-
>-    // Margins of absolutely positioned boxes do not collapse.
>-    if (lastInFlowChild.isOutOfFlowPositioned())
>-        return false;
>-
>     // Margins of inline-block boxes do not collapse.
>     if (lastInFlowChild.isInlineBlockBox())
>         return false;

Actions: View | Formatted Diff | Diff

Attachments on bug 198882: 372182 | 372184