<!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>[169127] branches/safari-538.34.5-branch</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/169127">169127</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-20 13:21:23 -0700 (Tue, 20 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168599">r168599</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchLayoutTestsChangeLog">branches/safari-538.34.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari538345branchLayoutTestsfastcss3textcss3textdecorationtextdecorationstyledoublespacescaleshtml">branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-style-double-space-scales.html</a></li>
<li><a href="#branchessafari538345branchLayoutTestsfastcss3textcss3textdecorationtextdecorationthicknesshtml">branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html</a></li>
<li><a href="#branchessafari538345branchSourceWebCoreChangeLog">branches/safari-538.34.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWebCoreplatformgraphicsGraphicsContextcpp">branches/safari-538.34.5-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#branchessafari538345branchSourceWebCorerenderingInlineTextBoxcpp">branches/safari-538.34.5-branch/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/LayoutTests/ChangeLog (169126 => 169127)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/LayoutTests/ChangeLog 2014-05-20 20:18:33 UTC (rev 169126)
+++ branches/safari-538.34.5-branch/LayoutTests/ChangeLog 2014-05-20 20:21:23 UTC (rev 169127)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-20 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168599
+
+ 2014-05-09 Myles C. Maxfield <litherum@gmail.com>
+
+ [Mac] [iOS] Underlines are too low
+ https://bugs.webkit.org/show_bug.cgi?id=132770
+
+ Reviewed by Darin Adler.
+
+ See per-file descriptions.
+
+ * fast/css3-text/css3-text-decoration/text-decoration-style-double-space-scales.html: Made
+ test more robust so it does not barely clip underlines, but rather gives them a couple
+ pixels of wiggle room.
+ * fast/css3-text/css3-text-decoration/text-decoration-thickness.html: Not only does this test
+ underline thickness, but it also tests underline position. Updated this test to not expect
+ incorrect results.
+
</ins><span class="cx"> 2014-05-09 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168460
</span></span></pre></div>
<a id="branchessafari538345branchLayoutTestsfastcss3textcss3textdecorationtextdecorationstyledoublespacescaleshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-style-double-space-scales.html (169126 => 169127)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-style-double-space-scales.html 2014-05-20 20:18:33 UTC (rev 169126)
+++ branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-style-double-space-scales.html 2014-05-20 20:21:23 UTC (rev 169127)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> using overflow: hidden. It makes sure that this is exactly the same as a single underline. If the
</span><span class="cx"> space between the two underlines does not scale with font size, it will appear as though there is a
</span><span class="cx"> single thick underline (because they will be drawn on top of each other) and will thus fail this test.
</span><del>-<div style="width: 100px; height: 99px; overflow: hidden;">
</del><ins>+<div style="width: 100px; height: 95px; overflow: hidden;">
</ins><span class="cx"> <div style="text-decoration: underline; font-size: 100px; -webkit-text-decoration-style: double; font-family: Ahem;">&nbsp;</div>
</span><span class="cx"> </div>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="branchessafari538345branchLayoutTestsfastcss3textcss3textdecorationtextdecorationthicknesshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html (169126 => 169127)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html 2014-05-20 20:18:33 UTC (rev 169126)
+++ branches/safari-538.34.5-branch/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html 2014-05-20 20:21:23 UTC (rev 169127)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> the text so that the underline should fill a box if the underline grows in proportion
</span><span class="cx"> to text size. The comparison is to a box that has its background color set.
</span><span class="cx"> <div style="position: relative; width: 600px; height: 600px; overflow: hidden;">
</span><del>-<div style="font-family: Ahem; text-decoration: underline; font-size: 10000px; position: absolute; left: 0px; top: -8650px;">&nbsp;</div>
</del><ins>+<div style="font-family: Ahem; text-decoration: underline; font-size: 10000px; position: absolute; left: 0px; top: -8350px;">&nbsp;</div>
</ins><span class="cx"> </div>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/ChangeLog (169126 => 169127)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/ChangeLog 2014-05-20 20:18:33 UTC (rev 169126)
+++ branches/safari-538.34.5-branch/Source/WebCore/ChangeLog 2014-05-20 20:21:23 UTC (rev 169127)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-05-20 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168599
+
+ 2014-05-09 Myles C. Maxfield <litherum@gmail.com>
+
+ [Mac] [iOS] Underlines are too low
+ https://bugs.webkit.org/show_bug.cgi?id=132770
+
+ Reviewed by Darin Adler.
+
+ computeUnderlineOffset() inside InlineTextBox.cpp lowers underlines from text
+ baseline by a value that is proportional to the font size. However, this
+ lowering was done a second time in
+ GraphicsContext::computeLineBoundsAndAntialiasingModeForText(). This patch
+ removes this second, platform-dependent lowering.
+
+ This duplication was caused by merging iOS into open source, where iOS used
+ the GraphicsContext approach and open source used the InlineTextBox approach.
+
+ Covered by fast/css3-text/css3-text-decoration/text-decoration-thickness.html.
+
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::computeLineBoundsAndAntialiasingModeForText): Remove
+ redundant lowering code
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintDecoration): Clean up textDecorationThickness
+ variable
+
</ins><span class="cx"> 2014-05-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r169023
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp (169126 => 169127)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-05-20 20:18:33 UTC (rev 169126)
+++ branches/safari-538.34.5-branch/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-05-20 20:21:23 UTC (rev 169127)
</span><span class="lines">@@ -985,16 +985,8 @@
</span><span class="cx"> color = Color(color.red(), color.green(), color.blue(), alpha);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Don't offset line from bottom of text if scale is less than offsetUnderLineScale.
- static const float offsetUnderlineScale = 0.4f;
- float dy = scale < offsetUnderlineScale ? 0 : 1;
-
- // If we've increased the thickness of the line, make sure to move the location too.
- if (thickness > 1)
- dy += roundf(thickness) - 1;
-
</del><span class="cx"> FloatPoint devicePoint = transform.mapPoint(point);
</span><del>- FloatPoint deviceOrigin = FloatPoint(roundf(devicePoint.x()), ceilf(devicePoint.y()) + dy);
</del><ins>+ FloatPoint deviceOrigin = FloatPoint(roundf(devicePoint.x()), ceilf(devicePoint.y()));
</ins><span class="cx"> origin = transform.inverse().mapPoint(deviceOrigin);
</span><span class="cx"> }
</span><span class="cx"> return FloatRect(origin.x(), origin.y(), width, thickness);
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebCore/rendering/InlineTextBox.cpp (169126 => 169127)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebCore/rendering/InlineTextBox.cpp 2014-05-20 20:18:33 UTC (rev 169126)
+++ branches/safari-538.34.5-branch/Source/WebCore/rendering/InlineTextBox.cpp 2014-05-20 20:21:23 UTC (rev 169127)
</span><span class="lines">@@ -981,9 +981,6 @@
</span><span class="cx"> UNUSED_PARAM(textPainter);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // FIXME: We should improve this rule and not always just assume 1.
- const float textDecorationThickness = 1.f;
-
</del><span class="cx"> if (m_truncation == cFullTruncation)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1006,9 +1003,8 @@
</span><span class="cx"> bool isPrinting = renderer().document().printing();
</span><span class="cx">
</span><span class="cx"> const float textDecorationBaseFontSize = 16;
</span><del>- float fontSizeScaling = renderer().style().fontSize() / textDecorationBaseFontSize;
- float strokeThickness = roundf(textDecorationThickness * fontSizeScaling);
- context.setStrokeThickness(strokeThickness);
</del><ins>+ float textDecorationThickness = renderer().style().fontSize() / textDecorationBaseFontSize;
+ context.setStrokeThickness(textDecorationThickness);
</ins><span class="cx">
</span><span class="cx"> bool linesAreOpaque = !isPrinting && (!(decoration & TextDecorationUnderline) || underline.alpha() == 255) && (!(decoration & TextDecorationOverline) || overline.alpha() == 255) && (!(decoration & TextDecorationLineThrough) || linethrough.alpha() == 255);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>