Title: [294210] trunk/Source/WebCore
- Revision
- 294210
- Author
- za...@apple.com
- Date
- 2022-05-14 14:35:41 -0700 (Sat, 14 May 2022)
Log Message
Unreviewed win build fix.
* layout/integration/flex/LayoutIntegrationFlexLayout.cpp:
(WebCore::LayoutIntegration::flexBoxLogicalBorder):
(WebCore::LayoutIntegration::flexBoxLogicalPadding):
(WebCore::LayoutIntegration::FlexLayout::updateFormattingRootGeometryAndInvalidate):
(WebCore::LayoutIntegration::logicalBorder): Deleted.
(WebCore::LayoutIntegration::logicalPadding): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (294209 => 294210)
--- trunk/Source/WebCore/ChangeLog 2022-05-14 20:08:58 UTC (rev 294209)
+++ trunk/Source/WebCore/ChangeLog 2022-05-14 21:35:41 UTC (rev 294210)
@@ -1,3 +1,14 @@
+2022-05-14 Alan Bujtas <za...@apple.com>
+
+ Unreviewed win build fix.
+
+ * layout/integration/flex/LayoutIntegrationFlexLayout.cpp:
+ (WebCore::LayoutIntegration::flexBoxLogicalBorder):
+ (WebCore::LayoutIntegration::flexBoxLogicalPadding):
+ (WebCore::LayoutIntegration::FlexLayout::updateFormattingRootGeometryAndInvalidate):
+ (WebCore::LayoutIntegration::logicalBorder): Deleted.
+ (WebCore::LayoutIntegration::logicalPadding): Deleted.
+
2022-05-10 Yusuke Suzuki <ysuz...@apple.com>
Rename EventTrackingRegions::Event to EventTrackingRegions::EventType
Modified: trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp (294209 => 294210)
--- trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp 2022-05-14 20:08:58 UTC (rev 294209)
+++ trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp 2022-05-14 21:35:41 UTC (rev 294210)
@@ -46,7 +46,7 @@
}
// FIXME: Merge these with the other integration layout functions.
-static inline Layout::Edges logicalBorder(const RenderBoxModelObject& renderer, bool isLeftToRightInlineDirection, WritingMode writingMode)
+static inline Layout::Edges flexBoxLogicalBorder(const RenderBoxModelObject& renderer, bool isLeftToRightInlineDirection, WritingMode writingMode)
{
UNUSED_PARAM(isLeftToRightInlineDirection);
UNUSED_PARAM(writingMode);
@@ -59,7 +59,7 @@
return { { borderLeft, borderRight }, { borderTop, borderBottom } };
}
-static inline Layout::Edges logicalPadding(const RenderBoxModelObject& renderer, bool isLeftToRightInlineDirection, WritingMode writingMode)
+static inline Layout::Edges flexBoxLogicalPadding(const RenderBoxModelObject& renderer, bool isLeftToRightInlineDirection, WritingMode writingMode)
{
UNUSED_PARAM(isLeftToRightInlineDirection);
UNUSED_PARAM(writingMode);
@@ -81,8 +81,8 @@
auto writingMode = flexBoxRenderer.style().writingMode();
root.setContentBoxWidth(writingMode == WritingMode::TopToBottom ? flexBoxRenderer.contentWidth() : flexBoxRenderer.contentHeight());
- root.setPadding(logicalPadding(flexBoxRenderer, isLeftToRightInlineDirection, writingMode));
- root.setBorder(logicalBorder(flexBoxRenderer, isLeftToRightInlineDirection, writingMode));
+ root.setPadding(flexBoxLogicalPadding(flexBoxRenderer, isLeftToRightInlineDirection, writingMode));
+ root.setBorder(flexBoxLogicalBorder(flexBoxRenderer, isLeftToRightInlineDirection, writingMode));
root.setHorizontalMargin({ });
root.setVerticalMargin({ });
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
