<!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>[281804] 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/281804">281804</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2021-08-31 08:24:36 -0700 (Tue, 31 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[IFC][Integration] Move integral vertical position adjustment over to createDisplayLines
https://bugs.webkit.org/show_bug.cgi?id=229679

Reviewed by Antti Koivisto.

This is in preparation for not constructing text runs in InlineContentBuilder::createDisplayLineRuns.

* layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
(WebCore::LayoutIntegration::InlineContentBuilder::build const):
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLineRuns const):
(WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
* layout/integration/LayoutIntegrationInlineContentBuilder.h:
* layout/integration/LayoutIntegrationLine.h:
(WebCore::LayoutIntegration::NonRootInlineBox::setVerticalPositionIntegral):
* layout/integration/LayoutIntegrationRun.h:
(WebCore::LayoutIntegration::Run::setVerticalPositionIntegral):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineh">trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h</a></li>
<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 (281803 => 281804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-31 15:19:19 UTC (rev 281803)
+++ trunk/Source/WebCore/ChangeLog      2021-08-31 15:24:36 UTC (rev 281804)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-08-31  Alan Bujtas  <zalan@apple.com>
+
+        [IFC][Integration] Move integral vertical position adjustment over to createDisplayLines
+        https://bugs.webkit.org/show_bug.cgi?id=229679
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for not constructing text runs in InlineContentBuilder::createDisplayLineRuns.
+
+        * layout/integration/LayoutIntegrationInlineContentBuilder.cpp:
+        (WebCore::LayoutIntegration::InlineContentBuilder::build const):
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLineRuns const):
+        (WebCore::LayoutIntegration::InlineContentBuilder::createDisplayLines const):
+        * layout/integration/LayoutIntegrationInlineContentBuilder.h:
+        * layout/integration/LayoutIntegrationLine.h:
+        (WebCore::LayoutIntegration::NonRootInlineBox::setVerticalPositionIntegral):
+        * layout/integration/LayoutIntegrationRun.h:
+        (WebCore::LayoutIntegration::Run::setVerticalPositionIntegral):
+
</ins><span class="cx"> 2021-08-31  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [COOP] html/cross-origin-opener-policy/coop-same-origin-allow-popups-document-write.html WPT test is failing
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp (281803 => 281804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp        2021-08-31 15:19:19 UTC (rev 281803)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.cpp   2021-08-31 15:24:36 UTC (rev 281804)
</span><span class="lines">@@ -67,70 +67,35 @@
</span><span class="cx"> 
</span><span class="cx"> void InlineContentBuilder::build(const Layout::InlineFormattingState& inlineFormattingState, InlineContent& inlineContent) const
</span><span class="cx"> {
</span><del>-    createDisplayRuns(inlineFormattingState.lines(), inlineFormattingState.runs(), inlineContent);
</del><ins>+    createDisplayRuns(inlineFormattingState.runs(), inlineContent);
</ins><span class="cx">     createDisplayLines(inlineFormattingState.lines(), inlineContent);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InlineContentBuilder::createDisplayRuns(const Layout::InlineLines& lines, const Layout::InlineRuns& runs, InlineContent& inlineContent) const
</del><ins>+void InlineContentBuilder::createDisplayRuns(const Layout::InlineRuns& runs, InlineContent& inlineContent) const
</ins><span class="cx"> {
</span><span class="cx">     if (runs.isEmpty())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    auto createDisplayBoxRun = [&](auto& run) {
-        if (run.isRootInlineBox()) {
</del><ins>+    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()) {
</ins><span class="cx">             // FIXME: Teach the run iterators to ignore the root inline box runs.
</span><del>-            return;
-        }
-        auto& layoutBox = run.layoutBox();
-        auto lineIndex = run.lineIndex();
-        auto runRect = FloatRect { run.logicalRect() };
-        auto inkOverflow = FloatRect { run.inkOverflow() };
-        auto& geometry = m_layoutState.geometryForBox(layoutBox);
-        runRect.setSize({ geometry.borderBoxWidth(), geometry.borderBoxHeight() });
-        if (lines[lineIndex].needsIntegralPosition()) {
-            runRect.setY(roundToInt(runRect.y()));
-            inkOverflow.setY(roundToInt(inkOverflow.y()));
-        }
-        if (run.isInlineBox()) {
-            auto runRect = run.logicalRect();
-            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({ lineIndex, layoutBox, runRect, hasScrollableContent() });
-            if (!run.isLineSpanning()) {
</del><ins>+            auto& geometry = m_layoutState.geometryForBox(run.layoutBox());
+            if (!run.isInlineBox() || !run.isLineSpanning()) {
</ins><span class="cx">                 // FIXME: Run iterators with (text)runs spanning over multiple lines expect no "in-between" runs (e.g. line spanning or root inline boxes).
</span><del>-                inlineContent.runs.append({ lineIndex, layoutBox, runRect, inkOverflow, { }, { } });
</del><ins>+                inlineContent.runs.append({ run.lineIndex(), run.layoutBox(), run.logicalRect(), run.inkOverflow(), { }, { } });
</ins><span class="cx">             }
</span><del>-        } else
-            inlineContent.runs.append({ lineIndex, layoutBox, runRect, inkOverflow, { }, { } });
-    };
-
-    auto createDisplayTextRun = [&](auto& run) {
-        auto& layoutBox = run.layoutBox();
-        auto lineIndex = run.lineIndex();
-        auto runRect = FloatRect { run.logicalRect() };
-        auto inkOverflow = FloatRect { run.inkOverflow() };
-        if (lines[lineIndex].needsIntegralPosition()) {
-            runRect.setY(roundToInt(runRect.y()));
-            inkOverflow.setY(roundToInt(inkOverflow.y()));
</del><ins>+            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() });
+            }
</ins><span class="cx">         }
</span><del>-
-        auto text = run.text();
-        inlineContent.runs.append({ lineIndex
-            , layoutBox
-            , runRect
-            , inkOverflow
-            , Run::Expansion { run.expansion().behavior, run.expansion().horizontalExpansion }
-            , Run::Text { text->start(), text->length(), text->originalContent(), text->renderedContent(), text->hasHyphen() } });
-    };
-
-    inlineContent.runs.reserveInitialCapacity(runs.size());
-    for (auto& run : runs) {
-        if (run.text())
-            createDisplayTextRun(run);
-        else
-            createDisplayBoxRun(run);
</del><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -152,6 +117,9 @@
</span><span class="cx">         // Collect overflow from runs.
</span><span class="cx">         for (; runIndex < runs.size() && runs[runIndex].lineIndex() == lineIndex; ++runIndex) {
</span><span class="cx">             auto& run = runs[runIndex];
</span><ins>+            if (line.needsIntegralPosition())
+                run.setVerticalPositionIntegral();
+
</ins><span class="cx">             lineInkOverflowRect.unite(run.inkOverflow());
</span><span class="cx"> 
</span><span class="cx">             auto& layoutBox = run.layoutBox();
</span><span class="lines">@@ -173,6 +141,10 @@
</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 class="cx">         while (inlineBoxIndex < nonRootInlineBoxes.size() && nonRootInlineBoxes[inlineBoxIndex].lineIndex() == lineIndex) {
</span><span class="cx">             auto& inlineBox = nonRootInlineBoxes[inlineBoxIndex++];
</span><ins>+
+            if (line.needsIntegralPosition())
+                inlineBox.setVerticalPositionIntegral();
+
</ins><span class="cx">             if (inlineBox.hasScrollableContent())
</span><span class="cx">                 scrollableOverflowRect.unite(inlineBox.rect());
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationInlineContentBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h (281803 => 281804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h  2021-08-31 15:19:19 UTC (rev 281803)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationInlineContentBuilder.h     2021-08-31 15:24:36 UTC (rev 281804)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">     void build(const Layout::InlineFormattingState&, InlineContent&) const;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void createDisplayRuns(const Layout::InlineLines&, const Layout::InlineRuns&, InlineContent&) const;
</del><ins>+    void createDisplayRuns(const Layout::InlineRuns&, 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="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h (281803 => 281804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h  2021-08-31 15:19:19 UTC (rev 281803)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLine.h     2021-08-31 15:24:36 UTC (rev 281804)
</span><span class="lines">@@ -103,6 +103,8 @@
</span><span class="cx"> 
</span><span class="cx">     FloatRect rect() const { return m_rect; }
</span><span class="cx"> 
</span><ins>+    void setVerticalPositionIntegral() { m_rect.setY(roundToInt(m_rect.y())); }
+
</ins><span class="cx">     bool hasScrollableContent() const { return m_hasScrollableContent; }
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationRun.h (281803 => 281804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationRun.h   2021-08-31 15:19:19 UTC (rev 281803)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationRun.h      2021-08-31 15:24:36 UTC (rev 281804)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx">     const FloatRect& logicalRect() const { return m_rect; }
</span><span class="cx">     const FloatRect& inkOverflow() const { return m_inkOverflow; }
</span><span class="cx"> 
</span><ins>+    void setVerticalPositionIntegral();
+
</ins><span class="cx">     std::optional<Text>& text() { return m_text; }
</span><span class="cx">     const std::optional<Text>& text() const { return m_text; }
</span><span class="cx">     // FIXME: This information should be preserved at Run construction time.
</span><span class="lines">@@ -116,6 +118,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+inline void Run::setVerticalPositionIntegral()
+{
+    m_rect.setY(roundToInt(m_rect.y()));
+    m_inkOverflow.setY(roundToInt(m_inkOverflow.y()));
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>