Title: [293303] trunk/Source/WebCore
- Revision
- 293303
- Author
- za...@apple.com
- Date
- 2022-04-24 08:21:24 -0700 (Sun, 24 Apr 2022)
Log Message
Fix a typo (r293297)
https://bugs.webkit.org/show_bug.cgi?id=239704
Unreviewed.
* layout/formattingContexts/flex/FlexFormattingContext.cpp:
(WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration):
(WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntergration): Deleted.
* layout/formattingContexts/flex/FlexFormattingContext.h:
* layout/formattingContexts/inline/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntegration):
(WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntergration): Deleted.
* layout/formattingContexts/inline/InlineFormattingContext.h:
* layout/integration/flex/LayoutIntegrationFlexLayout.cpp:
(WebCore::LayoutIntegration::FlexLayout::layout):
* layout/integration/inline/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::layout):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (293302 => 293303)
--- trunk/Source/WebCore/ChangeLog 2022-04-24 05:49:49 UTC (rev 293302)
+++ trunk/Source/WebCore/ChangeLog 2022-04-24 15:21:24 UTC (rev 293303)
@@ -1,3 +1,23 @@
+2022-04-24 Alan Bujtas <za...@apple.com>
+
+ Fix a typo (r293297)
+ https://bugs.webkit.org/show_bug.cgi?id=239704
+
+ Unreviewed.
+
+ * layout/formattingContexts/flex/FlexFormattingContext.cpp:
+ (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration):
+ (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntergration): Deleted.
+ * layout/formattingContexts/flex/FlexFormattingContext.h:
+ * layout/formattingContexts/inline/InlineFormattingContext.cpp:
+ (WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntegration):
+ (WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntergration): Deleted.
+ * layout/formattingContexts/inline/InlineFormattingContext.h:
+ * layout/integration/flex/LayoutIntegrationFlexLayout.cpp:
+ (WebCore::LayoutIntegration::FlexLayout::layout):
+ * layout/integration/inline/LayoutIntegrationLineLayout.cpp:
+ (WebCore::LayoutIntegration::LineLayout::layout):
+
2022-04-23 Chris Dumez <cdu...@apple.com>
Unreviewed build fix after r293301.
Modified: trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp (293302 => 293303)
--- trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp 2022-04-24 05:49:49 UTC (rev 293302)
+++ trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp 2022-04-24 15:21:24 UTC (rev 293303)
@@ -118,7 +118,7 @@
}
}
-void FlexFormattingContext::layoutInFlowContentForIntergration(const ConstraintsForInFlowContent&)
+void FlexFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent&)
{
}
Modified: trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h (293302 => 293303)
--- trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h 2022-04-24 05:49:49 UTC (rev 293302)
+++ trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h 2022-04-24 15:21:24 UTC (rev 293303)
@@ -48,7 +48,7 @@
const FlexFormattingGeometry& formattingGeometry() const final { return m_flexFormattingGeometry; }
const FormattingQuirks& formattingQuirks() const final { return m_flexFormattingQuirks; }
- void layoutInFlowContentForIntergration(const ConstraintsForInFlowContent&);
+ void layoutInFlowContentForIntegration(const ConstraintsForInFlowContent&);
IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration();
private:
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp (293302 => 293303)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp 2022-04-24 05:49:49 UTC (rev 293302)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp 2022-04-24 15:21:24 UTC (rev 293303)
@@ -150,7 +150,7 @@
LOG_WITH_STREAM(FormattingContextLayout, stream << "[End] -> inline formatting context -> formatting root(" << &root() << ")");
}
-void InlineFormattingContext::layoutInFlowContentForIntergration(const ConstraintsForInFlowContent& constraints)
+void InlineFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent& constraints)
{
invalidateFormattingState();
collectContentIfNeeded();
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h (293302 => 293303)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h 2022-04-24 05:49:49 UTC (rev 293302)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h 2022-04-24 15:21:24 UTC (rev 293303)
@@ -57,7 +57,7 @@
const InlineFormattingGeometry& formattingGeometry() const final { return m_inlineFormattingGeometry; }
const InlineFormattingQuirks& formattingQuirks() const final { return m_inlineFormattingQuirks; }
- void layoutInFlowContentForIntergration(const ConstraintsForInFlowContent&);
+ void layoutInFlowContentForIntegration(const ConstraintsForInFlowContent&);
IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration();
private:
Modified: trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp (293302 => 293303)
--- trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp 2022-04-24 05:49:49 UTC (rev 293302)
+++ trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp 2022-04-24 15:21:24 UTC (rev 293303)
@@ -79,7 +79,7 @@
auto flexFormattingContext = Layout::FlexFormattingContext { rootLayoutBox(), m_flexFormattingState };
auto horizontalConstraints = Layout::HorizontalConstraints { rootGeometry.contentBoxLeft(), rootGeometry.contentBoxWidth() };
- flexFormattingContext.layoutInFlowContentForIntergration({ horizontalConstraints, rootGeometry.contentBoxTop() });
+ flexFormattingContext.layoutInFlowContentForIntegration({ horizontalConstraints, rootGeometry.contentBoxTop() });
}
void FlexLayout::paint(PaintInfo&, const LayoutPoint&)
Modified: trunk/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp (293302 => 293303)
--- trunk/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp 2022-04-24 05:49:49 UTC (rev 293302)
+++ trunk/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp 2022-04-24 15:21:24 UTC (rev 293303)
@@ -380,7 +380,7 @@
auto horizontalConstraints = Layout::HorizontalConstraints { rootGeometry.contentBoxLeft(), rootGeometry.contentBoxWidth() };
- inlineFormattingContext.layoutInFlowContentForIntergration({ horizontalConstraints, rootGeometry.contentBoxTop() });
+ inlineFormattingContext.layoutInFlowContentForIntegration({ horizontalConstraints, rootGeometry.contentBoxTop() });
constructContent();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
