Diff
Modified: trunk/Source/WebCore/ChangeLog (269769 => 269770)
--- trunk/Source/WebCore/ChangeLog 2020-11-13 12:07:38 UTC (rev 269769)
+++ trunk/Source/WebCore/ChangeLog 2020-11-13 12:18:39 UTC (rev 269770)
@@ -1,5 +1,22 @@
2020-11-13 Zalan Bujtas <[email protected]>
+ [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 <[email protected]>
+
[LFC][Integration] Decouple box and text run construction
https://bugs.webkit.org/show_bug.cgi?id=218882
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp (269769 => 269770)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp 2020-11-13 12:07:38 UTC (rev 269769)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp 2020-11-13 12:18:39 UTC (rev 269770)
@@ -65,11 +65,11 @@
{
}
-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);
}
InlineContentBuilder::LineLevelVisualAdjustmentsForRunsList InlineContentBuilder::computeLineLevelVisualAdjustmentsForRuns(const Layout::InlineFormattingState& inlineFormattingState) const
@@ -106,7 +106,7 @@
return lineLevelVisualAdjustmentsForRuns;
}
-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();
if (runList.isEmpty())
@@ -195,7 +195,7 @@
}
}
-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();
auto& lineBoxes = inlineFormattingState.lineBoxes();
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h (269769 => 269770)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h 2020-11-13 12:07:38 UTC (rev 269769)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h 2020-11-13 12:18:39 UTC (rev 269770)
@@ -45,14 +45,14 @@
public:
InlineContentBuilder(const Layout::LayoutState&, const RenderBlockFlow&);
- void build(InlineContent&, const Layout::InlineFormattingState&) const;
+ void build(const Layout::InlineFormattingState&, InlineContent&) const;
private:
using LineLevelVisualAdjustmentsForRunsList = Vector<LineLevelVisualAdjustmentsForRuns>;
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;
const RenderBlockFlow& m_blockFlow;
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (269769 => 269770)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp 2020-11-13 12:07:38 UTC (rev 269769)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp 2020-11-13 12:18:39 UTC (rev 269770)
@@ -146,7 +146,7 @@
void LineLayout::constructContent()
{
auto inlineContentBuilder = InlineContentBuilder { m_layoutState, flow() };
- inlineContentBuilder.build(ensureInlineContent(), m_inlineFormattingState);
+ inlineContentBuilder.build(m_inlineFormattingState, ensureInlineContent());
ASSERT(m_inlineContent);
for (auto& run : m_inlineContent->runs) {
