Changeset 267587 in webkit

Timestamp:

Sep 25, 2020, 12:03:37 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][MarginCollapsing] Only inflow boxes collapse their quirk margins with their parents
​https://bugs.webkit.org/show_bug.cgi?id=216981

Reviewed by Antti Koivisto.

Source/WebCore:

Test: fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating.html

• layout/blockformatting/BlockFormattingContextQuirks.cpp:

(WebCore::Layout::BlockFormattingContext::Quirks::shouldCollapseMarginBeforeWithParentMarginBefore const):

LayoutTests:

• fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating-expected.html: Added.
• fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][MarginCollapsing] Only inflow boxes collapse their quirk margins with their parents
+        https://bugs.webkit.org/show_bug.cgi?id=216981
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating-expected.html: Added.
+        * fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating.html: Added.
+
 2020-09-25  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][MarginCollapsing] Only inflow boxes collapse their quirk margins with their parents
+        https://bugs.webkit.org/show_bug.cgi?id=216981
+
+        Reviewed by Antti Koivisto.
+
+        Test: fast/layoutformattingcontext/quirk-margin-not-collapse-when-floating.html
+
+        * layout/blockformatting/BlockFormattingContextQuirks.cpp:
+        (WebCore::Layout::BlockFormattingContext::Quirks::shouldCollapseMarginBeforeWithParentMarginBefore const):
+
 2020-09-25  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp

@@ -105 +105 @@
 }
 
+enum class VerticalMargin { Before, After };
+static inline bool hasQuirkMarginToCollapse(const Box& layoutBox, VerticalMargin verticalMargin)
+{
+    if (!layoutBox.isInFlow())
+        return false;
+    auto& style = layoutBox.style();
+    return (verticalMargin == VerticalMargin::Before && style.hasMarginBeforeQuirk()) || (verticalMargin == VerticalMargin::After && style.hasMarginAfterQuirk());
+}
+
 bool BlockFormattingContext::Quirks::shouldCollapseMarginBeforeWithParentMarginBefore(const Box& layoutBox) const
 {
-    return layoutState().inQuirksMode() && layoutBox.style().hasMarginBeforeQuirk() && isQuirkContainer(layoutBox.containingBlock());
+    return layoutState().inQuirksMode() && hasQuirkMarginToCollapse(layoutBox, VerticalMargin::Before) && isQuirkContainer(layoutBox.containingBlock());
 }
 
 bool BlockFormattingContext::Quirks::shouldCollapseMarginAfterWithParentMarginAfter(const Box& layoutBox) const
 {
-    return layoutState().inQuirksMode() && layoutBox.style().hasMarginAfterQuirk() && isQuirkContainer(layoutBox.containingBlock());
+    return layoutState().inQuirksMode() && hasQuirkMarginToCollapse(layoutBox, VerticalMargin::After) && isQuirkContainer(layoutBox.containingBlock());
 }