Title: [257701] trunk/Source/WebCore
- Revision
- 257701
- Author
- [email protected]
- Date
- 2020-03-01 20:29:10 -0800 (Sun, 01 Mar 2020)
Log Message
Unreviewed build fix for non-unified builds after r257507.
* layout/blockformatting/BlockFormattingContext.h:
* layout/blockformatting/BlockMarginCollapse.cpp:
(WebCore::Layout::BlockFormattingContext::MarginCollapse::marginValue const):
(WebCore::Layout::marginValue): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (257700 => 257701)
--- trunk/Source/WebCore/ChangeLog 2020-03-02 03:20:44 UTC (rev 257700)
+++ trunk/Source/WebCore/ChangeLog 2020-03-02 04:29:10 UTC (rev 257701)
@@ -1,3 +1,12 @@
+2020-03-01 Zalan Bujtas <[email protected]>
+
+ Unreviewed build fix for non-unified builds after r257507.
+
+ * layout/blockformatting/BlockFormattingContext.h:
+ * layout/blockformatting/BlockMarginCollapse.cpp:
+ (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginValue const):
+ (WebCore::Layout::marginValue): Deleted.
+
2020-02-29 Darin Adler <[email protected]>
Slim down some CSS parsing code
Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h (257700 => 257701)
--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h 2020-03-02 03:20:44 UTC (rev 257700)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h 2020-03-02 04:29:10 UTC (rev 257701)
@@ -137,6 +137,7 @@
PositiveAndNegativeVerticalMargin::Values precomputedPositiveNegativeValues(const Box&, MarginType) const;
PositiveAndNegativeVerticalMargin::Values computedPositiveAndNegativeMargin(PositiveAndNegativeVerticalMargin::Values, PositiveAndNegativeVerticalMargin::Values) const;
+ Optional<LayoutUnit> marginValue(PositiveAndNegativeVerticalMargin::Values) const;
bool hasClearance(const Box&) const;
Modified: trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp (257700 => 257701)
--- trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2020-03-02 03:20:44 UTC (rev 257700)
+++ trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp 2020-03-02 04:29:10 UTC (rev 257701)
@@ -450,7 +450,7 @@
return computedValues;
}
-static Optional<LayoutUnit> marginValue(PositiveAndNegativeVerticalMargin::Values marginValues)
+Optional<LayoutUnit> BlockFormattingContext::MarginCollapse::marginValue(PositiveAndNegativeVerticalMargin::Values marginValues) const
{
// When two or more margins collapse, the resulting margin width is the maximum of the collapsing margins' widths.
// In the case of negative margins, the maximum of the absolute values of the negative adjoining margins is deducted from the maximum
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
