-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[IFC] InlineFormattingContext should not cache any state
https://bugs.webkit.org/show_bug.cgi?id=260919 Reviewed by Antti Koivisto. FormattingContext classes are essentially just a collection of static-like functions with no state whatsoever. This patch moves m_maximumIntrinsicWidthResultForSingleLine from InlineFormattingContext to InlineFormattingState. (It is used to cache some state between preferred width computation and the subsequent line layout.) * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/layout/formattingContexts/inline/AbstractLineBuilder.h: (): Deleted. * Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.cpp: (WebCore::Layout::InlineFormattingContext::layout): (WebCore::Layout::InlineFormattingContext::computedIntrinsicSizes): (WebCore::Layout::InlineFormattingContext::createDisplayContentForLineFromCachedContent): * Source/WebCore/layout/formattingContexts/inline/InlineFormattingContext.h: * Source/WebCore/layout/formattingContexts/inline/InlineFormattingState.h: (WebCore::Layout::InlineFormattingState::setMaximumIntrinsicWidthLayoutResult): (WebCore::Layout::InlineFormattingState::clearMaximumIntrinsicWidthLayoutResult): (WebCore::Layout::InlineFormattingState::maximumIntrinsicWidthLayoutResult): * Source/WebCore/layout/formattingContexts/inline/IntrinsicWidthHandler.h: (WebCore::Layout::IntrinsicWidthHandler::maximumIntrinsicWidthResult): (WebCore::Layout::IntrinsicWidthHandler::maximumIntrinsicWidthResult const): Deleted. * Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.cpp: (WebCore::LayoutIntegration::LineLayout::LineLayout): (WebCore::LayoutIntegration::LineLayout::computeIntrinsicWidthConstraints): (WebCore::LayoutIntegration::LineLayout::layout): * Source/WebCore/layout/integration/inline/LayoutIntegrationLineLayout.h: Canonical link: https://commits.webkit.org/267472@main
- Loading branch information
1 parent
2f546b2
commit a58f000
Showing
9 changed files
with
125 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
Source/WebCore/layout/formattingContexts/inline/LineLayoutResult.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Copyright (C) 2023 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "FloatingState.h" | ||
| #include "InlineLineTypes.h" | ||
| #include "LayoutUnits.h" | ||
|
|
||
| namespace WebCore { | ||
| namespace Layout { | ||
|
|
||
| struct LineLayoutResult { | ||
| using PlacedFloatList = FloatingState::FloatList; | ||
| using SuspendedFloatList = Vector<const Box*>; | ||
|
|
||
| InlineItemRange inlineItemRange; | ||
| Line::RunList inlineContent; | ||
|
|
||
| struct FloatContent { | ||
| PlacedFloatList placedFloats; | ||
| SuspendedFloatList suspendedFloats; | ||
| bool hasIntrusiveFloat { false }; | ||
| }; | ||
| FloatContent floatContent { }; | ||
|
|
||
| struct ContentGeometry { | ||
| InlineLayoutUnit logicalLeft { 0.f }; | ||
| InlineLayoutUnit logicalWidth { 0.f }; | ||
| InlineLayoutUnit logicalRightIncludingNegativeMargin { 0.f }; // Note that with negative horizontal margin value, contentLogicalLeft + contentLogicalWidth is not necessarily contentLogicalRight. | ||
| std::optional<InlineLayoutUnit> trailingOverflowingContentWidth { }; | ||
| }; | ||
| ContentGeometry contentGeometry { }; | ||
|
|
||
| struct LineGeometry { | ||
| InlineLayoutPoint logicalTopLeft; | ||
| InlineLayoutUnit logicalWidth { 0.f }; | ||
| InlineLayoutUnit initialLogicalLeftIncludingIntrusiveFloats { 0.f }; | ||
| std::optional<InlineLayoutUnit> initialLetterClearGap { }; | ||
| }; | ||
| LineGeometry lineGeometry { }; | ||
|
|
||
| struct HangingContent { | ||
| bool shouldContributeToScrollableOverflow { false }; | ||
| InlineLayoutUnit logicalWidth { 0.f }; | ||
| }; | ||
| HangingContent hangingContent { }; | ||
|
|
||
| struct Directionality { | ||
| Vector<int32_t> visualOrderList; | ||
| TextDirection inlineBaseDirection { TextDirection::LTR }; | ||
| }; | ||
| Directionality directionality { }; | ||
|
|
||
| struct IsFirstLast { | ||
| enum class FirstFormattedLine : uint8_t { | ||
| No, | ||
| WithinIFC, | ||
| WithinBFC | ||
| }; | ||
| FirstFormattedLine isFirstFormattedLine { FirstFormattedLine::WithinIFC }; | ||
| bool isLastLineWithInlineContent { true }; | ||
| }; | ||
| IsFirstLast isFirstLast { }; | ||
| // Misc | ||
| size_t nonSpanningInlineLevelBoxCount { 0 }; | ||
| InlineLayoutUnit trimmedTrailingWhitespaceWidth { 0.f }; // only used for line-break: after-white-space currently | ||
| std::optional<InlineLayoutUnit> hintForNextLineTopToAvoidIntrusiveFloat { }; // This is only used for cases when intrusive floats prevent any content placement at current vertical position. | ||
| }; | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters