<!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>[176470] 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/176470">176470</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 13:08:55 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/175259">r175259</a>) Simple line layout text measuring behavior changed.
https://bugs.webkit.org/show_bug.cgi?id=138947
rdar://problem/19050653
Reviewed by Antti Koivisto.
In certain cases, when block flow needs to compute the preferred width of a particular text
renderer, we use the non-simple line layout text measuring.
However, the same text renderer might end up at simple line layout later.
Complex line layout measures text including the trailing space and it subtracts
(the constant value of) space width afterwards, while simple line layout measures
runs without the extra space.
In such cases, this may result different word widths and produce unexpected line breaking. (preferred width != final width)
In long term, any text renderer qualified for simple line layout should go through the simple
text measuring code path. (https://bugs.webkit.org/show_bug.cgi?id=138973)
For now, just copy complex line layout behaviour. This also matches the previous simple line layout line breaking implementation.
Source/WebCore:
Test: fast/text/simple-line-text-measuring-with-trailing-space.html
* rendering/SimpleLineLayoutFlowContents.cpp:
(WebCore::SimpleLineLayout::FlowContents::textWidth):
LayoutTests:
* fast/text/simple-line-text-measuring-with-trailing-space-expected.html: Added.
* fast/text/simple-line-text-measuring-with-trailing-space.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="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelinetextmeasuringwithtrailingspaceexpectedhtml">trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinetextmeasuringwithtrailingspacehtml">trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176469 => 176470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-21 21:01:46 UTC (rev 176469)
+++ trunk/LayoutTests/ChangeLog 2014-11-21 21:08:55 UTC (rev 176470)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-11-21 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(r175259) Simple line layout text measuring behavior changed.
+ https://bugs.webkit.org/show_bug.cgi?id=138947
+ rdar://problem/19050653
+
+ Reviewed by Antti Koivisto.
+
+ In certain cases, when block flow needs to compute the preferred width of a particular text
+ renderer, we use the non-simple line layout text measuring.
+ However, the same text renderer might end up at simple line layout later.
+ Complex line layout measures text including the trailing space and it subtracts
+ (the constant value of) space width afterwards, while simple line layout measures
+ runs without the extra space.
+ In such cases, this may result different word widths and produce unexpected line breaking. (preferred width != final width)
+ In long term, any text renderer qualified for simple line layout should go through the simple
+ text measuring code path. (https://bugs.webkit.org/show_bug.cgi?id=138973)
+ For now, just copy complex line layout behaviour. This also matches the previous simple line layout line breaking implementation.
+
+ * fast/text/simple-line-text-measuring-with-trailing-space-expected.html: Added.
+ * fast/text/simple-line-text-measuring-with-trailing-space.html: Added.
+
</ins><span class="cx"> 2014-11-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when setting 'transition-delay' CSS property to a calculated value
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinetextmeasuringwithtrailingspaceexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space-expected.html (0 => 176470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space-expected.html 2014-11-21 21:08:55 UTC (rev 176470)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout text measuring matches complex line layout. (trailing space included and then subtracted)</title>
+<style>
+ .content {
+ float: left;
+ border: 1px solid green;
+ }
+</style>
+<script>
+ if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+</script>
+</head>
+<body>
+ <div class="content">FOP bar</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinetextmeasuringwithtrailingspacehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space.html (0 => 176470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-text-measuring-with-trailing-space.html 2014-11-21 21:08:55 UTC (rev 176470)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that simple line layout text measuring matches complex line layout. (trailing space included and then subtracted)</title>
+<style>
+ .content {
+ float: left;
+ border: 1px solid green;
+ }
+</style>
+</head>
+<body>
+ <div class="content">FOP bar</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176469 => 176470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-21 21:01:46 UTC (rev 176469)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 21:08:55 UTC (rev 176470)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-11-21 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(r175259) Simple line layout text measuring behavior changed.
+ https://bugs.webkit.org/show_bug.cgi?id=138947
+ rdar://problem/19050653
+
+ Reviewed by Antti Koivisto.
+
+ In certain cases, when block flow needs to compute the preferred width of a particular text
+ renderer, we use the non-simple line layout text measuring.
+ However, the same text renderer might end up at simple line layout later.
+ Complex line layout measures text including the trailing space and it subtracts
+ (the constant value of) space width afterwards, while simple line layout measures
+ runs without the extra space.
+ In such cases, this may result different word widths and produce unexpected line breaking. (preferred width != final width)
+ In long term, any text renderer qualified for simple line layout should go through the simple
+ text measuring code path. (https://bugs.webkit.org/show_bug.cgi?id=138973)
+ For now, just copy complex line layout behaviour. This also matches the previous simple line layout line breaking implementation.
+
+ Test: fast/text/simple-line-text-measuring-with-trailing-space.html
+
+ * rendering/SimpleLineLayoutFlowContents.cpp:
+ (WebCore::SimpleLineLayout::FlowContents::textWidth):
+
</ins><span class="cx"> 2014-11-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> More Windows build fixes.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp (176469 => 176470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2014-11-21 21:01:46 UTC (rev 176469)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2014-11-21 21:08:55 UTC (rev 176470)
</span><span class="lines">@@ -180,10 +180,16 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(from < to);
</span><span class="cx"> String string = renderer.text();
</span><ins>+ bool measureWithEndSpace = m_style.collapseWhitespace && to < string.length() && string[to] == ' ';
+ if (measureWithEndSpace)
+ ++to;
</ins><span class="cx"> TextRun run(string.characters8() + from, to - from);
</span><span class="cx"> run.setXPos(xPosition);
</span><span class="cx"> run.setTabSize(!!m_style.tabWidth, m_style.tabWidth);
</span><del>- return m_style.font.width(run);
</del><ins>+ float width = m_style.font.width(run);
+ if (measureWithEndSpace)
+ width -= m_style.spaceWidth;
+ return width;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>