Changeset 252932 in webkit

Timestamp:

Nov 28, 2019 12:06:49 PM (4 years ago)

Author:

Antti Koivisto

Message:

[LFC][IFC] Remove m_inlineRunToLineMap
​https://bugs.webkit.org/show_bug.cgi?id=204688

Reviewed by Zalan Bujtas.

Add line index to Display::Run and use it to locate the line it is on.

This is 4-5% progression in PerformanceTests/Layout/line-layout-simple.html

• layout/displaytree/DisplayRun.h:

(WebCore::Display::Run::lineIndex const):
(WebCore::Display::Run::Run):

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::setDisplayBoxesForLine):

• layout/inlineformatting/InlineFormattingState.h:

(WebCore::Layout::InlineFormattingState::lineBoxForRun const):
(WebCore::Layout::InlineFormattingState::addInlineRun):
(WebCore::Layout::InlineFormattingState::resetInlineRuns):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/displaytree/DisplayRun.h (modified) (3 diffs)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (2 diffs)
• layout/inlineformatting/InlineFormattingState.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-28  Antti Koivisto  <antti@apple.com>
+
+        [LFC][IFC] Remove m_inlineRunToLineMap
+        https://bugs.webkit.org/show_bug.cgi?id=204688
+
+        Reviewed by Zalan Bujtas.
+
+        Add line index to Display::Run and use it to locate the line it is on.
+
+        This is 4-5% progression in PerformanceTests/Layout/line-layout-simple.html
+
+        * layout/displaytree/DisplayRun.h:
+        (WebCore::Display::Run::lineIndex const):
+        (WebCore::Display::Run::Run):
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::setDisplayBoxesForLine):
+        * layout/inlineformatting/InlineFormattingState.h:
+        (WebCore::Layout::InlineFormattingState::lineBoxForRun const):
+        (WebCore::Layout::InlineFormattingState::addInlineRun):
+        (WebCore::Layout::InlineFormattingState::resetInlineRuns):
+
 2019-11-28  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/layout/displaytree/DisplayRun.h

@@ -68 +68 @@
     };
 
-    Run(const RenderStyle&, const Rect& logicalRect, Optional<TextContext> = WTF::nullopt);
+    Run(size_t lineIndex, const RenderStyle&, const Rect& logicalRect, Optional<TextContext> = WTF::nullopt);
+
+    size_t lineIndex() const { return m_lineIndex; }
 
     const Rect& logicalRect() const { return m_logicalRect; }
@@ -100 +102 @@
 private:
     // FIXME: Find out the Display::Run <-> paint style setup.
+    const size_t m_lineIndex;
     const RenderStyle& m_style;
     CachedImage* m_cachedImage { nullptr };
@@ -106 +109 @@
 };
 
-inline Run::Run(const RenderStyle& style, const Rect& logicalRect, Optional<TextContext> textContext)
-    : m_style(style)
+inline Run::Run(size_t lineIndex, const RenderStyle& style, const Rect& logicalRect, Optional<TextContext> textContext)
+    : m_lineIndex(lineIndex)
+    , m_style(style)
     , m_logicalRect(logicalRect)
     , m_textContext(textContext)

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

@@ -427 +427 @@
     }
 
+    auto lineIndex = formattingState.lineBoxes().size();
     formattingState.addLineBox(lineContent.lineBox);
-    auto& currentLine = *formattingState.lineBoxes().last();
+
     // Compute box final geometry.
     auto& lineRuns = lineContent.runList;
@@ -441 +442 @@
         auto initiatesInlineRun = !lineRun.isContainerStart() && !lineRun.isContainerEnd() && !lineRun.isCollapsedToVisuallyEmpty();
         if (initiatesInlineRun)
-            formattingState.addInlineRun(makeUnique<Display::Run>(lineRun.layoutBox().style(), lineRun.logicalRect(), lineRun.textContext()), currentLine);
+            formattingState.addInlineRun(makeUnique<Display::Run>(lineIndex, lineRun.layoutBox().style(), lineRun.logicalRect(), lineRun.textContext()));
 
         if (lineRun.isForcedLineBreak()) {

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

@@ -55 +55 @@
     const InlineRuns& inlineRuns() const { return m_inlineRuns; }
     InlineRuns& inlineRuns() { return m_inlineRuns; }
-    void addInlineRun(std::unique_ptr<Display::Run>&&, const LineBox&);
+    void addInlineRun(std::unique_ptr<Display::Run>&&);
     void resetInlineRuns();
 
@@ -62 +62 @@
     void addLineBox(const LineBox& lineBox) { m_lineBoxes.append(makeUnique<LineBox>(lineBox)); }
 
-    const LineBox& lineBoxForRun(const Display::Run& inlineRun) const { return *m_inlineRunToLineMap.get(&inlineRun); }
+    const LineBox& lineBoxForRun(const Display::Run& inlineRun) const { return *m_lineBoxes[inlineRun.lineIndex()]; }
 
 private:
@@ -68 +68 @@
     InlineRuns m_inlineRuns;
     LineBoxes m_lineBoxes;
-    // This is temporary until after we figure out the display run/line relationships.
-    HashMap<const Display::Run*, const LineBox*> m_inlineRunToLineMap;
 };
 
-inline void InlineFormattingState::addInlineRun(std::unique_ptr<Display::Run>&& displayRun, const LineBox& line)
+inline void InlineFormattingState::addInlineRun(std::unique_ptr<Display::Run>&& displayRun)
 {
-    m_inlineRunToLineMap.set(displayRun.get(), &line);
     m_inlineRuns.append(WTFMove(displayRun));
 }
@@ -83 +80 @@
     // Resetting the runs means no more line boxes either.
     m_lineBoxes.clear();
-    m_inlineRunToLineMap.clear();
 
 }