Changeset 257568 in webkit

Timestamp:

Feb 27, 2020, 8:52:46 AM (5 years ago)

Author:

Alan Bujtas

Message:

Unreviewed build fix for non-unified builds after r257507.

• layout/blockformatting/BlockFormattingContext.h:
• layout/blockformatting/BlockMarginCollapse.cpp:

(WebCore::Layout::BlockFormattingContext::MarginCollapse::computedPositiveAndNegativeMargin const):
(WebCore::Layout::BlockFormattingContext::MarginCollapse::updateMarginAfterForPreviousSibling):
(WebCore::Layout::computedPositiveAndNegativeMargin): Deleted.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-27  Zalan Bujtas  <zalan@apple.com>
+
+        Unreviewed build fix for non-unified builds after r257507.
+
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockMarginCollapse.cpp:
+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::computedPositiveAndNegativeMargin const):
+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::updateMarginAfterForPreviousSibling):
+        (WebCore::Layout::computedPositiveAndNegativeMargin): Deleted.
+
 2020-02-27  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h

@@ -135 +135 @@
         PositiveAndNegativeVerticalMargin::Values precomputedPositiveNegativeValues(const Box&, MarginType) const;
 
+        PositiveAndNegativeVerticalMargin::Values computedPositiveAndNegativeMargin(PositiveAndNegativeVerticalMargin::Values, PositiveAndNegativeVerticalMargin::Values) const;
+
         bool hasClearance(const Box&) const;
 

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

@@ -428 +428 @@
 }
 
-static PositiveAndNegativeVerticalMargin::Values computedPositiveAndNegativeMargin(PositiveAndNegativeVerticalMargin::Values a, PositiveAndNegativeVerticalMargin::Values b)
+PositiveAndNegativeVerticalMargin::Values BlockFormattingContext::MarginCollapse::computedPositiveAndNegativeMargin(PositiveAndNegativeVerticalMargin::Values a, PositiveAndNegativeVerticalMargin::Values b) const
 {
     PositiveAndNegativeVerticalMargin::Values computedValues;
@@ -492 +492 @@
         auto positiveNegativeMarginBefore = blockFormattingState.positiveAndNegativeVerticalMargin(*currentBox).before;
 
-        previousSiblingPositiveNegativeMargin.after = computedPositiveAndNegativeMargin(positiveNegativeMarginBefore, previousSiblingPositiveNegativeMargin.after);
+        previousSiblingPositiveNegativeMargin.after = marginCollapse.computedPositiveAndNegativeMargin(positiveNegativeMarginBefore, previousSiblingPositiveNegativeMargin.after);
         if (marginsCollapseThrough) {
-            previousSiblingPositiveNegativeMargin.before = computedPositiveAndNegativeMargin(previousSiblingPositiveNegativeMargin.before, previousSiblingPositiveNegativeMargin.after);
+            previousSiblingPositiveNegativeMargin.before = marginCollapse.computedPositiveAndNegativeMargin(previousSiblingPositiveNegativeMargin.before, previousSiblingPositiveNegativeMargin.after);
             previousSiblingPositiveNegativeMargin.after = previousSiblingPositiveNegativeMargin.before;
         }