<!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>[192564] 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/192564">192564</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-11-17 19:00:43 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Add letter-spacing support.
https://bugs.webkit.org/show_bug.cgi?id=151362
Reviewed by Antti Koivisto.
This enables us to use simple line layout on letter-spacing content.
(fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied)
Source/WebCore:
Test: fast/text/simple-line-letterspacing.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForStyle):
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow): RenderLineBoxList tests vertical intersection only.
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::TextFragmentIterator::runWidth):
LayoutTests:
* fast/text/simple-line-letterspacing-expected.html: Added.
* fast/text/simple-line-letterspacing.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="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelineletterspacingexpectedhtml">trunk/LayoutTests/fast/text/simple-line-letterspacing-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelineletterspacinghtml">trunk/LayoutTests/fast/text/simple-line-letterspacing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192563 => 192564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-18 01:54:47 UTC (rev 192563)
+++ trunk/LayoutTests/ChangeLog 2015-11-18 03:00:43 UTC (rev 192564)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-17 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Add letter-spacing support.
+ https://bugs.webkit.org/show_bug.cgi?id=151362
+
+ Reviewed by Antti Koivisto.
+
+ This enables us to use simple line layout on letter-spacing content.
+ (fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied)
+
+ * fast/text/simple-line-letterspacing-expected.html: Added.
+ * fast/text/simple-line-letterspacing.html: Added.
+
</ins><span class="cx"> 2015-11-17 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking storage/indexeddb/modern/get-index-failures.html as flaky on mac-wk1
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelineletterspacingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-letterspacing-expected.html (0 => 192564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-letterspacing-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-letterspacing-expected.html 2015-11-18 03:00:43 UTC (rev 192564)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<html>
+<head>
+<title>This tests that simple line layout renders letter-spacing properly.</title>
+<style>
+ div {
+ margin: 10px;
+ }
+</style>
+</head>
+<body>
+<script>
+if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+for (var i = -10; i < 10; ++i) {
+ var element = document.createElement("div");
+ element.innerText = "foobar";
+ element.style.letterSpacing = i;
+ document.body.appendChild(element);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelineletterspacinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-letterspacing.html (0 => 192564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-letterspacing.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-letterspacing.html 2015-11-18 03:00:43 UTC (rev 192564)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<html>
+<head>
+<title>This tests that simple line layout renders letter-spacing properly.</title>
+<style>
+ div {
+ margin: 10px;
+ }
+</style>
+</head>
+<body>
+<script>
+for (var i = -10; i < 10; ++i) {
+ var element = document.createElement("div");
+ element.innerText = "foobar";
+ element.style.letterSpacing = i;
+ document.body.appendChild(element);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192563 => 192564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-18 01:54:47 UTC (rev 192563)
+++ trunk/Source/WebCore/ChangeLog 2015-11-18 03:00:43 UTC (rev 192564)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-17 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Add letter-spacing support.
+ https://bugs.webkit.org/show_bug.cgi?id=151362
+
+ Reviewed by Antti Koivisto.
+
+ This enables us to use simple line layout on letter-spacing content.
+ (fixme: webkit.org/b/151368 -> Repaint rect is not computed correctly when negative letter-spacing applied)
+
+ Test: fast/text/simple-line-letterspacing.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForStyle):
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintFlow): RenderLineBoxList tests vertical intersection only.
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::runWidth):
+
</ins><span class="cx"> 2015-11-17 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo][MediaFoundation] Current playback time is not shown.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (192563 => 192564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-11-18 01:54:47 UTC (rev 192563)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-11-18 03:00:43 UTC (rev 192564)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!style.textIndent().isZero())
</span><span class="cx"> return false;
</span><del>- if (!style.wordSpacing().isZero() || style.letterSpacing())
</del><ins>+ if (!style.wordSpacing().isZero())
</ins><span class="cx"> return false;
</span><span class="cx"> if (!style.isLeftToRightDirection())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (192563 => 192564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-11-18 01:54:47 UTC (rev 192563)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-11-18 03:00:43 UTC (rev 192564)
</span><span class="lines">@@ -86,10 +86,14 @@
</span><span class="cx"> float strokeOverflow = ceilf(flow.style().textStrokeWidth());
</span><span class="cx"> float deviceScaleFactor = flow.document().deviceScaleFactor();
</span><span class="cx"> for (const auto& run : resolver.rangeForRect(paintRect)) {
</span><ins>+ if (run.start() == run.end())
+ continue;
+
</ins><span class="cx"> FloatRect rect = run.rect();
</span><span class="cx"> rect.inflate(strokeOverflow);
</span><del>- if (!rect.intersects(paintRect) || run.start() == run.end())
</del><ins>+ if (paintRect.y() > rect.maxY() || paintRect.maxY() < rect.y())
</ins><span class="cx"> continue;
</span><ins>+
</ins><span class="cx"> TextRun textRun(run.text());
</span><span class="cx"> textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><span class="cx"> // x position indicates the line offset from the rootbox. It's always 0 in case of simple line layout.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (192563 => 192564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-11-18 01:54:47 UTC (rev 192563)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-11-18 03:00:43 UTC (rev 192564)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> float width = m_style.font.width(run);
</span><span class="cx"> if (measureWithEndSpace)
</span><span class="cx"> width -= m_style.spaceWidth;
</span><del>- return width;
</del><ins>+ return std::max<float>(0, width);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>