Changeset 269770 in webkit

Timestamp:

Nov 13, 2020 4:18:39 AM (3 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Minor rename and cleanup in InlineContentBuilder
​https://bugs.webkit.org/show_bug.cgi?id=218883

Reviewed by Antti Koivisto.

• layout/integration/LayoutIntegrationInlineContentBuilder.cpp:

(WebCore::LayoutIntegration::InlineContentBuilder::build const):
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLineRuns const):
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
(WebCore::LayoutIntegration::InlineContentBuilder::constructDisplayLineRuns const): Deleted.
(WebCore::LayoutIntegration::InlineContentBuilder::constructDisplayLines const): Deleted.

• layout/integration/LayoutIntegrationInlineContentBuilder.h:
• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::constructContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationInlineContentBuilder.cpp (modified) (3 diffs)
• layout/integration/LayoutIntegrationInlineContentBuilder.h (modified) (2 diffs)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-13  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Minor rename and cleanup in InlineContentBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=218883
+
+        Reviewed by Antti Koivisto.
+
+        * layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
+        (WebCore::LayoutIntegration::InlineContentBuilder::build const):
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLineRuns const):
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
+        (WebCore::LayoutIntegration::InlineContentBuilder::constructDisplayLineRuns const): Deleted.
+        (WebCore::LayoutIntegration::InlineContentBuilder::constructDisplayLines const): Deleted.
+        * layout/integration/LayoutIntegrationInlineContentBuilder.h:
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::constructContent):
+
 2020-11-13  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp

@@ -66 +66 @@
 }
 
-void InlineContentBuilder::build(InlineContent& inlineContent, const Layout::InlineFormattingState& inlineFormattingState) const
+void InlineContentBuilder::build(const Layout::InlineFormattingState& inlineFormattingState, InlineContent& inlineContent) const
 {
     auto lineLevelVisualAdjustmentsForRuns = computeLineLevelVisualAdjustmentsForRuns(inlineFormattingState);
-    constructDisplayLineRuns(inlineContent, inlineFormattingState, lineLevelVisualAdjustmentsForRuns);
-    constructDisplayLines(inlineContent, inlineFormattingState, lineLevelVisualAdjustmentsForRuns);
+    createDisplayLineRuns(inlineFormattingState, inlineContent, lineLevelVisualAdjustmentsForRuns);
+    createDisplayLines(inlineFormattingState, inlineContent, lineLevelVisualAdjustmentsForRuns);
 }
 
@@ -107 +107 @@
 }
 
-void InlineContentBuilder::constructDisplayLineRuns(InlineContent& inlineContent, const Layout::InlineFormattingState& inlineFormattingState, const LineLevelVisualAdjustmentsForRunsList& lineLevelVisualAdjustmentsForRuns) const
+void InlineContentBuilder::createDisplayLineRuns(const Layout::InlineFormattingState& inlineFormattingState, InlineContent& inlineContent, const LineLevelVisualAdjustmentsForRunsList& lineLevelVisualAdjustmentsForRuns) const
 {
     auto& runList = inlineFormattingState.lineRuns();
@@ -196 +196 @@
 }
 
-void InlineContentBuilder::constructDisplayLines(InlineContent& inlineContent, const Layout::InlineFormattingState& inlineFormattingState, const LineLevelVisualAdjustmentsForRunsList& lineLevelVisualAdjustmentsForRuns) const
+void InlineContentBuilder::createDisplayLines(const Layout::InlineFormattingState& inlineFormattingState, InlineContent& inlineContent, const LineLevelVisualAdjustmentsForRunsList& lineLevelVisualAdjustmentsForRuns) const
 {
     auto& lines = inlineFormattingState.lines();

trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h

@@ -46 +46 @@
     InlineContentBuilder(const Layout::LayoutState&, const RenderBlockFlow&);
 
-    void build(InlineContent&, const Layout::InlineFormattingState&) const;
+    void build(const Layout::InlineFormattingState&, InlineContent&) const;
 
 private:
@@ -52 +52 @@
 
     LineLevelVisualAdjustmentsForRunsList computeLineLevelVisualAdjustmentsForRuns(const Layout::InlineFormattingState&) const;
-    void constructDisplayLineRuns(InlineContent&, const Layout::InlineFormattingState&, const LineLevelVisualAdjustmentsForRunsList&) const;
-    void constructDisplayLines(InlineContent&, const Layout::InlineFormattingState&, const LineLevelVisualAdjustmentsForRunsList&) const;
+    void createDisplayLineRuns(const Layout::InlineFormattingState&, InlineContent&, const LineLevelVisualAdjustmentsForRunsList&) const;
+    void createDisplayLines(const Layout::InlineFormattingState&, InlineContent&, const LineLevelVisualAdjustmentsForRunsList&) const;
 
     const Layout::LayoutState& m_layoutState;

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -147 +147 @@
 {
     auto inlineContentBuilder = InlineContentBuilder { m_layoutState, flow() };
-    inlineContentBuilder.build(ensureInlineContent(), m_inlineFormattingState);
+    inlineContentBuilder.build(m_inlineFormattingState, ensureInlineContent());
     ASSERT(m_inlineContent);