<!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>[189058] 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/189058">189058</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-27 14:39:20 -0700 (Thu, 27 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Text jumps sometimes on naughty strings page
https://bugs.webkit.org/show_bug.cgi?id=148399
rdar://problem/22212568
Reviewed by Antti Koivisto.
The x position we set for tab characters during painting should
be the same as if it was set by the inline box tree painting.
Inline box tree computes the distance from the rootbox for each line
and sets this value as the xPos for the TextRun.
Currently simple line layout does not support cases where a line
would have an offset, so this value is always 0.
Source/WebCore:
Test: fast/text/whitespace/simple-line-layout-tab-position.html
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow):
LayoutTests:
* fast/text/whitespace/simple-line-layout-tab-position-expected.html: Added.
* fast/text/whitespace/simple-line-layout-tab-position.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="#trunkLayoutTestsfasttextwhitespacesimplelinelayouttabpositionexpectedhtml">trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextwhitespacesimplelinelayouttabpositionhtml">trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189057 => 189058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-27 21:38:53 UTC (rev 189057)
+++ trunk/LayoutTests/ChangeLog 2015-08-27 21:39:20 UTC (rev 189058)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-08-27 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Text jumps sometimes on naughty strings page
+ https://bugs.webkit.org/show_bug.cgi?id=148399
+ rdar://problem/22212568
+
+ Reviewed by Antti Koivisto.
+
+ The x position we set for tab characters during painting should
+ be the same as if it was set by the inline box tree painting.
+
+ Inline box tree computes the distance from the rootbox for each line
+ and sets this value as the xPos for the TextRun.
+ Currently simple line layout does not support cases where a line
+ would have an offset, so this value is always 0.
+
+ * fast/text/whitespace/simple-line-layout-tab-position-expected.html: Added.
+ * fast/text/whitespace/simple-line-layout-tab-position.html: Added.
+
</ins><span class="cx"> 2015-08-27 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r188987): imported/mozilla/svg/filters/feConvolveMatrix-1.svg fails
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextwhitespacesimplelinelayouttabpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position-expected.html (0 => 189058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position-expected.html 2015-08-27 21:39:20 UTC (rev 189058)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout renderes tab positions properly</title>
+<script>
+ if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+</script>
+<style>
+ body {
+ margin: 0px;
+ }
+
+ div {
+ padding-left: 10px;
+ font-size: 22px;
+ white-space: pre;
+ }
+</style>
+</head>
+<body>
+<div> a b c e f g h i j k</div>
+<div style="text-align: center"> a b c e f g h i j k</div>
+<div style="text-align: right"> a b c e f g h i j k</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextwhitespacesimplelinelayouttabpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position.html (0 => 189058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position.html (rev 0)
+++ trunk/LayoutTests/fast/text/whitespace/simple-line-layout-tab-position.html 2015-08-27 21:39:20 UTC (rev 189058)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout renderes tab positions properly</title>
+<style>
+ body {
+ margin: 0px;
+ }
+
+ div {
+ padding-left: 10px;
+ font-size: 22px;
+ white-space: pre;
+ }
+</style>
+</head>
+<body>
+<div> a b c e f g h i j k</div>
+<div style="text-align: center"> a b c e f g h i j k</div>
+<div style="text-align: right"> a b c e f g h i j k</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189057 => 189058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-27 21:38:53 UTC (rev 189057)
+++ trunk/Source/WebCore/ChangeLog 2015-08-27 21:39:20 UTC (rev 189058)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-08-27 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Text jumps sometimes on naughty strings page
+ https://bugs.webkit.org/show_bug.cgi?id=148399
+ rdar://problem/22212568
+
+ Reviewed by Antti Koivisto.
+
+ The x position we set for tab characters during painting should
+ be the same as if it was set by the inline box tree painting.
+
+ Inline box tree computes the distance from the rootbox for each line
+ and sets this value as the xPos for the TextRun.
+ Currently simple line layout does not support cases where a line
+ would have an offset, so this value is always 0.
+
+ Test: fast/text/whitespace/simple-line-layout-tab-position.html
+
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintFlow):
+
</ins><span class="cx"> 2015-08-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Isolate Source directories in CMake build
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (189057 => 189058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-08-27 21:38:53 UTC (rev 189057)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-08-27 21:39:20 UTC (rev 189058)
</span><span class="lines">@@ -88,7 +88,8 @@
</span><span class="cx"> continue;
</span><span class="cx"> TextRun textRun(run.text());
</span><span class="cx"> textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><del>- textRun.setXPos(run.rect().x());
</del><ins>+ // x position indicates the line offset from the rootbox. It's always 0 in case of simple line layout.
+ textRun.setXPos(0);
</ins><span class="cx"> FloatPoint textOrigin = FloatPoint(rect.x() + paintOffset.x(), roundToDevicePixel(run.baselinePosition() + paintOffset.y(), deviceScaleFactor));
</span><span class="cx"> context.drawText(font, textRun, textOrigin);
</span><span class="cx"> if (debugBordersEnabled)
</span></span></pre>
</div>
</div>
</body>
</html>