Skip to content

Commit

Permalink
[IFC] Do not populate InlineContentBreaker::ContinuousContent eagerly…
Browse files Browse the repository at this point in the history 
… with candidate content

https://bugs.webkit.org/show_bug.cgi?id=260403

Reviewed by Antti Koivisto.

InlineContentBreaker::ContinuousContent pre-processes the candidate content to provide trailing/trimming information for InlineContentBreaker.
However we don't need that information until after we feed the content to line breaking.
Let's populate ContinuousContent lazily right before calling handleOverflowingTextContent.

(when content fits, we directly commit to line, otherwise
1. commit to ContinuousContent first
2. call InlineContentBreaker
3. commit the result to line)

This is ~10% progression on PerformanceTests/Layout/line-layout.html.

* Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.cpp:
(WebCore::Layout::CandidateTextContent::append):
(WebCore::Layout::measuredInlineTextItem):
(WebCore::Layout::appendInlineTextItem):
(WebCore::Layout::TextOnlySimpleLineBuilder::placeInlineTextContent):
(WebCore::Layout::TextOnlySimpleLineBuilder::placeNonWrappingInlineTextContent):
(WebCore::Layout::TextOnlySimpleLineBuilder::handleOverflowingTextContent):
(WebCore::Layout::TextOnlySimpleLineBuilder::revertToTrailingItem):
(WebCore::Layout::TextOnlySimpleLineBuilder::revertToLastNonOverflowingItem):
(WebCore::Layout::TextOnlySimpleLineBuilder::availableWidth const):
(WebCore::Layout::inlineTextItemWidth): Deleted.
(WebCore::Layout::TextOnlySimpleLineBuilder::handleInlineTextContent): Deleted.
* Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.h:

Canonical link: https://commits.webkit.org/267079@main
  • Loading branch information
@alanbaradlay
alanbaradlay committed Aug 21, 2023
1 parent 5903034 commit dc83324
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 29 deletions.
108 changes: 80 additions & 28 deletions Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,21 @@ struct TextOnlyLineBreakResult {
bool isRevert { false };
};

static inline InlineLayoutUnit inlineTextItemWidth(const InlineTextItem& inlineTextItem, const RenderStyle& style, InlineLayoutUnit contentLogicalLeft)
struct CandidateTextContent {
void append(InlineLayoutUnit contentWidth)
{
logicalWidth += contentWidth;
++endIndex;
}

size_t startIndex { 0 };
size_t endIndex { 0 };
InlineLayoutUnit logicalWidth { 0.f };
};

static inline InlineLayoutUnit measuredInlineTextItem(const InlineTextItem& inlineTextItem, const RenderStyle& style, InlineLayoutUnit contentLogicalLeft)
{
if (auto contentWidth = inlineTextItem.width())
return *contentWidth;
ASSERT(!inlineTextItem.width());
if (!inlineTextItem.isWhitespace() || InlineTextItem::shouldPreserveSpacesAndTabs(inlineTextItem))
return TextUtil::width(inlineTextItem, style.fontCascade(), contentLogicalLeft);
return TextUtil::width(inlineTextItem, style.fontCascade(), inlineTextItem.start(), inlineTextItem.start() + 1, contentLogicalLeft);
Expand All @@ -60,13 +71,12 @@ static inline bool isLastLineWithInlineContent(InlineItemPosition placedContentE
return placedContentEnd.index == layoutRangeEndIndex && !placedContentEnd.offset;
}

static inline void appendInlineTextItem(const InlineTextItem& inlineTextItem, bool isFirstFormattedLine, const Line& line, InlineContentBreaker::ContinuousContent& candidateContent)
static inline void appendInlineTextItem(const InlineTextItem& inlineTextItem, const RenderStyle& style, const Line& line, InlineContentBreaker::ContinuousContent& candidateContent)
{
auto& style = isFirstFormattedLine ? inlineTextItem.firstLineStyle() : inlineTextItem.style();
auto textContentlWidth = [&] {
if (auto textWidth = inlineTextItem.width())
return *textWidth;
return inlineTextItemWidth(inlineTextItem, style, line.contentLogicalRight() + candidateContent.logicalWidth());
return measuredInlineTextItem(inlineTextItem, style, line.contentLogicalRight() + candidateContent.logicalWidth());
};
candidateContent.appendTextContent(inlineTextItem, style, textContentlWidth());
}
Expand Down Expand Up @@ -142,18 +152,12 @@ void TextOnlySimpleLineBuilder::initialize(const InlineItemRange& layoutRange, c

InlineItemPosition TextOnlySimpleLineBuilder::placeInlineTextContent(const InlineItemRange& layoutRange)
{
auto candidateContent = InlineContentBreaker::ContinuousContent { };
auto isFirstFormattedLine = this->isFirstFormattedLine();
auto hasWrapOpportunityBeforeWhitespace = root().style().whiteSpaceCollapse() != WhiteSpaceCollapse::BreakSpaces && root().style().lineBreak() != LineBreak::AfterWhiteSpace;
auto& rootStyle = !isFirstFormattedLine() ? root().style() : root().firstLineStyle();
auto hasWrapOpportunityBeforeWhitespace = rootStyle.whiteSpaceCollapse() != WhiteSpaceCollapse::BreakSpaces && rootStyle.lineBreak() != LineBreak::AfterWhiteSpace;
size_t placedInlineItemCount = 0;

auto result = TextOnlyLineBreakResult { };
auto processCandidateContent = [&] {
result = handleInlineTextContent(candidateContent, layoutRange);
candidateContent.reset();
placedInlineItemCount = !result.isRevert ? placedInlineItemCount + result.committedCount : result.committedCount;
return result.isEndOfLine == InlineContentBreaker::IsEndOfLine::Yes;
};
auto candidateContent = CandidateTextContent { layoutRange.startIndex(), layoutRange.startIndex(), { } };

auto nextItemIndex = layoutRange.startIndex();
auto isAtSoftWrapOpportunityOrContentEnd = [&](auto& inlineTextItem) {
Expand All @@ -167,10 +171,17 @@ InlineItemPosition TextOnlySimpleLineBuilder::placeInlineTextContent(const Inlin
return &inlineTextItem.inlineTextBox() == &nextInlineTextItem.inlineTextBox() || TextUtil::mayBreakInBetween(inlineTextItem, nextInlineTextItem);
};

auto processCandidateContent = [&] {
result = commitCandidateContent(candidateContent, layoutRange);
placedInlineItemCount = !result.isRevert ? placedInlineItemCount + result.committedCount : result.committedCount;
candidateContent = { candidateContent.endIndex, candidateContent.endIndex, { } };
return result.isEndOfLine == InlineContentBreaker::IsEndOfLine::Yes;
};

// Handle leading partial content first (overflowing text from the previous line).
auto isEndOfLine = false;
if (m_partialLeadingTextItem) {
appendInlineTextItem(*m_partialLeadingTextItem, isFirstFormattedLine, m_line, candidateContent);
candidateContent.append({ });
++nextItemIndex;
if (isAtSoftWrapOpportunityOrContentEnd(*m_partialLeadingTextItem))
isEndOfLine = processCandidateContent();
Expand All @@ -182,7 +193,12 @@ InlineItemPosition TextOnlySimpleLineBuilder::placeInlineTextContent(const Inlin

if (inlineItem.isText()) {
auto& inlineTextItem = downcast<InlineTextItem>(inlineItem);
appendInlineTextItem(inlineTextItem, isFirstFormattedLine, m_line, candidateContent);
auto contentWidth = [&] {
if (auto logicalWidth = inlineTextItem.width())
return *logicalWidth;
return measuredInlineTextItem(inlineTextItem, rootStyle, m_line.contentLogicalRight() + candidateContent.logicalWidth);
};
candidateContent.append(contentWidth());
if (isAtSoftWrapOpportunityOrContentEnd(inlineTextItem))
isEndOfLine = processCandidateContent();
continue;
Expand All @@ -206,21 +222,21 @@ InlineItemPosition TextOnlySimpleLineBuilder::placeNonWrappingInlineTextContent(
ASSERT(!TextUtil::isWrappingAllowed(root().style()));

auto candidateContent = InlineContentBreaker::ContinuousContent { };
auto isFirstFormattedLine = this->isFirstFormattedLine();
auto& rootStyle = !isFirstFormattedLine() ? root().style() : root().firstLineStyle();
auto isEndOfLine = false;
auto trailingLineBreakIndex = std::optional<size_t> { };
auto nextItemIndex = layoutRange.startIndex();

if (m_partialLeadingTextItem) {
appendInlineTextItem(*m_partialLeadingTextItem, isFirstFormattedLine, m_line, candidateContent);
appendInlineTextItem(*m_partialLeadingTextItem, rootStyle, m_line, candidateContent);
++nextItemIndex;
isEndOfLine = nextItemIndex >= layoutRange.endIndex();
}
while (!isEndOfLine) {
auto& inlineItem = m_inlineItems[nextItemIndex];
ASSERT(inlineItem.isText() || inlineItem.isLineBreak());
if (inlineItem.isText())
appendInlineTextItem(downcast<InlineTextItem>(inlineItem), isFirstFormattedLine, m_line, candidateContent);
appendInlineTextItem(downcast<InlineTextItem>(inlineItem), rootStyle, m_line, candidateContent);
else if (inlineItem.isLineBreak())
trailingLineBreakIndex = nextItemIndex;
++nextItemIndex;
Expand All @@ -232,7 +248,7 @@ InlineItemPosition TextOnlySimpleLineBuilder::placeNonWrappingInlineTextContent(
return { *trailingLineBreakIndex + 1, { } };
}

auto result = handleInlineTextContent(candidateContent, layoutRange);
auto result = handleOverflowingTextContent(candidateContent, layoutRange);
nextItemIndex = layoutRange.startIndex() + result.committedCount;
if (consumeTrailingLineBreakIfApplicable(result, nextItemIndex, layoutRange.endIndex(), m_line, m_inlineItems))
++nextItemIndex;
Expand All @@ -243,12 +259,42 @@ InlineItemPosition TextOnlySimpleLineBuilder::placeNonWrappingInlineTextContent(
return placedContentEnd;
}

TextOnlyLineBreakResult TextOnlySimpleLineBuilder::handleInlineTextContent(const InlineContentBreaker::ContinuousContent& candidateContent, const InlineItemRange& layoutRange)
TextOnlyLineBreakResult TextOnlySimpleLineBuilder::commitCandidateContent(const CandidateTextContent& candidateContent, const InlineItemRange& layoutRange)
{
auto& rootStyle = !isFirstFormattedLine() ? root().style() : root().firstLineStyle();
auto hasLeadingPartiaContent = m_partialLeadingTextItem && candidateContent.startIndex == layoutRange.startIndex();

if (candidateContent.logicalWidth <= availableWidth() && !hasLeadingPartiaContent) {
for (auto index = candidateContent.startIndex; index < candidateContent.endIndex; ++index) {
auto& inlineTextItem = downcast<InlineTextItem>(m_inlineItems[index]);
auto contentWidth = [&] {
if (auto logicalWidth = inlineTextItem.width())
return *logicalWidth;
return measuredInlineTextItem(inlineTextItem, rootStyle, m_line.contentLogicalRight());
};
m_line.appendTextFast(inlineTextItem, rootStyle, contentWidth());
}
if (m_line.hasContentOrListMarker())
m_wrapOpportunityList.append(&downcast<InlineTextItem>(m_inlineItems[candidateContent.endIndex - 1]));
return { InlineContentBreaker::IsEndOfLine::No, candidateContent.endIndex - candidateContent.startIndex };
}

auto candidateContentForLineBreaking = InlineContentBreaker::ContinuousContent { };
auto startIndex = candidateContent.startIndex;
if (hasLeadingPartiaContent) {
appendInlineTextItem(*m_partialLeadingTextItem, rootStyle, m_line, candidateContentForLineBreaking);
++startIndex;
}
for (auto index = startIndex; index < candidateContent.endIndex; ++index)
appendInlineTextItem(downcast<InlineTextItem>(m_inlineItems[index]), rootStyle, m_line, candidateContentForLineBreaking);
return handleOverflowingTextContent(candidateContentForLineBreaking, layoutRange);
}

TextOnlyLineBreakResult TextOnlySimpleLineBuilder::handleOverflowingTextContent(const InlineContentBreaker::ContinuousContent& candidateContent, const InlineItemRange& layoutRange)
{
ASSERT(!candidateContent.runs().isEmpty());

auto contentLogicalRight = m_line.contentLogicalRight();
auto availableWidth = (m_lineLogicalRect.width() + LayoutUnit::epsilon()) - (!std::isnan(contentLogicalRight) ? contentLogicalRight : 0.f);
auto availableWidth = this->availableWidth();
auto lineBreakingResult = InlineContentBreaker::Result { InlineContentBreaker::Result::Action::Keep, InlineContentBreaker::IsEndOfLine::No, { }, { } };
if (candidateContent.logicalWidth() > availableWidth) {
auto lineStatus = InlineContentBreaker::LineStatus { m_line.contentLogicalRight(), availableWidth, m_line.trimmableTrailingWidth(), m_line.trailingSoftHyphenWidth(), m_line.isTrailingRunFullyTrimmable(), m_line.hasContentOrListMarker(), !m_wrapOpportunityList.isEmpty() };
Expand Down Expand Up @@ -342,12 +388,13 @@ void TextOnlySimpleLineBuilder::handleLineEnding(InlineItemPosition placedConten
size_t TextOnlySimpleLineBuilder::revertToTrailingItem(const InlineItemRange& layoutRange, const InlineTextItem& trailingInlineItem)
{
auto isFirstFormattedLine = this->isFirstFormattedLine();
auto& rootStyle = !isFirstFormattedLine ? root().style() : root().firstLineStyle();
m_line.initialize({ }, isFirstFormattedLine);
size_t numberOfInlineItemsOnLine = 0;

auto appendTextInlineItem = [&] (auto& inlineTextItem) {
auto& style = isFirstFormattedLine ? inlineTextItem.firstLineStyle() : inlineTextItem.style();
m_line.appendTextFast(inlineTextItem, style, inlineTextItemWidth(inlineTextItem, style, m_line.contentLogicalRight()));
auto logicalWidth = inlineTextItem.width() ? *inlineTextItem.width() : measuredInlineTextItem(inlineTextItem, rootStyle, m_line.contentLogicalRight());
m_line.appendTextFast(inlineTextItem, rootStyle, logicalWidth);
++numberOfInlineItemsOnLine;
return &inlineTextItem == &trailingInlineItem;
};
Expand All @@ -372,8 +419,7 @@ size_t TextOnlySimpleLineBuilder::revertToLastNonOverflowingItem(const InlineIte
auto hasRevertedEnough = [&] {
if (!i || !trailingSoftHyphenWidth)
return true;
auto availableWidth = m_lineLogicalRect.width() - m_line.contentLogicalRight();
return *trailingSoftHyphenWidth <= availableWidth;
return *trailingSoftHyphenWidth <= availableWidth();
};
if (hasRevertedEnough()) {
if (trailingSoftHyphenWidth)
Expand All @@ -385,6 +431,12 @@ size_t TextOnlySimpleLineBuilder::revertToLastNonOverflowingItem(const InlineIte
return 0;
}

InlineLayoutUnit TextOnlySimpleLineBuilder::availableWidth() const
{
auto contentLogicalRight = m_line.contentLogicalRight();
return (m_lineLogicalRect.width() + LayoutUnit::epsilon()) - (!std::isnan(contentLogicalRight) ? contentLogicalRight : 0.f);
}

const ElementBox& TextOnlySimpleLineBuilder::root() const
{
return formattingContext().root();
Expand Down
5 changes: 4 additions & 1 deletion Source/WebCore/layout/formattingContexts/inline/TextOnlySimpleLineBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ namespace WebCore {
namespace Layout {

class InlineContentBreaker;
struct CandidateTextContent;
struct TextOnlyLineBreakResult;

class TextOnlySimpleLineBuilder : public AbstractLineBuilder {
Expand All @@ -48,11 +49,13 @@ class TextOnlySimpleLineBuilder : public AbstractLineBuilder {
private:
InlineItemPosition placeInlineTextContent(const InlineItemRange&);
InlineItemPosition placeNonWrappingInlineTextContent(const InlineItemRange&);
TextOnlyLineBreakResult handleInlineTextContent(const InlineContentBreaker::ContinuousContent&, const InlineItemRange&);
TextOnlyLineBreakResult handleOverflowingTextContent(const InlineContentBreaker::ContinuousContent&, const InlineItemRange&);
TextOnlyLineBreakResult commitCandidateContent(const CandidateTextContent&, const InlineItemRange&);
void initialize(const InlineItemRange&, const InlineRect& initialLogicalRect, const std::optional<PreviousLine>&);
void handleLineEnding(InlineItemPosition, size_t layoutRangeEndIndex);
size_t revertToTrailingItem(const InlineItemRange&, const InlineTextItem&);
size_t revertToLastNonOverflowingItem(const InlineItemRange&);
InlineLayoutUnit availableWidth() const;

bool isFirstFormattedLine() const { return !m_previousLine.has_value(); }

Expand Down

0 comments on commit dc83324

Please sign in to comment.