Changeset 246464 in webkit

Timestamp:

Jun 15, 2019, 7:36:40 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][MarginCollapsing] Remove redundant checks in MarginCollapse::marginBefore/AfterCollapsesWith*
​https://bugs.webkit.org/show_bug.cgi?id=198882
<rdar://problem/51773334>

Reviewed by Antti Koivisto.

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/blockformatting/BlockMarginCollapse.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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 Antti Koivisto.
+
+        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>
 

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

@@ -213 +213 @@
         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())
@@ -349 +341 @@
     if (!computedMinHeight.isAuto() && computedMinHeight.value()
         && (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;