<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281905] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281905">281905</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-09-01 18:33:01 -0700 (Wed, 01 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Do not generate integration runs out of IFC's display runs
https://bugs.webkit.org/show_bug.cgi?id=229719

Reviewed by Antti Koivisto.

Integration runs and IFC display runs hold the exact same set of data, so let's not duplicate then for the integration layer.

* WebCore.xcodeproj/project.pbxproj:
* display/css/DisplayTextBox.cpp:
(WebCore::Display::TextBox::debugDescription const):
* layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::build):
(WebCore::Layout::InlineDisplayContentBuilder::createRunsAndUpdateGeometryForLineSpanningInlineBoxes):
* layout/formattingContexts/inline/InlineLineRun.h:
(WebCore::Layout::Run::Text::originalContent const):
(WebCore::Layout::Run::Text::renderedContent const):
(WebCore::Layout::Run::setVerticalPositionIntegral):
* layout/formattingContexts/inline/InlineRect.h:
(WebCore::Layout::InlineRect::InlineRect):
* layout/integration/LayoutIntegrationInlineContent.h:
* layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
(WebCore::LayoutIntegration::InlineContentBuilder::build const):
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayRuns const):
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
* layout/integration/LayoutIntegrationInlineContentBuilder.h:
* layout/integration/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::paintTextRunUsingPhysicalCoordinates):
* layout/integration/LayoutIntegrationPagination.cpp:
(WebCore::LayoutIntegration::makeAdjustedContent):
* layout/integration/LayoutIntegrationRun.h: Removed.
* rendering/TextPainter.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreHeaderscmake">trunk/Source/WebCore/Headers.cmake</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredisplaycssDisplayBoxPaintercpp">trunk/Source/WebCore/display/css/DisplayBoxPainter.cpp</a></li>
<li><a href="#trunkSourceWebCoredisplaycssDisplayTextBoxcpp">trunk/Source/WebCore/display/css/DisplayTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineDisplayContentBuildercpp">trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineLineRunh">trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineRun.h</a></li>
<li><a href="#trunkSourceWebCorelayoutformattingContextsinlineInlineRecth">trunk/Source/WebCore/layout/formattingContexts/inline/InlineRect.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContenth">trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContent.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuildercpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuilderh">trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationPaginationcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintercpp">trunk/Source/WebCore/rendering/TextPainter.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationRunh">trunk/Source/WebCore/layout/integration/LayoutIntegrationRun.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/ChangeLog      2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2021-09-01  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Do not generate integration runs out of IFC's display runs
+        https://bugs.webkit.org/show_bug.cgi?id=229719
+
+        Reviewed by Antti Koivisto.
+
+        Integration runs and IFC display runs hold the exact same set of data, so let's not duplicate then for the integration layer.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * display/css/DisplayTextBox.cpp:
+        (WebCore::Display::TextBox::debugDescription const):
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::build):
+        (WebCore::Layout::InlineDisplayContentBuilder::createRunsAndUpdateGeometryForLineSpanningInlineBoxes):
+        * layout/formattingContexts/inline/InlineLineRun.h:
+        (WebCore::Layout::Run::Text::originalContent const):
+        (WebCore::Layout::Run::Text::renderedContent const):
+        (WebCore::Layout::Run::setVerticalPositionIntegral):
+        * layout/formattingContexts/inline/InlineRect.h:
+        (WebCore::Layout::InlineRect::InlineRect):
+        * layout/integration/LayoutIntegrationInlineContent.h:
+        * layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
+        (WebCore::LayoutIntegration::InlineContentBuilder::build const):
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayRuns const):
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
+        * layout/integration/LayoutIntegrationInlineContentBuilder.h:
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::paintTextRunUsingPhysicalCoordinates):
+        * layout/integration/LayoutIntegrationPagination.cpp:
+        (WebCore::LayoutIntegration::makeAdjustedContent):
+        * layout/integration/LayoutIntegrationRun.h: Removed.
+        * rendering/TextPainter.cpp:
+
</ins><span class="cx"> 2021-09-01  Marcos Caceres  <marcos@marcosc.com>
</span><span class="cx"> 
</span><span class="cx">         Add "payment" permissions policy
</span></span></pre></div>
<a id="trunkSourceWebCoreHeaderscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Headers.cmake (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Headers.cmake       2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/Headers.cmake  2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -768,6 +768,7 @@
</span><span class="cx">     layout/LayoutUnits.h
</span><span class="cx">     layout/MarginTypes.h
</span><span class="cx"> 
</span><ins>+    layout/formattingContexts/inline/InlineLineRun.h
</ins><span class="cx">     layout/formattingContexts/inline/InlineRect.h
</span><span class="cx"> 
</span><span class="cx">     layout/integration/LayoutIntegrationInlineContent.h
</span><span class="lines">@@ -775,7 +776,6 @@
</span><span class="cx">     layout/integration/LayoutIntegrationLineIterator.h
</span><span class="cx">     layout/integration/LayoutIntegrationLineIteratorLegacyPath.h
</span><span class="cx">     layout/integration/LayoutIntegrationLineIteratorModernPath.h
</span><del>-    layout/integration/LayoutIntegrationRun.h
</del><span class="cx">     layout/integration/LayoutIntegrationRunIterator.h
</span><span class="cx">     layout/integration/LayoutIntegrationRunIteratorLegacyPath.h
</span><span class="cx">     layout/integration/LayoutIntegrationRunIteratorModernPath.h
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj   2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj      2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -2176,7 +2176,6 @@
</span><span class="cx">          6FB7D2DE250FD82E000207AA /* FlexFormattingState.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FB7D2DA250FD7FC000207AA /* FlexFormattingState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6FC3F9472516756700A49BEA /* InlineLineRun.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FC3F9452516756600A49BEA /* InlineLineRun.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6FCBDB97265DF2C80021EA7B /* LayoutContainingBlockChainIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FCBDB95265DF2C70021EA7B /* LayoutContainingBlockChainIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-               6FCE1A1A22618ABD004F0343 /* LayoutIntegrationRun.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FCE1A1822618AB3004F0343 /* LayoutIntegrationRun.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">           6FD09543251115220098877D /* LayoutGeometryRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FD09541251115220098877D /* LayoutGeometryRect.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6FE198172178397C00446F08 /* InlineContentBreaker.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FE198152178397C00446F08 /* InlineContentBreaker.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6FE636E82647962900F0951E /* InlineFormattingQuirks.h in Headers */ = {isa = PBXBuildFile; fileRef = 6FE636E72647962900F0951E /* InlineFormattingQuirks.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -10060,7 +10059,6 @@
</span><span class="cx">          6FC5CA9522E3599400B13E11 /* TableFormattingContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TableFormattingContext.h; sourceTree = "<group>"; };
</span><span class="cx">          6FC5CA9622E3599500B13E11 /* TableFormattingState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TableFormattingState.h; sourceTree = "<group>"; };
</span><span class="cx">          6FCBDB95265DF2C70021EA7B /* LayoutContainingBlockChainIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutContainingBlockChainIterator.h; sourceTree = "<group>"; };
</span><del>-               6FCE1A1822618AB3004F0343 /* LayoutIntegrationRun.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LayoutIntegrationRun.h; sourceTree = "<group>"; };
</del><span class="cx">           6FD09541251115220098877D /* LayoutGeometryRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutGeometryRect.h; sourceTree = "<group>"; };
</span><span class="cx">          6FE198132178397B00446F08 /* InlineContentBreaker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InlineContentBreaker.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6FE198152178397C00446F08 /* InlineContentBreaker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineContentBreaker.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -29070,7 +29068,6 @@
</span><span class="cx">                          E4ABABDB236088FD00FA4345 /* LayoutIntegrationLineLayout.h */,
</span><span class="cx">                          E4312AB524B3265600678349 /* LayoutIntegrationPagination.cpp */,
</span><span class="cx">                          E4312AB724B3265600678349 /* LayoutIntegrationPagination.h */,
</span><del>-                               6FCE1A1822618AB3004F0343 /* LayoutIntegrationRun.h */,
</del><span class="cx">                           E4A664C72521B779007081DC /* LayoutIntegrationRunIterator.cpp */,
</span><span class="cx">                          E4A664C62521B778007081DC /* LayoutIntegrationRunIterator.h */,
</span><span class="cx">                          E4A664C52521B778007081DC /* LayoutIntegrationRunIteratorLegacyPath.h */,
</span><span class="lines">@@ -33521,7 +33518,6 @@
</span><span class="cx">                          E4D33F46252C50FC00837D05 /* LayoutIntegrationLineIteratorModernPath.h in Headers */,
</span><span class="cx">                          E4ABABDD236088FE00FA4345 /* LayoutIntegrationLineLayout.h in Headers */,
</span><span class="cx">                          E403B7A3251B11C10019E800 /* LayoutIntegrationPagination.h in Headers */,
</span><del>-                               6FCE1A1A22618ABD004F0343 /* LayoutIntegrationRun.h in Headers */,
</del><span class="cx">                           E4A664CC2521D4AF007081DC /* LayoutIntegrationRunIterator.h in Headers */,
</span><span class="cx">                          E4A664CF2521D4E2007081DC /* LayoutIntegrationRunIteratorLegacyPath.h in Headers */,
</span><span class="cx">                          E4A664CE2521D4C9007081DC /* LayoutIntegrationRunIteratorModernPath.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoredisplaycssDisplayBoxPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/display/css/DisplayBoxPainter.cpp (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/display/css/DisplayBoxPainter.cpp   2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/display/css/DisplayBoxPainter.cpp      2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">         auto baseline = textRect.y() + style.fontMetrics().ascent();
</span><span class="cx">         auto expansion = textBox.expansion();
</span><span class="cx"> 
</span><del>-        auto textRun = TextRun { textBox.text().originalContent().substring(textBox.text().start(), textBox.text().length()), textRect.x(), expansion.horizontalExpansion, expansion.behavior };
</del><ins>+        auto textRun = TextRun { textBox.text().originalContent(), textRect.x(), expansion.horizontalExpansion, expansion.behavior };
</ins><span class="cx">         textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><span class="cx">         paintingContext.context.drawText(style.fontCascade(), textRun, { textRect.x(), baseline });
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoredisplaycssDisplayTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/display/css/DisplayTextBox.cpp (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/display/css/DisplayTextBox.cpp      2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/display/css/DisplayTextBox.cpp 2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     TextStream stream;
</span><span class="cx"> 
</span><span class="cx">     stream << boxName() << " " << absoluteBoxRect() << " (" << this << ")";
</span><del>-    auto textContent = text().originalContent().substring(text().start(), text().length());
</del><ins>+    auto textContent = text().originalContent().substring(text().start(), text().length()).toString();
</ins><span class="cx">     textContent.replaceWithLiteral('\\', "\\\\");
</span><span class="cx">     textContent.replaceWithLiteral('\n', "\\n");
</span><span class="cx">     const size_t maxPrintedLength = 80;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineDisplayContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp    2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp       2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Layout {
</span><span class="cx"> 
</span><ins>+#define ALLOW_ROOT_AND_LINE_SPANNING_INLINE_BOX 0
</ins><span class="cx"> 
</span><span class="cx"> InlineDisplayContentBuilder::InlineDisplayContentBuilder(const ContainerBox& formattingContextRoot, InlineFormattingState& formattingState)
</span><span class="cx">     : m_formattingContextRoot(formattingContextRoot)
</span><span class="lines">@@ -47,11 +48,12 @@
</span><span class="cx"> void InlineDisplayContentBuilder::build(const LineBuilder::LineContent& lineContent, const LineBox& lineBox, const InlineLayoutPoint& lineBoxLogicalTopLeft, const size_t lineIndex)
</span><span class="cx"> {
</span><span class="cx">     auto& formattingState = this->formattingState();
</span><ins>+#if ALLOW_ROOT_AND_LINE_SPANNING_INLINE_BOX
</ins><span class="cx">     // Every line starts with a root run, even the empty ones.
</span><span class="cx">     auto rootInlineBoxRect = lineBox.logicalRectForRootInlineBox();
</span><span class="cx">     rootInlineBoxRect.moveBy(lineBoxLogicalTopLeft);
</span><span class="cx">     formattingState.addRun({ lineIndex, Run::Type::RootInlineBox, root(), rootInlineBoxRect, rootInlineBoxRect, { }, { },  lineBox.rootInlineBox().hasContent()});
</span><del>-
</del><ins>+#endif
</ins><span class="cx">     // Spanning inline boxes start at the very beginning of the line.
</span><span class="cx">     auto lineSpanningInlineBoxIndex = formattingState.runs().size();
</span><span class="cx">     createRunsAndUpdateGeometryForLineContent(lineContent, lineBox, lineBoxLogicalTopLeft, lineIndex);
</span><span class="lines">@@ -181,7 +183,7 @@
</span><span class="cx">     formattingState.lines().last().setNeedsIntegralPosition(lineNeedIntegralPosition);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InlineDisplayContentBuilder::createRunsAndUpdateGeometryForLineSpanningInlineBoxes(const LineBox& lineBox, const InlineLayoutPoint& lineBoxLogicalTopLeft, const size_t lineIndex, size_t lineSpanningInlineBoxIndex)
</del><ins>+void InlineDisplayContentBuilder::createRunsAndUpdateGeometryForLineSpanningInlineBoxes(const LineBox& lineBox, const InlineLayoutPoint& lineBoxLogicalTopLeft, const size_t /*lineIndex*/, size_t /*lineSpanningInlineBoxIndex*/)
</ins><span class="cx"> {
</span><span class="cx">     if (!lineBox.hasContent()) {
</span><span class="cx">         // When a spanning inline box (e.g. <div>text<span><br></span></div>) lands on an empty line
</span><span class="lines">@@ -202,8 +204,9 @@
</span><span class="cx">         auto inlineBoxBorderBox = lineBox.logicalBorderBoxForInlineBox(layoutBox, boxGeometry);
</span><span class="cx">         inlineBoxBorderBox.moveBy(lineBoxLogicalTopLeft);
</span><span class="cx"> 
</span><ins>+#if ALLOW_ROOT_AND_LINE_SPANNING_INLINE_BOX
</ins><span class="cx">         formattingState.runs().insert(lineSpanningInlineBoxIndex++, { lineIndex, Run::Type::NonRootInlineBox, layoutBox, inlineBoxBorderBox, inlineBoxBorderBox, { }, { }, inlineLevelBox.hasContent(), true });
</span><del>-
</del><ins>+#endif
</ins><span class="cx">         auto inlineBoxSize = LayoutSize { LayoutUnit::fromFloatCeil(inlineBoxBorderBox.width()), LayoutUnit::fromFloatCeil(inlineBoxBorderBox.height()) };
</span><span class="cx">         auto logicalRect = Rect { LayoutPoint { inlineBoxBorderBox.topLeft() }, inlineBoxSize };
</span><span class="cx">         // Middle or end of the inline box. Let's stretch the box as needed.
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineLineRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineRun.h (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineRun.h    2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineRun.h       2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx">         size_t start() const { return m_start; }
</span><span class="cx">         size_t end() const { return start() + length(); }
</span><span class="cx">         size_t length() const { return m_length; }
</span><del>-        String originalContent() const { return m_originalContent; }
-        String renderedContent() const { return m_adjustedContentToRender; }
</del><ins>+        StringView originalContent() const { return StringView(m_originalContent).substring(m_start, m_length); }
+        StringView renderedContent() const { return m_adjustedContentToRender.isNull() ? originalContent() : m_adjustedContentToRender; }
</ins><span class="cx"> 
</span><span class="cx">         bool hasHyphen() const { return m_hasHyphen; }
</span><span class="cx"> 
</span><span class="lines">@@ -111,6 +111,8 @@
</span><span class="cx"> 
</span><span class="cx">     size_t lineIndex() const { return m_lineIndex; }
</span><span class="cx"> 
</span><ins>+    void setVerticalPositionIntegral();
+
</ins><span class="cx"> private:
</span><span class="cx">     const size_t m_lineIndex;
</span><span class="cx">     const Type m_type;
</span><span class="lines">@@ -146,6 +148,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+inline void Run::setVerticalPositionIntegral()
+{
+    m_logicalRect.setTop(roundToInt(m_logicalRect.top()));
+    m_inkOverflow.setTop(roundToInt(m_inkOverflow.top()));
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutformattingContextsinlineInlineRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineRect.h (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineRect.h       2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineRect.h  2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">     InlineRect(InlineLayoutUnit top, InlineLayoutUnit left, InlineLayoutUnit width, InlineLayoutUnit height);
</span><span class="cx">     InlineRect(const InlineLayoutPoint& topLeft, InlineLayoutUnit width, InlineLayoutUnit height);
</span><span class="cx">     InlineRect(const InlineLayoutPoint& topLeft, const InlineLayoutSize&);
</span><ins>+    InlineRect(const FloatRect&);
</ins><span class="cx">     
</span><span class="cx">     InlineLayoutUnit top() const;
</span><span class="cx">     InlineLayoutUnit left() const;
</span><span class="lines">@@ -114,6 +115,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+inline InlineRect::InlineRect(const FloatRect& rect)
+    : InlineRect(rect.y(), rect.x(), rect.width(), rect.height())
+{
+}
+
</ins><span class="cx"> #if ASSERT_ENABLED
</span><span class="cx"> inline void InlineRect::invalidatePosition()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContent.h (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContent.h 2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContent.h    2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><ins>+#include "InlineLineRun.h"
</ins><span class="cx"> #include "LayoutIntegrationLine.h"
</span><del>-#include "LayoutIntegrationRun.h"
</del><span class="cx"> #include <wtf/IteratorRange.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> class RunIterator;
</span><span class="cx"> class TextRunIterator;
</span><span class="cx"> 
</span><ins>+using Run = Layout::Run;
+
</ins><span class="cx"> struct InlineContent : public RefCounted<InlineContent> {
</span><span class="cx">     static Ref<InlineContent> create(const LineLayout& lineLayout) { return adoptRef(*new InlineContent(lineLayout)); }
</span><span class="cx">     ~InlineContent();
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp        2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp   2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><span class="cx"> #include "InlineFormattingState.h"
</span><ins>+#include "InlineLineRun.h"
</ins><span class="cx"> #include "LayoutBoxGeometry.h"
</span><span class="cx"> #include "LayoutIntegrationBoxTree.h"
</span><span class="cx"> #include "LayoutIntegrationInlineContent.h"
</span><del>-#include "LayoutIntegrationRun.h"
</del><span class="cx"> #include "LayoutReplacedBox.h"
</span><span class="cx"> #include "LayoutState.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="lines">@@ -65,38 +65,36 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InlineContentBuilder::build(const Layout::InlineFormattingState& inlineFormattingState, InlineContent& inlineContent) const
</del><ins>+void InlineContentBuilder::build(Layout::InlineFormattingState& inlineFormattingState, InlineContent& inlineContent) const
</ins><span class="cx"> {
</span><del>-    createDisplayRuns(inlineFormattingState.runs(), inlineContent);
</del><ins>+    createDisplayRuns(inlineFormattingState, inlineContent);
</ins><span class="cx">     createDisplayLines(inlineFormattingState.lines(), inlineContent);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InlineContentBuilder::createDisplayRuns(const Layout::InlineRuns& runs, InlineContent& inlineContent) const
</del><ins>+void InlineContentBuilder::createDisplayRuns(Layout::InlineFormattingState& inlineFormattingState, InlineContent& inlineContent) const
</ins><span class="cx"> {
</span><del>-    if (runs.isEmpty())
-        return;
-
-    inlineContent.runs.reserveInitialCapacity(runs.size());
-    for (auto& run : runs) {
-        if (auto text = run.text()) {
-            inlineContent.runs.append({ run.lineIndex(), run.layoutBox(), run.logicalRect(), run.inkOverflow(), Run::Expansion { run.expansion().behavior, run.expansion().horizontalExpansion }
-                , Run::Text { text->start(), text->length(), text->originalContent(), text->renderedContent(), text->hasHyphen() } });
-        } else if (!run.isRootInlineBox()) {
-            // FIXME: Teach the run iterators to ignore the root inline box runs.
-            auto& geometry = m_layoutState.geometryForBox(run.layoutBox());
-            if (!run.isInlineBox() || !run.isLineSpanning()) {
-                // FIXME: Run iterators with (text)runs spanning over multiple lines expect no "in-between" runs (e.g. line spanning or root inline boxes).
-                inlineContent.runs.append({ run.lineIndex(), run.layoutBox(), run.logicalRect(), run.inkOverflow(), { }, { } });
-            }
-            if (run.isInlineBox()) {
-                auto hasScrollableContent = [&] {
-                    // In standards mode, inline boxes always start with an imaginary strut.
-                    return m_layoutState.inStandardsMode() || run.hasContent() || geometry.horizontalBorder() || (geometry.horizontalPadding() && geometry.horizontalPadding().value());
-                };
-                inlineContent.nonRootInlineBoxes.append({ run.lineIndex(), run.layoutBox(), run.logicalRect(), hasScrollableContent() });
-            }
</del><ins>+    // FIXME: Remove this loop when we transitioned to the "run only" setup (i.e. each inline box is represented as a run as well)
+    auto& lineBoxes = const_cast<Layout::InlineFormattingState&>(inlineFormattingState).lineBoxes();
+    for (size_t lineIndex = 0; lineIndex < lineBoxes.size(); ++lineIndex) {
+        auto& lineBox = lineBoxes[lineIndex];
+        auto lineBoxLogicalTopLeft = inlineFormattingState.lines()[lineIndex].lineBoxLogicalRect().topLeft();
+        for (auto& nonRootInlineLevelBox : lineBox.nonRootInlineLevelBoxes()) {
+            if (!nonRootInlineLevelBox.isInlineBox())
+                continue;
+            auto& layoutBox = nonRootInlineLevelBox.layoutBox();
+            auto& boxGeometry = inlineFormattingState.boxGeometry(layoutBox);
+            auto hasScrollableContent = [&] {
+                // In standards mode, inline boxes always start with an imaginary strut.
+                return m_layoutState.inStandardsMode() || nonRootInlineLevelBox.hasContent() || boxGeometry.horizontalBorder() || (boxGeometry.horizontalPadding() && boxGeometry.horizontalPadding().value());
+            };
+            // Inline boxes may or may not be wrapped and have runs on multiple lines (e.g. <span>first line<br>second line<br>third line</span>)
+            auto inlineBoxBorderBox = lineBox.logicalBorderBoxForInlineBox(layoutBox, boxGeometry);
+            inlineBoxBorderBox.moveBy(lineBoxLogicalTopLeft);
+            inlineContent.nonRootInlineBoxes.append({ lineIndex, layoutBox, inlineBoxBorderBox, hasScrollableContent() });
</ins><span class="cx">         }
</span><span class="cx">     }
</span><ins>+    // FIXME: This might need a different approach with partial layout where the layout code needs to know about the runs.
+    inlineContent.runs = WTFMove(inlineFormattingState.runs());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void InlineContentBuilder::createDisplayLines(const Layout::InlineLines& lines, InlineContent& inlineContent) const
</span><span class="lines">@@ -131,11 +129,11 @@
</span><span class="cx">             auto runLogicalRect = run.logicalRect();
</span><span class="cx">             if (!box.hasSelfPaintingLayer()) {
</span><span class="cx">                 auto childInkOverflow = box.logicalVisualOverflowRectForPropagation(&box.parent()->style());
</span><del>-                childInkOverflow.move(runLogicalRect.x(), runLogicalRect.y());
</del><ins>+                childInkOverflow.move(runLogicalRect.left(), runLogicalRect.top());
</ins><span class="cx">                 lineInkOverflowRect.unite(childInkOverflow);
</span><span class="cx">             }
</span><span class="cx">             auto childScrollableOverflow = box.logicalLayoutOverflowRectForPropagation(&box.parent()->style());
</span><del>-            childScrollableOverflow.move(runLogicalRect.x(), runLogicalRect.y());
</del><ins>+            childScrollableOverflow.move(runLogicalRect.left(), runLogicalRect.top());
</ins><span class="cx">             scrollableOverflowRect.unite(childScrollableOverflow);
</span><span class="cx">         }
</span><span class="cx">         // Collect scrollable overflow from inline boxes. All other inline level boxes (e.g atomic inline level boxes) stretch the line.
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h  2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h     2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -43,10 +43,10 @@
</span><span class="cx"> public:
</span><span class="cx">     InlineContentBuilder(const Layout::LayoutState&, const RenderBlockFlow&, const BoxTree&);
</span><span class="cx"> 
</span><del>-    void build(const Layout::InlineFormattingState&, InlineContent&) const;
</del><ins>+    void build(Layout::InlineFormattingState&, InlineContent&) const;
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void createDisplayRuns(const Layout::InlineRuns&, InlineContent&) const;
</del><ins>+    void createDisplayRuns(Layout::InlineFormattingState&, InlineContent&) const;
</ins><span class="cx">     void createDisplayLines(const Layout::InlineLines&, InlineContent&) const;
</span><span class="cx"> 
</span><span class="cx">     const Layout::LayoutState& m_layoutState;
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp  2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp     2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -563,11 +563,11 @@
</span><span class="cx">         physicalPaintOffset.move({ 0, -run.logicalRect().height() });
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    auto physicalRect = [&](const auto& rect) {
</del><ins>+    auto physicalRect = [&](const auto& rect) -> FloatRect {
</ins><span class="cx">         if (!style.isFlippedBlocksWritingMode())
</span><span class="cx">             return rect;
</span><span class="cx">         if (!blockIsHorizontalWriting)
</span><del>-            return FloatRect { formattingContextRoot.width() - rect.maxY(), rect.x() , rect.width(), rect.height() };
</del><ins>+            return FloatRect { formattingContextRoot.width() - rect.bottom(), rect.left() , rect.width(), rect.height() };
</ins><span class="cx">         ASSERT_NOT_IMPLEMENTED_YET();
</span><span class="cx">         return rect;
</span><span class="cx">     };
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx">     // TextRun expects the xPos to be adjusted with the aligment offset (e.g. when the line is center aligned
</span><span class="cx">     // and the run starts at 100px, due to the horizontal aligment, the xpos is supposed to be at 0px).
</span><span class="cx">     auto& fontCascade = style.fontCascade();
</span><del>-    auto xPos = run.logicalRect().x() - (line.lineBoxLeft() + line.contentLeft());
</del><ins>+    auto xPos = run.logicalRect().left() - (line.lineBoxLeft() + line.contentLeft());
</ins><span class="cx">     auto textRun = WebCore::TextRun { textContent.renderedContent(), xPos, expansion.horizontalExpansion, expansion.behavior };
</span><span class="cx">     textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationPaginationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp  2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp     2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -144,6 +144,7 @@
</span><span class="cx">     {
</span><span class="cx">         return Run {
</span><span class="cx">             run.lineIndex(),
</span><ins>+            run.type(),
</ins><span class="cx">             run.layoutBox(),
</span><span class="cx">             moveVertically(run.logicalRect(), offset),
</span><span class="cx">             moveVertically(run.inkOverflow(), offset),
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationRunh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/layout/integration/LayoutIntegrationRun.h (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationRun.h   2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationRun.h      2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -1,124 +0,0 @@
</span><del>-/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-
-#include "InlineRect.h"
-#include "LayoutBox.h"
-#include "RenderStyle.h"
-#include "TextFlags.h"
-
-namespace WebCore {
-
-class CachedImage;
-
-namespace LayoutIntegration {
-
-struct Run {
-    WTF_MAKE_STRUCT_FAST_ALLOCATED;
-    struct Text {
-        WTF_MAKE_STRUCT_FAST_ALLOCATED;
-    public:
-        Text(size_t position, size_t length, const String&, String adjustedContentToRender, bool hasHyphen);
-
-        size_t start() const { return m_start; }
-        size_t end() const { return start() + length(); }
-        size_t length() const { return m_length; }
-        StringView originalContent() const { return StringView(m_originalContent).substring(m_start, m_length); }
-        StringView renderedContent() const { return m_adjustedContentToRender.isNull() ? originalContent() : m_adjustedContentToRender; }
-        bool hasHyphen() const { return m_hasHyphen; }
-
-    private:
-        size_t m_start { 0 };
-        size_t m_length { 0 };
-        bool m_hasHyphen { false };
-        String m_originalContent;
-        String m_adjustedContentToRender;
-    };
-
-    struct Expansion;
-    Run(size_t lineIndex, const Layout::Box&, const FloatRect&, const FloatRect& inkOverflow, Expansion, std::optional<Text> = std::nullopt);
-
-    const FloatRect& logicalRect() const { return m_rect; }
-    const FloatRect& inkOverflow() const { return m_inkOverflow; }
-
-    void setVerticalPositionIntegral();
-
-    std::optional<Text>& text() { return m_text; }
-    const std::optional<Text>& text() const { return m_text; }
-    // FIXME: This information should be preserved at Run construction time.
-    bool isLineBreak() const { return layoutBox().isLineBreakBox() || (text() && text()->originalContent() == "\n" && style().preserveNewline()); }
-
-    struct Expansion {
-        ExpansionBehavior behavior { DefaultExpansion };
-        Layout::InlineLayoutUnit horizontalExpansion { 0 };
-    };
-    Expansion expansion() const { return m_expansion; }
-
-    const Layout::Box& layoutBox() const { return *m_layoutBox; }
-    const RenderStyle& style() const { return m_layoutBox->style(); }
-
-    size_t lineIndex() const { return m_lineIndex; }
-
-private:
-    // FIXME: Find out the Display::Run <-> paint style setup.
-    const size_t m_lineIndex;
-    WeakPtr<const Layout::Box> m_layoutBox;
-    FloatRect m_rect;
-    FloatRect m_inkOverflow;
-    Expansion m_expansion;
-    std::optional<Text> m_text;
-};
-
-inline Run::Run(size_t lineIndex, const Layout::Box& layoutBox, const FloatRect& rect, const FloatRect& inkOverflow, Expansion expansion, std::optional<Text> text)
-    : m_lineIndex(lineIndex)
-    , m_layoutBox(makeWeakPtr(layoutBox))
-    , m_rect(rect)
-    , m_inkOverflow(inkOverflow)
-    , m_expansion(expansion)
-    , m_text(text)
-{
-}
-
-inline Run::Text::Text(size_t start, size_t length, const String& originalContent, String adjustedContentToRender, bool hasHyphen)
-    : m_start(start)
-    , m_length(length)
-    , m_hasHyphen(hasHyphen)
-    , m_originalContent(originalContent)
-    , m_adjustedContentToRender(adjustedContentToRender)
-{
-}
-
-inline void Run::setVerticalPositionIntegral()
-{
-    m_rect.setY(roundToInt(m_rect.y()));
-    m_inkOverflow.setY(roundToInt(m_inkOverflow.y()));
-}
-
-}
-}
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (281904 => 281905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp   2021-09-02 01:05:35 UTC (rev 281904)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp      2021-09-02 01:33:01 UTC (rev 281905)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "FilterOperations.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><del>-#include "LayoutIntegrationRun.h"
</del><span class="cx"> #include "LegacyInlineTextBox.h"
</span><span class="cx"> #include "RenderCombineText.h"
</span><span class="cx"> #include "RenderLayer.h"
</span></span></pre>
</div>
</div>

</body>
</html>