Attachment 372187 Details for Bug 198885 – Patch

[patch] Patch

bug-198885-20190615010912.patch (text/plain), 1.67 KB, created by zalan on 2019-06-15 01:09:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-06-15 01:09:14 PDT

Size: 1.67 KB

patch

obsolete

>Subversion Revision: 246456
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6eadfbd59247b05eda7140ed749f2d5083de31a6..6d8c0ebac6bc643c59c5dca7ab6989b39c39b6c8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-15  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][MarginCollapsing] Collapsed through margin values preserve quirk state.
>+        https://bugs.webkit.org/show_bug.cgi?id=198885
>+        <rdar://problem/51773568>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The collapsed through margin becomes a quirk margin if either of the vertical(before/after) margins have quirk value.
>+
>+        * layout/blockformatting/BlockMarginCollapse.cpp:
>+        (WebCore::Layout::computedPositiveAndNegativeMargin):
>+
> 2019-06-15  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC[MarginCollapsing] Anonymous boxes never collapse their margins with siblings.
>diff --git a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>index a385e67c298b32270fac7da17645d432d11f5f70..1cb3ef99a751556be5e73d8da0c6297853aa5539 100644
>--- a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>@@ -435,7 +435,7 @@ static PositiveAndNegativeVerticalMargin::Values computedPositiveAndNegativeMarg
>         computedValues.negative = a.negative ? a.negative : b.negative;
> 
>     if (a.isNonZero() && b.isNonZero())
>-        computedValues.isQuirk = a.isQuirk && b.isQuirk;
>+        computedValues.isQuirk = a.isQuirk || b.isQuirk;
>     else if (a.isNonZero())
>         computedValues.isQuirk = a.isQuirk;
>     else

Actions: View | Formatted Diff | Diff

Attachments on bug 198885: 372187