<!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>[238448] trunk</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/238448">238448</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2018-11-22 10:51:33 -0800 (Thu, 22 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[LFC][IFC] Offset formatting context root runs with horizontal margins.
https://bugs.webkit.org/show_bug.cgi?id=191900

Reviewed by Antti Koivisto.

Source/WebCore:

Inline runs generated by formatting roots (inline-block) need to be adjusted with the horizontal margins.
(The test case has padding and border as well, but they are _inside_ the formatting context.)

Test: fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html

* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):

Tools:

* LayoutReloaded/misc/LFC-passing-tests.txt:

LayoutTests:

* fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt: Added.
* fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp">trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsLayoutReloadedmiscLFCpassingteststxt">trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlineinlinecontentandnestedformattingrootwithmarginleftrightexpectedtxt">trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastinlineinlinecontentandnestedformattingrootwithmarginleftrighthtml">trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (238447 => 238448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2018-11-22 18:11:39 UTC (rev 238447)
+++ trunk/LayoutTests/ChangeLog 2018-11-22 18:51:33 UTC (rev 238448)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2018-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Offset formatting context root runs with horizontal margins.
+        https://bugs.webkit.org/show_bug.cgi?id=191900
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt: Added.
+        * fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html: Added.
+
</ins><span class="cx"> 2018-11-22  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Extremely small monospace text size when SVG is included as an img
</span></span></pre></div>
<a id="trunkLayoutTestsfastinlineinlinecontentandnestedformattingrootwithmarginleftrightexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt (0 => 238448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt                              (rev 0)
+++ trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt 2018-11-22 18:51:33 UTC (rev 238448)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+layer at (8,8) size 402x52 clip at (9,9) size 400x50
+  RenderBlock {DIV} at (0,0) size 402x52 [border: (1px solid #008000)]
+    RenderText {#text} at (1,1) size 6x14
+      text run at (1,1) width 6: "1"
+    RenderBlock {SPAN} at (17,1) size 17x20 [border: none (1px solid #008000)]
+      RenderText {#text} at (11,0) size 6x14
+        text run at (11,0) width 6: "2"
+    RenderText {#text} at (34,1) size 6x14
+      text run at (34,1) width 6: "3"
+layer at (8,60) size 402x52 clip at (9,61) size 400x50
+  RenderBlock {DIV} at (0,52) size 402x52 [border: (1px solid #008000)]
+    RenderText {#text} at (1,1) size 6x14
+      text run at (1,1) width 6: "1"
+    RenderBlock {SPAN} at (7,1) size 17x20 [border: none (1px solid #FF0000) none]
+      RenderText {#text} at (0,0) size 6x14
+        text run at (0,0) width 6: "2"
+    RenderText {#text} at (34,1) size 6x14
+      text run at (34,1) width 6: "3"
+layer at (8,112) size 402x52 clip at (9,113) size 400x50
+  RenderBlock {DIV} at (0,104) size 402x52 [border: (1px solid #008000)]
+    RenderText {#text} at (1,1) size 6x14
+      text run at (1,1) width 6: "1"
+    RenderBlock {SPAN} at (17,1) size 28x20 [border: none (1px solid #FF0000) none (1px solid #008000)]
+      RenderText {#text} at (11,0) size 6x14
+        text run at (11,0) width 6: "2"
+    RenderText {#text} at (55,1) size 6x14
+      text run at (55,1) width 6: "3"
</ins></span></pre></div>
<a id="trunkLayoutTestsfastinlineinlinecontentandnestedformattingrootwithmarginleftrighthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html (0 => 238448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html                              (rev 0)
+++ trunk/LayoutTests/fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html 2018-11-22 18:51:33 UTC (rev 238448)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<style>
+.inlineRoot {
+       border: 1px solid green;
+       width: 400px;
+       height: 50px;
+       overflow: hidden;
+       font-size: 12px;
+}
+
+.inline-block {
+       height: 20px;
+    display: inline-block;
+}
+
+.breakStart {
+    margin-left: 10px;
+       border-left: 1px solid green;
+    padding-left: 10px;
+}
+
+.breakEnd {
+    margin-right: 10px;
+       border-right: 1px solid red     ;
+    padding-right: 10px;
+}
+</style>
+
+<div class=inlineRoot>1<span class="inline-block breakStart">2</span>3</div>
+<div class=inlineRoot>1<span class="inline-block breakEnd">2</span>3</div>
+<div class=inlineRoot>1<span class="inline-block breakStart breakEnd">2</span>3</div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (238447 => 238448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-11-22 18:11:39 UTC (rev 238447)
+++ trunk/Source/WebCore/ChangeLog      2018-11-22 18:51:33 UTC (rev 238448)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2018-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Offset formatting context root runs with horizontal margins.
+        https://bugs.webkit.org/show_bug.cgi?id=191900
+
+        Reviewed by Antti Koivisto.
+
+        Inline runs generated by formatting roots (inline-block) need to be adjusted with the horizontal margins.
+        (The test case has padding and border as well, but they are _inside_ the formatting context.)
+
+        Test: fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+
</ins><span class="cx"> 2018-11-22  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Extremely small monospace text size when SVG is included as an img
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutinlineformattingInlineFormattingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (238447 => 238448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-11-22 18:11:39 UTC (rev 238447)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp    2018-11-22 18:51:33 UTC (rev 238448)
</span><span class="lines">@@ -443,7 +443,12 @@
</span><span class="cx"> 
</span><span class="cx">     if (root.establishesFormattingContext() && &root != &(this->root())) {
</span><span class="cx">         createAndAppendInlineItem();
</span><del>-        inlineFormattingState.inlineContent().last()->addDetachingRule({ InlineItem::DetachingRule::BreakAtStart, InlineItem::DetachingRule::BreakAtEnd });
</del><ins>+        auto& inlineRun = *inlineFormattingState.inlineContent().last();
+
+        auto horizontalMargins = Geometry::computedNonCollapsedHorizontalMarginValue(layoutState(), root);
+        inlineRun.addDetachingRule({ InlineItem::DetachingRule::BreakAtStart, InlineItem::DetachingRule::BreakAtEnd });
+        inlineRun.addNonBreakableStart(horizontalMargins.left);
+        inlineRun.addNonBreakableEnd(horizontalMargins.right);
</ins><span class="cx">         // Skip formatting root subtree. They are not part of this inline formatting context.
</span><span class="cx">         return;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (238447 => 238448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-11-22 18:11:39 UTC (rev 238447)
+++ trunk/Tools/ChangeLog       2018-11-22 18:51:33 UTC (rev 238448)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Offset formatting context root runs with horizontal margins.
+        https://bugs.webkit.org/show_bug.cgi?id=191900
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
</ins><span class="cx"> 2018-11-22  Philippe Normand  <pnormand@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] Remove unmaintained bots
</span></span></pre></div>
<a id="trunkToolsLayoutReloadedmiscLFCpassingteststxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt (238447 => 238448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt    2018-11-22 18:11:39 UTC (rev 238447)
+++ trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt       2018-11-22 18:51:33 UTC (rev 238448)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> fast/inline/inline-content-with-padding-left-right.html
</span><span class="cx"> fast/inline/inline-content-with-border-left-right.html
</span><span class="cx"> fast/inline/inline-content-with-margin-left-right.html
</span><ins>+fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html
</ins><span class="cx"> fast/block/basic/height-percentage-simple.html
</span><span class="cx"> fast/block/basic/child-block-level-box-with-height-percent.html
</span><span class="cx"> fast/block/basic/quirk-mode-percent-height.html
</span></span></pre>
</div>
</div>

</body>
</html>