<!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>[199516] 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/199516">199516</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-04-13 15:11:46 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Text on compositing layer with negative letter-spacing is truncated.
https://bugs.webkit.org/show_bug.cgi?id=156550
<rdar://problem/24212140>
Reviewed by Antti Koivisto.
Negative letter-spacing affects the right edge of content's visual overflow (for both RTL and LTR).
This is similar to how normal line layout adjusts it at InlineFlowBox::addTextBoxVisualOverflow().
Source/WebCore:
Test: fast/text/negative-letter-spacing-visual-overflow.html
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::computeOverflow):
(WebCore::SimpleLineLayout::paintFlow):
(WebCore::SimpleLineLayout::collectFlowOverflow):
LayoutTests:
* fast/text/negative-letter-spacing-visual-overflow-expected.html: Added.
* fast/text/negative-letter-spacing-visual-overflow.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="#trunkLayoutTestsfasttextnegativeletterspacingvisualoverflowexpectedhtml">trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextnegativeletterspacingvisualoverflowhtml">trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199515 => 199516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-04-13 22:09:43 UTC (rev 199515)
+++ trunk/LayoutTests/ChangeLog        2016-04-13 22:11:46 UTC (rev 199516)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-13 Zalan Bujtas <zalan@apple.com>
+
+ Text on compositing layer with negative letter-spacing is truncated.
+ https://bugs.webkit.org/show_bug.cgi?id=156550
+ <rdar://problem/24212140>
+
+ Reviewed by Antti Koivisto.
+
+ Negative letter-spacing affects the right edge of content's visual overflow (for both RTL and LTR).
+ This is similar to how normal line layout adjusts it at InlineFlowBox::addTextBoxVisualOverflow().
+
+ * fast/text/negative-letter-spacing-visual-overflow-expected.html: Added.
+ * fast/text/negative-letter-spacing-visual-overflow.html: Added.
+
</ins><span class="cx"> 2016-04-13 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] remote command should be considered user events
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextnegativeletterspacingvisualoverflowexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow-expected.html (0 => 199516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow-expected.html         (rev 0)
+++ trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow-expected.html        2016-04-13 22:11:46 UTC (rev 199516)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we compute the visual overflow rect for negative letter spacing properly.</title>
+<style>
+div {
+ position: absolute;
+ font-family: ahem;
+ font-size: 20px;
+ -webkit-transform: translateZ(0);
+}
+</style>
+</head>
+<body>
+<script>
+if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+var letterSpacing = 0;
+var topPosition = 0;
+for (var i = 0; i < 20; ++i, topPosition += 25, letterSpacing -= 1) {
+ var element = document.createElement("div");
+ element.style.letterSpacing = letterSpacing + "px";
+ element.style.top = topPosition + "px";
+ element.innerText = "foo";
+ document.body.appendChild(element);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextnegativeletterspacingvisualoverflowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow.html (0 => 199516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow.html         (rev 0)
+++ trunk/LayoutTests/fast/text/negative-letter-spacing-visual-overflow.html        2016-04-13 22:11:46 UTC (rev 199516)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we compute the visual overflow rect for negative letter spacing properly.</title>
+<style>
+div {
+ position: absolute;
+ font-family: ahem;
+ font-size: 20px;
+ -webkit-transform: translateZ(0);
+}
+</style>
+</head>
+<body>
+<script>
+var letterSpacing = 0;
+var topPosition = 0;
+for (var i = 0; i < 20; ++i, topPosition += 25, letterSpacing -= 1) {
+ var element = document.createElement("div");
+ element.style.letterSpacing = letterSpacing + "px";
+ element.style.top = topPosition + "px";
+ element.innerText = "foo";
+ document.body.appendChild(element);
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199515 => 199516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-04-13 22:09:43 UTC (rev 199515)
+++ trunk/Source/WebCore/ChangeLog        2016-04-13 22:11:46 UTC (rev 199516)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-04-13 Zalan Bujtas <zalan@apple.com>
+
+ Text on compositing layer with negative letter-spacing is truncated.
+ https://bugs.webkit.org/show_bug.cgi?id=156550
+ <rdar://problem/24212140>
+
+ Reviewed by Antti Koivisto.
+
+ Negative letter-spacing affects the right edge of content's visual overflow (for both RTL and LTR).
+ This is similar to how normal line layout adjusts it at InlineFlowBox::addTextBoxVisualOverflow().
+
+ Test: fast/text/negative-letter-spacing-visual-overflow.html
+
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::computeOverflow):
+ (WebCore::SimpleLineLayout::paintFlow):
+ (WebCore::SimpleLineLayout::collectFlowOverflow):
+
</ins><span class="cx"> 2016-04-13 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] remote command should be considered user events
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (199515 => 199516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp        2016-04-13 22:09:43 UTC (rev 199515)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp        2016-04-13 22:11:46 UTC (rev 199516)
</span><span class="lines">@@ -65,6 +65,20 @@
</span><span class="cx"> context.drawRect(snappedRect);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static FloatRect computeOverflow(const RenderBlockFlow& flow, const FloatRect& layoutRect)
+{
+ auto overflowRect = layoutRect;
+ auto strokeOverflow = std::ceil(flow.style().textStrokeWidth());
+ overflowRect.inflate(strokeOverflow);
+
+ auto letterSpacing = flow.style().fontCascade().letterSpacing();
+ if (letterSpacing >= 0)
+ return overflowRect;
+ // Last letter's negative spacing shrinks layout rect. Push it to visual overflow.
+ overflowRect.expand(-letterSpacing, 0);
+ return overflowRect;
+}
+
</ins><span class="cx"> void paintFlow(const RenderBlockFlow& flow, const Layout& layout, PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><span class="cx"> if (paintInfo.phase != PaintPhaseForeground)
</span><span class="lines">@@ -94,15 +108,13 @@
</span><span class="cx"> paintRect.moveBy(-paintOffset);
</span><span class="cx">
</span><span class="cx"> auto resolver = runResolver(flow, layout);
</span><del>- float strokeOverflow = std::ceil(flow.style().textStrokeWidth());
</del><span class="cx"> float deviceScaleFactor = flow.document().deviceScaleFactor();
</span><span class="cx"> for (auto run : resolver.rangeForRect(paintRect)) {
</span><span class="cx"> if (run.start() == run.end())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> FloatRect rect = run.rect();
</span><del>- FloatRect visualOverflowRect = rect;
- visualOverflowRect.inflate(strokeOverflow);
</del><ins>+ FloatRect visualOverflowRect = computeOverflow(flow, rect);
</ins><span class="cx"> if (paintRect.y() > visualOverflowRect.maxY() || paintRect.maxY() < visualOverflowRect.y())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -151,12 +163,10 @@
</span><span class="cx">
</span><span class="cx"> void collectFlowOverflow(RenderBlockFlow& flow, const Layout& layout)
</span><span class="cx"> {
</span><del>- float strokeOverflow = std::ceil(flow.style().textStrokeWidth());
- for (FloatRect lineRect : lineResolver(flow, layout)) {
- LayoutRect inflatedLineRect(lineRect);
- inflatedLineRect.inflate(strokeOverflow);
- flow.addLayoutOverflow(inflatedLineRect);
- flow.addVisualOverflow(inflatedLineRect);
</del><ins>+ for (auto lineRect : lineResolver(flow, layout)) {
+ LayoutRect visualOverflowRect = LayoutRect(computeOverflow(flow, lineRect));
+ flow.addLayoutOverflow(LayoutRect(lineRect));
+ flow.addVisualOverflow(visualOverflowRect);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>