Title: [254281] trunk/Source/WebCore
- Revision
- 254281
- Author
- [email protected]
- Date
- 2020-01-09 11:24:40 -0800 (Thu, 09 Jan 2020)
Log Message
Fix iOS build.
* layout/FormattingContext.cpp:
(WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry):
* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (254280 => 254281)
--- trunk/Source/WebCore/ChangeLog 2020-01-09 19:13:30 UTC (rev 254280)
+++ trunk/Source/WebCore/ChangeLog 2020-01-09 19:24:40 UTC (rev 254281)
@@ -1,5 +1,14 @@
2020-01-09 Zalan Bujtas <[email protected]>
+ Fix iOS build.
+
+ * layout/FormattingContext.cpp:
+ (WebCore::Layout::FormattingContext::computeOutOfFlowHorizontalGeometry):
+ * layout/blockformatting/BlockFormattingContext.cpp:
+ (WebCore::Layout::BlockFormattingContext::computeWidthAndMargin):
+
+2020-01-09 Zalan Bujtas <[email protected]>
+
[LFC] Rename UsedHorizontal(Vertical)Values to OverrideHorizontal(Vertical)values
https://bugs.webkit.org/show_bug.cgi?id=206008
<rdar://problem/58443375>
Modified: trunk/Source/WebCore/layout/FormattingContext.cpp (254280 => 254281)
--- trunk/Source/WebCore/layout/FormattingContext.cpp 2020-01-09 19:13:30 UTC (rev 254280)
+++ trunk/Source/WebCore/layout/FormattingContext.cpp 2020-01-09 19:24:40 UTC (rev 254281)
@@ -70,7 +70,7 @@
{
ASSERT(layoutBox.isOutOfFlowPositioned());
auto compute = [&](Optional<LayoutUnit> usedWidth) {
- return geometry().outOfFlowHorizontalGeometry(layoutBox, horizontalConstraints, { usedWidth });
+ return geometry().outOfFlowHorizontalGeometry(layoutBox, horizontalConstraints, { usedWidth, { } });
};
auto containingBlockWidth = horizontalConstraints.logicalWidth;
Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (254280 => 254281)
--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp 2020-01-09 19:13:30 UTC (rev 254280)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp 2020-01-09 19:24:40 UTC (rev 254281)
@@ -382,10 +382,10 @@
{
auto compute = [&](Optional<LayoutUnit> usedWidth) -> ContentWidthAndMargin {
if (layoutBox.isInFlow())
- return geometry().inFlowWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth });
+ return geometry().inFlowWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
if (layoutBox.isFloatingPositioned())
- return geometry().floatingWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth });
+ return geometry().floatingWidthAndMargin(layoutBox, horizontalConstraints, { usedWidth, { } });
ASSERT_NOT_REACHED();
return { };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
