<!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>[269818] 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/269818">269818</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2020-11-14 09:38:37 -0800 (Sat, 14 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][Integration] Use the physical size when setting the pre-computed width/height on ReplacedBox
https://bugs.webkit.org/show_bug.cgi?id=218915

Reviewed by Antti Koivisto.

This is where the logical vs. physical coordinate flip happens on the integration level.

* layout/integration/LayoutIntegrationLineLayout.cpp:
(WebCore::LayoutIntegration::LineLayout::updateReplacedDimensions):
(WebCore::LayoutIntegration::LineLayout::updateInlineBlockDimensions):
* layout/integration/LayoutIntegrationLineLayout.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::layoutModernLines):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayouth">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269817 => 269818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-14 15:26:56 UTC (rev 269817)
+++ trunk/Source/WebCore/ChangeLog      2020-11-14 17:38:37 UTC (rev 269818)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2020-11-14  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [LFC][Integration] Use the physical size when setting the pre-computed width/height on ReplacedBox
+        https://bugs.webkit.org/show_bug.cgi?id=218915
+
+        Reviewed by Antti Koivisto.
+
+        This is where the logical vs. physical coordinate flip happens on the integration level.
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::updateReplacedDimensions):
+        (WebCore::LayoutIntegration::LineLayout::updateInlineBlockDimensions):
+        * layout/integration/LayoutIntegrationLineLayout.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::layoutModernLines):
+
+2020-11-14  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][IFC] Display runs generated by boxes should have border box geometries
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=218932
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (269817 => 269818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp  2020-11-14 15:26:56 UTC (rev 269817)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp     2020-11-14 17:38:37 UTC (rev 269818)
</span><span class="lines">@@ -110,12 +110,24 @@
</span><span class="cx"> 
</span><span class="cx"> void LineLayout::updateReplacedDimensions(const RenderBox& replaced)
</span><span class="cx"> {
</span><del>-    auto& layoutBox = m_boxTree.layoutBoxForRenderer(replaced);
</del><ins>+    updateLayoutBoxDimensions(replaced);
+}
+
+void LineLayout::updateInlineBlockDimensions(const RenderBlock& inlineBlock)
+{
+    updateLayoutBoxDimensions(inlineBlock);
+}
+
+void LineLayout::updateLayoutBoxDimensions(const RenderBox& replacedOrInlineBlock)
+{
+    auto& layoutBox = m_boxTree.layoutBoxForRenderer(replacedOrInlineBlock);
+    // Internally both replaced and inline-box content use replaced boxes.
</ins><span class="cx">     auto& replacedBox = downcast<Layout::ReplacedBox>(layoutBox);
</span><span class="cx"> 
</span><del>-    replacedBox.setContentSizeForIntegration({ replaced.contentLogicalWidth(), replaced.contentLogicalHeight() });
</del><ins>+    // Always use the physical size here for inline level boxes (this is where the logical vs. physical coords flip happens).
+    replacedBox.setContentSizeForIntegration({ replacedOrInlineBlock.contentWidth(), replacedOrInlineBlock.contentHeight() });
</ins><span class="cx"> 
</span><del>-    auto baseline = replaced.baselinePosition(AlphabeticBaseline, false /* firstLine */, HorizontalLine, PositionOnContainingLine);
</del><ins>+    auto baseline = replacedOrInlineBlock.baselinePosition(AlphabeticBaseline, false /* firstLine */, HorizontalLine, PositionOnContainingLine);
</ins><span class="cx">     replacedBox.setBaseline(baseline);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayouth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h (269817 => 269818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h    2020-11-14 15:26:56 UTC (rev 269817)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h       2020-11-14 17:38:37 UTC (rev 269818)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx">     static bool canUseForAfterStyleChange(const RenderBlockFlow&, StyleDifference);
</span><span class="cx"> 
</span><span class="cx">     void updateReplacedDimensions(const RenderBox&);
</span><ins>+    void updateInlineBlockDimensions(const RenderBlock&);
</ins><span class="cx">     void updateStyle(const RenderBoxModelObject&);
</span><span class="cx">     void layout();
</span><span class="cx"> 
</span><span class="lines">@@ -101,6 +102,7 @@
</span><span class="cx">     void prepareFloatingState();
</span><span class="cx">     void constructContent();
</span><span class="cx">     InlineContent& ensureInlineContent();
</span><ins>+    void updateLayoutBoxDimensions(const RenderBox&);
</ins><span class="cx"> 
</span><span class="cx">     RenderBlockFlow& flow() { return m_boxTree.flow(); }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (269817 => 269818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp       2020-11-14 15:26:56 UTC (rev 269817)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp  2020-11-14 17:38:37 UTC (rev 269818)
</span><span class="lines">@@ -3621,8 +3621,8 @@
</span><span class="cx">         if (is<RenderBlock>(renderer)) {
</span><span class="cx">             auto& block = downcast<RenderBlock>(renderer);
</span><span class="cx">             block.layoutIfNeeded();
</span><del>-            // FIXME: Taking the same path as replaced for now.
-            layoutFormattingContextLineLayout.updateReplacedDimensions(block);
</del><ins>+            ASSERT(block.style().display() == DisplayType::InlineBlock);
+            layoutFormattingContextLineLayout.updateInlineBlockDimensions(block);
</ins><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>