<!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>[184219] 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/184219">184219</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-05-12 14:24:37 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/175617">r175617</a>): Some text doesn't render on internationalculinarycenter.com
https://bugs.webkit.org/show_bug.cgi?id=144917
rdar://problem/20545878
Reviewed by Andreas Kling.
This patch ensures that text stroke width value is taken into account while
calculating visual overflow for simple line layout.
Ceiling the text stroke width value matches the normal text layout behaviour.
Source/WebCore:
Test: fast/text/simple-line-layout-text-stroke-width.html
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow):
(WebCore::SimpleLineLayout::collectFlowOverflow):
LayoutTests:
* fast/text/simple-line-layout-text-stroke-width-expected.txt: Added.
* fast/text/simple-line-layout-text-stroke-width.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="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayouttextstrokewidthexpectedtxt">trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayouttextstrokewidthhtml">trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184218 => 184219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-12 21:20:26 UTC (rev 184218)
+++ trunk/LayoutTests/ChangeLog 2015-05-12 21:24:37 UTC (rev 184219)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-12 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(r175617): Some text doesn't render on internationalculinarycenter.com
+ https://bugs.webkit.org/show_bug.cgi?id=144917
+ rdar://problem/20545878
+
+ Reviewed by Andreas Kling.
+
+ This patch ensures that text stroke width value is taken into account while
+ calculating visual overflow for simple line layout.
+ Ceiling the text stroke width value matches the normal text layout behaviour.
+
+ * fast/text/simple-line-layout-text-stroke-width-expected.txt: Added.
+ * fast/text/simple-line-layout-text-stroke-width.html: Added.
+
</ins><span class="cx"> 2015-05-12 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] ARIA menu items should not have anonymous block children
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayouttextstrokewidthexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width-expected.txt (0 => 184219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width-expected.txt 2015-05-12 21:24:37 UTC (rev 184219)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS internals.repaintRectsAsText().indexOf('90 8 62 18') is not -1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+foobar
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayouttextstrokewidthhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width.html (0 => 184219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-text-stroke-width.html 2015-05-12 21:24:37 UTC (rev 184219)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout takes text stroke width value into account when calculating repaint rects.</title>
+<style>
+ div {
+ position: absolute;
+ -webkit-text-stroke-width: 10px;
+ }
+</style>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+ if (window.internals)
+ internals.startTrackingRepaints();
+</script>
+</head>
+<body>
+ <div id=foo>foobar</div>
+<script>
+ setTimeout(function() {
+ document.getElementById("foo").style.left = "100px";
+ document.body.offsetWidth;
+ if (window.internals) {
+ shouldNotBe("internals.repaintRectsAsText().indexOf('90 8 62 18')", "-1");
+ internals.stopTrackingRepaints();
+ finishJSTest();
+ }
+ }
+ , 0);
+</script>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184218 => 184219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-12 21:20:26 UTC (rev 184218)
+++ trunk/Source/WebCore/ChangeLog 2015-05-12 21:24:37 UTC (rev 184219)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-12 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(r175617): Some text doesn't render on internationalculinarycenter.com
+ https://bugs.webkit.org/show_bug.cgi?id=144917
+ rdar://problem/20545878
+
+ Reviewed by Andreas Kling.
+
+ This patch ensures that text stroke width value is taken into account while
+ calculating visual overflow for simple line layout.
+ Ceiling the text stroke width value matches the normal text layout behaviour.
+
+ Test: fast/text/simple-line-layout-text-stroke-width.html
+
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintFlow):
+ (WebCore::SimpleLineLayout::collectFlowOverflow):
+
</ins><span class="cx"> 2015-05-12 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (184218 => 184219)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-05-12 21:20:26 UTC (rev 184218)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-05-12 21:24:37 UTC (rev 184219)
</span><span class="lines">@@ -79,8 +79,11 @@
</span><span class="cx"> paintRect.moveBy(-paintOffset);
</span><span class="cx">
</span><span class="cx"> auto resolver = runResolver(flow, layout);
</span><ins>+ float strokeOverflow = ceilf(flow.style().textStrokeWidth());
</ins><span class="cx"> for (const auto& run : resolver.rangeForRect(paintRect)) {
</span><del>- if (!run.rect().intersects(paintRect) || run.start() == run.end())
</del><ins>+ FloatRect rect = run.rect();
+ rect.inflate(strokeOverflow);
+ if (!rect.intersects(paintRect) || run.start() == run.end())
</ins><span class="cx"> continue;
</span><span class="cx"> TextRun textRun(run.text());
</span><span class="cx"> textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><span class="lines">@@ -127,8 +130,10 @@
</span><span class="cx"> void collectFlowOverflow(RenderBlockFlow& flow, const Layout& layout)
</span><span class="cx"> {
</span><span class="cx"> auto resolver = lineResolver(flow, layout);
</span><ins>+ float strokeOverflow = ceilf(flow.style().textStrokeWidth());
</ins><span class="cx"> for (auto it = resolver.begin(), end = resolver.end(); it != end; ++it) {
</span><span class="cx"> auto rect = *it;
</span><ins>+ rect.inflate(strokeOverflow);
</ins><span class="cx"> flow.addLayoutOverflow(rect);
</span><span class="cx"> flow.addVisualOverflow(rect);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>