<!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>[246486] 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/246486">246486</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-06-16 14:04:41 -0700 (Sun, 16 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Address Sam's post-landing review of <a href="http://trac.webkit.org/projects/webkit/changeset/246234">r246234</a>.

* layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
(WebCore::Layout::InlineFormattingContext::LineLayout::createDisplayRuns const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContextLineLayoutcpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (246485 => 246486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-06-16 20:51:48 UTC (rev 246485)
+++ trunk/Source/WebCore/ChangeLog      2019-06-16 21:04:41 UTC (rev 246486)
</span><span class="lines">@@ -1,5 +1,12 @@
</span><span class="cx"> 2019-06-16  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        Address Sam's post-landing review of r246234.
+
+        * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+        (WebCore::Layout::InlineFormattingContext::LineLayout::createDisplayRuns const):
+
+2019-06-16  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [LFC][IFC] Decouple baseline ascent/descent and baseline offset.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198901
</span><span class="cx">         <rdar://problem/51782393>
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContextLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp (246485 => 246486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp       2019-06-16 20:51:48 UTC (rev 246485)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp  2019-06-16 21:04:41 UTC (rev 246486)
</span><span class="lines">@@ -314,8 +314,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (lineContent.isEmpty()) {
</span><span class="cx">         // Spec tells us to create a zero height, empty line box.
</span><del>-        auto lineBox = Display::Rect { lineContent.logicalTop(), lineContent.logicalLeft(), 0 , 0 };
-        m_formattingState.addLineBox({ lineBox, lineContent.baseline(), lineContent.baselineOffset() });
</del><ins>+        auto lineBoxRect = Display::Rect { lineContent.logicalTop(), lineContent.logicalLeft(), 0 , 0 };
+        m_formattingState.addLineBox({ lineBoxRect, lineContent.baseline(), lineContent.baselineOffset() });
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx">     // A line box is always tall enough for all of the boxes it contains.
</span><span class="cx"> 
</span><span class="cx">     // Ignore the initial strut.
</span><del>-    auto lineBox = Display::Rect { lineContent.logicalTop(), lineContent.logicalLeft(), 0, lineContent.logicalHeight()};
</del><ins>+    auto lineBoxRect = Display::Rect { lineContent.logicalTop(), lineContent.logicalLeft(), 0, lineContent.logicalHeight()};
</ins><span class="cx">     // Create final display runs.
</span><span class="cx">     auto& lineRuns = lineContent.runs();
</span><span class="cx">     for (unsigned index = 0; index < lineRuns.size(); ++index) {
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx">             if (layoutBox.isInFlowPositioned())
</span><span class="cx">                 topLeft += Geometry::inFlowPositionedPositionOffset(layoutState(), layoutBox);
</span><span class="cx">             displayBox.setTopLeft(topLeft);
</span><del>-            lineBox.expandHorizontally(logicalRect.width());
</del><ins>+            lineBoxRect.expandHorizontally(logicalRect.width());
</ins><span class="cx">             m_formattingState.addInlineRun(std::make_unique<Display::Run>(logicalRect));
</span><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx">         // Inline level container start (<span>)
</span><span class="cx">         if (inlineItem.isContainerStart()) {
</span><span class="cx">             displayBox.setTopLeft(logicalRect.topLeft());
</span><del>-            lineBox.expandHorizontally(logicalRect.width());
</del><ins>+            lineBoxRect.expandHorizontally(logicalRect.width());
</ins><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">             // FIXME fix it for multiline.
</span><span class="cx">             displayBox.setContentBoxWidth(contentBoxWidth);
</span><span class="cx">             displayBox.setContentBoxHeight(logicalRect.height());
</span><del>-            lineBox.expandHorizontally(logicalRect.width());
</del><ins>+            lineBoxRect.expandHorizontally(logicalRect.width());
</ins><span class="cx">             continue;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx">                 lastDisplayRun->expandHorizontally(logicalRect.width());
</span><span class="cx">                 lastDisplayRun->textContext()->expand(lineRun->textContext->length);
</span><span class="cx">             }
</span><del>-            lineBox.expandHorizontally(logicalRect.width());
</del><ins>+            lineBoxRect.expandHorizontally(logicalRect.width());
</ins><span class="cx">         }
</span><span class="cx">         // FIXME take content breaking into account when part of the layout box is on the previous line.
</span><span class="cx">         auto firstInlineRunForLayoutBox = !previousLineRun || &previousLineRun->inlineItem.layoutBox() != &layoutBox;
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     // FIXME linebox needs to be ajusted after content alignment.
</span><del>-    m_formattingState.addLineBox({ lineBox, lineContent.baseline(), lineContent.baselineOffset() });
</del><ins>+    m_formattingState.addLineBox({ lineBoxRect, lineContent.baseline(), lineContent.baselineOffset() });
</ins><span class="cx">     alignRuns(m_formattingRoot.style().textAlign(), previousLineLastRunIndex.valueOr(-1) + 1, widthConstraint - lineContent.logicalWidth());
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>