Changeset 293303 in webkit
- Timestamp:
- Apr 24, 2022, 8:21:24 AM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
-
ChangeLog (modified) (1 diff)
-
layout/formattingContexts/flex/FlexFormattingContext.cpp (modified) (1 diff)
-
layout/formattingContexts/flex/FlexFormattingContext.h (modified) (1 diff)
-
layout/formattingContexts/inline/InlineFormattingContext.cpp (modified) (1 diff)
-
layout/formattingContexts/inline/InlineFormattingContext.h (modified) (1 diff)
-
layout/integration/flex/LayoutIntegrationFlexLayout.cpp (modified) (1 diff)
-
layout/integration/inline/LayoutIntegrationLineLayout.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r293302 r293303 1 2022-04-24 Alan Bujtas <zalan@apple.com> 2 3 Fix a typo (r293297) 4 https://bugs.webkit.org/show_bug.cgi?id=239704 5 6 Unreviewed. 7 8 * layout/formattingContexts/flex/FlexFormattingContext.cpp: 9 (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntegration): 10 (WebCore::Layout::FlexFormattingContext::layoutInFlowContentForIntergration): Deleted. 11 * layout/formattingContexts/flex/FlexFormattingContext.h: 12 * layout/formattingContexts/inline/InlineFormattingContext.cpp: 13 (WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntegration): 14 (WebCore::Layout::InlineFormattingContext::layoutInFlowContentForIntergration): Deleted. 15 * layout/formattingContexts/inline/InlineFormattingContext.h: 16 * layout/integration/flex/LayoutIntegrationFlexLayout.cpp: 17 (WebCore::LayoutIntegration::FlexLayout::layout): 18 * layout/integration/inline/LayoutIntegrationLineLayout.cpp: 19 (WebCore::LayoutIntegration::LineLayout::layout): 20 1 21 2022-04-23 Chris Dumez <cdumez@apple.com> 2 22 -
trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.cpp
r293297 r293303 119 119 } 120 120 121 void FlexFormattingContext::layoutInFlowContentForInte rgration(const ConstraintsForInFlowContent&)121 void FlexFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent&) 122 122 { 123 123 } -
trunk/Source/WebCore/layout/formattingContexts/flex/FlexFormattingContext.h
r293297 r293303 49 49 const FormattingQuirks& formattingQuirks() const final { return m_flexFormattingQuirks; } 50 50 51 void layoutInFlowContentForInte rgration(const ConstraintsForInFlowContent&);51 void layoutInFlowContentForIntegration(const ConstraintsForInFlowContent&); 52 52 IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration(); 53 53 -
trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp
r293297 r293303 151 151 } 152 152 153 void InlineFormattingContext::layoutInFlowContentForInte rgration(const ConstraintsForInFlowContent& constraints)153 void InlineFormattingContext::layoutInFlowContentForIntegration(const ConstraintsForInFlowContent& constraints) 154 154 { 155 155 invalidateFormattingState(); -
trunk/Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h
r293297 r293303 58 58 const InlineFormattingQuirks& formattingQuirks() const final { return m_inlineFormattingQuirks; } 59 59 60 void layoutInFlowContentForInte rgration(const ConstraintsForInFlowContent&);60 void layoutInFlowContentForIntegration(const ConstraintsForInFlowContent&); 61 61 IntrinsicWidthConstraints computedIntrinsicWidthConstraintsForIntegration(); 62 62 -
trunk/Source/WebCore/layout/integration/flex/LayoutIntegrationFlexLayout.cpp
r293297 r293303 80 80 auto horizontalConstraints = Layout::HorizontalConstraints { rootGeometry.contentBoxLeft(), rootGeometry.contentBoxWidth() }; 81 81 82 flexFormattingContext.layoutInFlowContentForInte rgration({ horizontalConstraints, rootGeometry.contentBoxTop() });82 flexFormattingContext.layoutInFlowContentForIntegration({ horizontalConstraints, rootGeometry.contentBoxTop() }); 83 83 } 84 84 -
trunk/Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp
r293297 r293303 381 381 auto horizontalConstraints = Layout::HorizontalConstraints { rootGeometry.contentBoxLeft(), rootGeometry.contentBoxWidth() }; 382 382 383 inlineFormattingContext.layoutInFlowContentForInte rgration({ horizontalConstraints, rootGeometry.contentBoxTop() });383 inlineFormattingContext.layoutInFlowContentForIntegration({ horizontalConstraints, rootGeometry.contentBoxTop() }); 384 384 385 385 constructContent();
Note:
See TracChangeset
for help on using the changeset viewer.