Attachment 360235 Details for Bug 193864 – Patch

[patch] Patch

bug-193864-20190126044938.patch (text/plain), 2.33 KB, created by zalan on 2019-01-26 04:49:48 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-01-26 04:49:48 PST

Size: 2.33 KB

patch

obsolete

>Subversion Revision: 240544
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2671c6b9d035bcf196890c345b436a15df9e09f5..aa7b2c449adcc99b4ce3c29c4b630f537e546a2d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-01-26  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC][MarginCollapsing] marginAfterCollapsesWithParentMarginAfter/marginAfterCollapsesWithLastInFlowChildMarginAfter should check for border/padding after values.
>+        https://bugs.webkit.org/show_bug.cgi?id=193864
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * layout/blockformatting/BlockMarginCollapse.cpp:
>+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithParentMarginAfter):
>+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowChildMarginAfter):
>+
> 2019-01-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Box::nextInFlowOrFloatingSibling() should always return sibling floats as well.
>diff --git a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>index 02f7f00114a05a286c9e0c0dd70f99cb6b31e207..4424fb298eaaeaa26ef8a3271082e865d62757aa 100644
>--- a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>@@ -295,11 +295,11 @@ bool BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithParentMargi
>         return false;
> 
>     // the box has no bottom padding, and
>-    if (hasPaddingBefore(parent))
>+    if (hasPaddingAfter(parent))
>         return false;
> 
>     // the box has no bottom border, and
>-    if (hasBorderBefore(parent))
>+    if (hasBorderAfter(parent))
>         return false;
> 
>     // the child's bottom margin neither collapses with a top margin that has clearance...
>@@ -337,11 +337,11 @@ bool BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowC
>         return false;
> 
>     // the box has no bottom padding, and
>-    if (hasPaddingBefore(layoutBox))
>+    if (hasPaddingAfter(layoutBox))
>         return false;
> 
>     // the box has no bottom border, and
>-    if (hasBorderBefore(layoutBox))
>+    if (hasBorderAfter(layoutBox))
>         return false;
> 
>     // the child's bottom margin neither collapses with a top margin that has clearance...

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193864: 360235