Changeset 254630 in webkit

Timestamp:

Jan 15, 2020 1:17:50 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] LineLayoutContext::nextContentForLine should take LineCandidateContent&
​https://bugs.webkit.org/show_bug.cgi?id=206300
<rdar://problem/58612197>

Reviewed by Antti Koivisto.

~5% progression on PerformanceTests/Layout/line-layout-simple.html.
LineLayoutContext::nextContentForLine is hot and LineCandidateContent has Vector members (too heavy).

• layout/inlineformatting/LineLayoutContext.cpp:

(WebCore::Layout::LineCandidateContent::reset):
(WebCore::Layout::LineLayoutContext::layoutLine):
(WebCore::Layout::LineLayoutContext::nextContentForLine):

• layout/inlineformatting/LineLayoutContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/LineLayoutContext.cpp (modified) (7 diffs)
• layout/inlineformatting/LineLayoutContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-15  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] LineLayoutContext::nextContentForLine should take LineCandidateContent&
+        https://bugs.webkit.org/show_bug.cgi?id=206300
+        <rdar://problem/58612197>
+
+        Reviewed by Antti Koivisto.
+
+        ~5% progression on PerformanceTests/Layout/line-layout-simple.html.
+        LineLayoutContext::nextContentForLine is hot and LineCandidateContent has Vector members (too heavy).
+
+        * layout/inlineformatting/LineLayoutContext.cpp:
+        (WebCore::Layout::LineCandidateContent::reset):
+        (WebCore::Layout::LineLayoutContext::layoutLine):
+        (WebCore::Layout::LineLayoutContext::nextContentForLine):
+        * layout/inlineformatting/LineLayoutContext.h:
+
 2020-01-15  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp

@@ -186 +186 @@
     const InlineItem* trailingLineBreak() const { return m_trailingLineBreak; }
 
+    void reset();
+
 private:
     void setTrailingLineBreak(const InlineItem& lineBreakItem) { m_trailingLineBreak = &lineBreakItem; }
@@ -202 +204 @@
         return m_floats.append(makeWeakPtr(inlineItem));
     m_inlineRuns.append({ inlineItem, *logicalWidth });
+}
+
+void LineCandidateContent::reset()
+{
+    m_inlineRuns.clear();
+    m_floats.clear();
+    m_trailingLineBreak = nullptr;
 }
 
@@ -259 +268 @@
     auto currentItemIndex = leadingInlineItemIndex;
     unsigned committedInlineItemCount = 0;
+    auto candidateContent = LineCandidateContent { };
     while (currentItemIndex < m_inlineItems.size()) {
         // 1. Collect the set of runs that we can commit to the line as one entity e.g. <span>text_and_span_start_span_end</span>.
@@ -264 +274 @@
         // 3. Check if the content fits the line and commit the content accordingly (full, partial or not commit at all).
         // 4. Return if we are at the end of the line either by not being able to fit more content or because of an explicit line break.
-        auto candidateContent = nextContentForLine(currentItemIndex, partialLeadingContentLength, line.lineBox().logicalWidth());
+        nextContentForLine(candidateContent, currentItemIndex, partialLeadingContentLength, line.lineBox().logicalWidth());
         if (candidateContent.hasIntrusiveFloats()) {
             // Add floats first because they shrink the available horizontal space for the rest of the content.
@@ -329 +339 @@
 }
 
-LineCandidateContent LineLayoutContext::nextContentForLine(unsigned inlineItemIndex, Optional<unsigned> partialLeadingContentLength, InlineLayoutUnit currentLogicalRight)
+void LineLayoutContext::nextContentForLine(LineCandidateContent& candidateContent, unsigned inlineItemIndex, Optional<unsigned> partialLeadingContentLength, InlineLayoutUnit currentLogicalRight)
 {
     ASSERT(inlineItemIndex < m_inlineItems.size());
+    candidateContent.reset();
     // 1. Simply add any overflow content from the previous line to the candidate content. It's always a text content.
     // 2. Find the next soft wrap position or explicit line break.
@@ -339 +350 @@
     ASSERT(softWrapOpportunityIndex <= m_inlineItems.size());
 
-    auto candidateContent = LineCandidateContent { };
     if (partialLeadingContentLength) {
         // Handle leading partial content first (split text from the previous line).
@@ -362 +372 @@
         currentLogicalRight += inlineItenmWidth;
     }
-    return candidateContent;
 }
 

trunk/Source/WebCore/layout/inlineformatting/LineLayoutContext.h

@@ -55 +55 @@
 
 private:
-    LineCandidateContent nextContentForLine(unsigned inlineItemIndex, Optional<unsigned> overflowLength, InlineLayoutUnit currentLogicalRight);
+    void nextContentForLine(LineCandidateContent&, unsigned inlineItemIndex, Optional<unsigned> overflowLength, InlineLayoutUnit currentLogicalRight);
     struct Result {
         LineBreaker::IsEndOfLine isEndOfLine { LineBreaker::IsEndOfLine::No };