<!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>[205728] releases/WebKitGTK/webkit-2.14</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/205728">205728</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-09 02:42:31 -0700 (Fri, 09 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205519">r205519</a> - Strikethrough positions are erroneously snapped twice
https://bugs.webkit.org/show_bug.cgi?id=161647
<rdar://problem/11542470>
Reviewed by Zalan Bujtas.
Source/WebCore:
Because we're using an int for the position of the baseline, the math to calculate the
strikethrough position is snapped. Then, we snap it again inside GraphicsContext.
Test: fast/text/strikethrough-int.html
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
* rendering/TextDecorationPainter.h:
(WebCore::TextDecorationPainter::setBaseline):
LayoutTests:
* fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html: Updated.
* fast/text/strikethrough-int-expected-mismatch.html: Added.
* fast/text/strikethrough-int.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastcss3textcss3textdecorationtextdecorationlinethroughmispositionedexpectedhtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingInlineTextBoxcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingTextDecorationPainterh">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/TextDecorationPainter.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfasttextstrikethroughintexpectedmismatchhtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int-expected-mismatch.html</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfasttextstrikethroughinthtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (205727 => 205728)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-09-09 09:38:24 UTC (rev 205727)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-09-09 09:42:31 UTC (rev 205728)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-09-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Strikethrough positions are erroneously snapped twice
+ https://bugs.webkit.org/show_bug.cgi?id=161647
+ <rdar://problem/11542470>
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html: Updated.
+ * fast/text/strikethrough-int-expected-mismatch.html: Added.
+ * fast/text/strikethrough-int.html: Added.
+
</ins><span class="cx"> 2016-09-06 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !paintInfo.overlapTestRequests->contains(this) in WebCore::RenderWidget::paintContents
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastcss3textcss3textdecorationtextdecorationlinethroughmispositionedexpectedhtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html (205727 => 205728)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html 2016-09-09 09:38:24 UTC (rev 205727)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-line-through-mispositioned-expected.html 2016-09-09 09:42:31 UTC (rev 205728)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> border-top: 3px solid green;
</span><span class="cx"> position: absolute;
</span><span class="cx"> left: 20px;
</span><del>- top: 33px;
</del><ins>+ top: 34px;
</ins><span class="cx"> width: 120px;
</span><span class="cx"> height: 1px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfasttextstrikethroughintexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int-expected-mismatch.html (0 => 205728)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int-expected-mismatch.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int-expected-mismatch.html 2016-09-09 09:42:31 UTC (rev 205728)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="overflow: hidden; width: 400px; height: 400px;">
+<div style="font-family: 'Ahem'; display: inline-block; transform: scale(500) translateY(-128px); transform-origin: left top;">
+<span style="font-size: 241px; text-decoration: line-through;">p</span>
+</div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfasttextstrikethroughinthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int.html (0 => 205728)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/text/strikethrough-int.html 2016-09-09 09:42:31 UTC (rev 205728)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="overflow: hidden; width: 400px; height: 400px;">
+<div style="font-family: 'Ahem'; display: inline-block; transform: scale(500) translateY(-128px); transform-origin: left top;">
+<span style="font-size: 240px; text-decoration: line-through; position: relative; top: -1px;">p</span>
+</div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205727 => 205728)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-09 09:38:24 UTC (rev 205727)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-09 09:42:31 UTC (rev 205728)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Strikethrough positions are erroneously snapped twice
+ https://bugs.webkit.org/show_bug.cgi?id=161647
+ <rdar://problem/11542470>
+
+ Reviewed by Zalan Bujtas.
+
+ Because we're using an int for the position of the baseline, the math to calculate the
+ strikethrough position is snapped. Then, we snap it again inside GraphicsContext.
+
+ Test: fast/text/strikethrough-int.html
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintDecoration):
+ * rendering/TextDecorationPainter.h:
+ (WebCore::TextDecorationPainter::setBaseline):
+
</ins><span class="cx"> 2016-09-06 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !paintInfo.overlapTestRequests->contains(this) in WebCore::RenderWidget::paintContents
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/InlineTextBox.cpp (205727 => 205728)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/InlineTextBox.cpp 2016-09-09 09:38:24 UTC (rev 205727)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/InlineTextBox.cpp 2016-09-09 09:42:31 UTC (rev 205728)
</span><span class="lines">@@ -715,13 +715,12 @@
</span><span class="cx"> width = renderer().width(m_start, m_truncation, textPos(), isFirstLine());
</span><span class="cx"> mirrorRTLSegment(m_logicalWidth, direction(), start, width);
</span><span class="cx"> }
</span><del>-
- int baseline = lineStyle().fontMetrics().ascent();
</del><ins>+
</ins><span class="cx"> TextDecorationPainter decorationPainter(context, decoration, renderer(), isFirstLine());
</span><span class="cx"> decorationPainter.setInlineTextBox(this);
</span><span class="cx"> decorationPainter.setFont(font);
</span><span class="cx"> decorationPainter.setWidth(width);
</span><del>- decorationPainter.setBaseline(baseline);
</del><ins>+ decorationPainter.setBaseline(lineStyle().fontMetrics().ascent());
</ins><span class="cx"> decorationPainter.setIsHorizontal(isHorizontal());
</span><span class="cx"> decorationPainter.addTextShadow(shadow);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingTextDecorationPainterh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/TextDecorationPainter.h (205727 => 205728)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/TextDecorationPainter.h 2016-09-09 09:38:24 UTC (rev 205727)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/TextDecorationPainter.h 2016-09-09 09:42:31 UTC (rev 205728)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> void setFont(const FontCascade& font) { m_font = &font; }
</span><span class="cx"> void setIsHorizontal(bool isHorizontal) { m_isHorizontal = isHorizontal; }
</span><span class="cx"> void setWidth(float width) { m_width = width; }
</span><del>- void setBaseline(int baseline) { m_baseline = baseline; }
</del><ins>+ void setBaseline(float baseline) { m_baseline = baseline; }
</ins><span class="cx"> void addTextShadow(const ShadowData* textShadow) { m_shadow = textShadow; }
</span><span class="cx">
</span><span class="cx"> void paintTextDecoration(const TextRun&, const FloatPoint& textOrigin, const FloatPoint& boxOrigin);
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> int m_wavyOffset { 0 };
</span><span class="cx"> bool m_isPrinting { false };
</span><span class="cx"> float m_width { 0 };
</span><del>- int m_baseline { 0 };
</del><ins>+ float m_baseline { 0 };
</ins><span class="cx"> FloatPoint m_boxOrigin;
</span><span class="cx"> bool m_isHorizontal { true };
</span><span class="cx"> const ShadowData* m_shadow { nullptr };
</span></span></pre>
</div>
</div>
</body>
</html>