<!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>[164741] 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/164741">164741</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-02-26 13:13:03 -0800 (Wed, 26 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Underlines are too thick when zoomed in
https://bugs.webkit.org/show_bug.cgi?id=129352
Reviewed by Dean Jackson.
Source/WebCore:
The input to the underline drawing code is in user-space, not device-space.
The underlines were getting scaled twice, once in InlineTextBox and the other
in GraphicsContext.
Test: fast/css3-text/css3-text-decoration/text-decoration-scaled.html
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):
LayoutTests:
This test changes the page scale factor to a very large value, simulating
the user zooming in with a trackpad. It then positions the viewport
to a place where the underline should not be drawn. It then compares this
to a completely white page.
This explanation cannot be in the test itself because the test sets the
scale factor too high for the tester to be able to read text.
* fast/css3-text/css3-text-decoration/text-decoration-scaled-expected.html: Added.
* fast/css3-text/css3-text-decoration/text-decoration-scaled.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="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationscaledexpectedhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationscaledhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164740 => 164741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-26 20:58:13 UTC (rev 164740)
+++ trunk/LayoutTests/ChangeLog 2014-02-26 21:13:03 UTC (rev 164741)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Underlines are too thick when zoomed in
+ https://bugs.webkit.org/show_bug.cgi?id=129352
+
+ Reviewed by Dean Jackson.
+
+ This test changes the page scale factor to a very large value, simulating
+ the user zooming in with a trackpad. It then positions the viewport
+ to a place where the underline should not be drawn. It then compares this
+ to a completely white page.
+
+ This explanation cannot be in the test itself because the test sets the
+ scale factor too high for the tester to be able to read text.
+
+ * fast/css3-text/css3-text-decoration/text-decoration-scaled-expected.html: Added.
+ * fast/css3-text/css3-text-decoration/text-decoration-scaled.html: Added.
+
</ins><span class="cx"> 2014-02-26 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Function.prototype.apply has a bad time with the spread operator
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationscaledexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled-expected.html (0 => 164741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled-expected.html 2014-02-26 21:13:03 UTC (rev 164741)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<script>
+if (window.internals)
+ window.internals.setPageScaleFactor(100, 0, 0);
+</script>
+<div style="position: absolute; left: 0px; top: 0px; width: 1px; height: 1px; background: white;">
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationscaledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled.html (0 => 164741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-scaled.html 2014-02-26 21:13:03 UTC (rev 164741)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<script>
+if (window.internals)
+ window.internals.setPageScaleFactor(100, 0, 0);
+</script>
+<div style="position: absolute; left: 0px; top: 0px; width: 1px; height: 1px; overflow: hidden;">
+<div style="font-family: Ahem; font-size: 12px; overflow: hidden; position: absolute; left: 0px; top: -12px; text-decoration: underline;">&nbsp;</div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164740 => 164741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-26 20:58:13 UTC (rev 164740)
+++ trunk/Source/WebCore/ChangeLog 2014-02-26 21:13:03 UTC (rev 164741)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Underlines are too thick when zoomed in
+ https://bugs.webkit.org/show_bug.cgi?id=129352
+
+ Reviewed by Dean Jackson.
+
+ The input to the underline drawing code is in user-space, not device-space.
+ The underlines were getting scaled twice, once in InlineTextBox and the other
+ in GraphicsContext.
+
+ Test: fast/css3-text/css3-text-decoration/text-decoration-scaled.html
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintDecoration):
+
</ins><span class="cx"> 2014-02-26 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused InspectorCounters.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (164740 => 164741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-26 20:58:13 UTC (rev 164740)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-26 21:13:03 UTC (rev 164741)
</span><span class="lines">@@ -1060,18 +1060,9 @@
</span><span class="cx"> // Use a special function for underlines to get the positioning exactly right.
</span><span class="cx"> bool isPrinting = renderer().document().printing();
</span><span class="cx">
</span><del>- // On iOS we want to draw crisp decorations. The function drawLineForText takes the context's
- // strokeThickness and renders that at device pixel scale (i.e. a strokeThickness of 1 will
- // produce a 1 device pixel line, so thinner on retina than non-retina). We will also scale
- // our thickness based on the size of the font. Since our default size is 16px we'll use that
- // as a scale reference.
- float pageScale = 1;
- if (Page* page = renderer().frame().page())
- pageScale = page->pageScaleFactor();
-
</del><span class="cx"> const float textDecorationBaseFontSize = 16;
</span><span class="cx"> float fontSizeScaling = renderer().style().fontSize() / textDecorationBaseFontSize;
</span><del>- float strokeThickness = roundf(textDecorationThickness * fontSizeScaling * pageScale);
</del><ins>+ float strokeThickness = roundf(textDecorationThickness * fontSizeScaling);
</ins><span class="cx"> context.setStrokeThickness(strokeThickness);
</span><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></pre>
</div>
</div>
</body>
</html>