<!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>[163921] 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/163921">163921</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 17:54:19 -0800 (Tue, 11 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Position and thickness of underline as text size changes
https://bugs.webkit.org/show_bug.cgi?id=16768

Source/WebCore:

Reviewed by Dean Jackson.

This patch adopts the iOS codepath for underlines. It also reorganizes
drawLineForText to avoid a costly global state save &amp; restore.

Test: fast/css3-text/css3-text-decoration/text-decoration-thickness.html

* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::computeLineBoundsAndAntialiasingModeForText):
(WebCore::GraphicsContext::computeLineBoundsForText):
(WebCore::GraphicsContext::drawLineForText):
(WebCore::GraphicsContext::drawLinesForText):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintDecoration):

LayoutTests:

This test draws underlined text at a very large font size. It then positions and clips
the text so that the underline should fill a box if the underline grows in proportion
to text size. The comparison is to a box that has its background color set.

Reviewed by Dean Jackson.

* fast/css3-text/css3-text-decoration/text-decoration-thickness-expected.html: Added.
* fast/css3-text/css3-text-decoration/text-decoration-thickness.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="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationthicknessexpectedhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationthicknesshtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163920 => 163921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-02-12 01:53:03 UTC (rev 163920)
+++ trunk/LayoutTests/ChangeLog        2014-02-12 01:54:19 UTC (rev 163921)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-11  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Position and thickness of underline as text size changes
+        https://bugs.webkit.org/show_bug.cgi?id=16768
+
+        This test draws underlined text at a very large font size. It then positions and clips
+        the text so that the underline should fill a box if the underline grows in proportion
+        to text size. The comparison is to a box that has its background color set.
+
+        Reviewed by Dean Jackson.
+
+        * fast/css3-text/css3-text-decoration/text-decoration-thickness-expected.html: Added.
+        * fast/css3-text/css3-text-decoration/text-decoration-thickness.html: Added.
+
</ins><span class="cx"> 2014-02-10  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Convert position:sticky and position:fixed properties to position:static and position:absolute upon copy
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationthicknessexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness-expected.html (0 => 163921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness-expected.html        2014-02-12 01:54:19 UTC (rev 163921)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test draws underlined text at a very large font size. It then positions and clips
+the text so that the underline should fill a box if the underline grows in proportion
+to text size. The comparison is to a box that has its background color set.
+&lt;div style=&quot;position: relative; width: 600px; height: 600px; background: #000&quot;&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationthicknesshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html (0 => 163921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html                                (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-thickness.html        2014-02-12 01:54:19 UTC (rev 163921)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test draws underlined text at a very large font size. It then positions and clips
+the text so that the underline should fill a box if the underline grows in proportion
+to text size. The comparison is to a box that has its background color set.
+&lt;div style=&quot;position: relative; width: 600px; height: 600px; overflow: hidden;&quot;&gt;
+&lt;div style=&quot;font-family: Ahem; text-decoration: underline; font-size: 10000px; position: absolute; left: 0px; top: -8650px;&quot;&gt;&amp;nbsp;&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163920 => 163921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-02-12 01:53:03 UTC (rev 163920)
+++ trunk/Source/WebCore/ChangeLog        2014-02-12 01:54:19 UTC (rev 163921)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-11  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Position and thickness of underline as text size changes
+        https://bugs.webkit.org/show_bug.cgi?id=16768
+
+        Reviewed by Dean Jackson.
+
+        This patch adopts the iOS codepath for underlines. It also reorganizes
+        drawLineForText to avoid a costly global state save &amp; restore.
+
+        Test: fast/css3-text/css3-text-decoration/text-decoration-thickness.html
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::computeLineBoundsAndAntialiasingModeForText):
+        (WebCore::GraphicsContext::computeLineBoundsForText):
+        (WebCore::GraphicsContext::drawLineForText):
+        (WebCore::GraphicsContext::drawLinesForText):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paintDecoration):
+
</ins><span class="cx"> 2014-02-11  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Frame::rectForSelection shouldn't instantiate FrameSelection
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (163920 => 163921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2014-02-12 01:53:03 UTC (rev 163920)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp        2014-02-12 01:54:19 UTC (rev 163921)
</span><span class="lines">@@ -1346,9 +1346,6 @@
</span><span class="cx">     return FloatRect(roundedOrigin, roundedLowerRight - roundedOrigin);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-// FIXME: We should look to consolidate the iOS and non-iOS implementations of
-// computeLineBoundsAndAntialiasingModeForText() and computeLineBoundsForText().
-#if PLATFORM(IOS)
</del><span class="cx"> static FloatRect computeLineBoundsAndAntialiasingModeForText(GraphicsContext&amp; initialContext, const FloatPoint&amp; point, float width, bool printing, bool&amp; shouldAntialias, Color&amp; color)
</span><span class="cx"> {
</span><span class="cx">     CGContextRef context = initialContext.platformContext();
</span><span class="lines">@@ -1387,7 +1384,6 @@
</span><span class="cx">         CGPoint devicePoint = CGPointApplyAffineTransform(point, t);
</span><span class="cx">         CGPoint deviceOrigin = CGPointMake(roundf(devicePoint.x), ceilf(devicePoint.y) + dy);
</span><span class="cx">         origin = CGPointApplyAffineTransform(deviceOrigin, CGAffineTransformInvert(t));
</span><del>-        thickness /= scale;
</del><span class="cx">     }
</span><span class="cx">     return FloatRect(origin.x, origin.y, width, thickness);
</span><span class="cx"> }
</span><span class="lines">@@ -1398,44 +1394,7 @@
</span><span class="cx">     Color dummyColor;
</span><span class="cx">     return computeLineBoundsAndAntialiasingModeForText(*this, point, width, printing, dummyBool, dummyColor);
</span><span class="cx"> }
</span><del>-#else
-static FloatRect computeLineBoundsAndAntialiasingModeForText(GraphicsContext&amp; context, const FloatPoint&amp; point, float width, bool printing, bool&amp; shouldAntialias)
-{
-    shouldAntialias = true;
</del><span class="cx"> 
</span><del>-    if (width &lt;= 0)
-        return FloatRect();
-
-    // Use a minimum thickness of 0.5 in user space.
-    // See http://bugs.webkit.org/show_bug.cgi?id=4255 for details of why 0.5 is the right minimum thickness to use.
-    FloatRect initialBounds(point, FloatSize(width, std::max(context.strokeThickness(), 0.5f)));
-
-    if (printing || context.paintingDisabled() || !context.getCTM(GraphicsContext::DefinitelyIncludeDeviceScale).preservesAxisAlignment())
-        return initialBounds;
-
-    // On screen, use a minimum thickness of 1.0 in user space (later rounded to an integral number in device space).
-    FloatRect adjustedBounds = initialBounds;
-    adjustedBounds.setHeight(std::max(initialBounds.height(), 1.0f));
-
-    // FIXME: This should be done a better way.
-    // We try to round all parameters to integer boundaries in device space. If rounding pixels in device space
-    // makes our thickness more than double, then there must be a shrinking-scale factor and rounding to pixels
-    // in device space will make the underlines too thick.
-    FloatRect lineRect = context.roundToDevicePixels(adjustedBounds, GraphicsContext::RoundAllSides);
-    if (lineRect.height() &lt; initialBounds.height() * 2) {
-        shouldAntialias = false;
-        return lineRect;
-    }
-    return initialBounds;
-}
-
-FloatRect GraphicsContext::computeLineBoundsForText(const FloatPoint&amp; point, float width, bool printing)
-{
-    bool dummy;
-    return computeLineBoundsAndAntialiasingModeForText(*this, point, width, printing, dummy);
-}
-#endif
-
</del><span class="cx"> void GraphicsContext::drawLineForText(const FloatPoint&amp; point, float width, bool printing)
</span><span class="cx"> {
</span><span class="cx">     if (paintingDisabled())
</span><span class="lines">@@ -1444,41 +1403,25 @@
</span><span class="cx">     if (width &lt;= 0)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-#if !PLATFORM(IOS)
</del><ins>+    Color localStrokeColor(strokeColor());
+
</ins><span class="cx">     bool shouldAntialiasLine;
</span><del>-    FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(*this, point, width, printing, shouldAntialiasLine);
</del><ins>+    FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(*this, point, width, printing, shouldAntialiasLine, localStrokeColor);
+    bool fillColorIsNotEqualToStrokeColor = fillColor() != localStrokeColor;
</ins><span class="cx"> 
</span><del>-    bool savedShouldAntialias = shouldAntialias();
-    bool restoreAntialiasMode = savedShouldAntialias != shouldAntialiasLine;
</del><ins>+#if PLATFORM(IOS)
+    if (m_state.shouldUseContextColors)
+#endif
+        if (fillColorIsNotEqualToStrokeColor)
+            setCGFillColor(platformContext(), localStrokeColor, strokeColorSpace());
</ins><span class="cx"> 
</span><del>-    if (restoreAntialiasMode)
-        CGContextSetShouldAntialias(platformContext(), shouldAntialiasLine);
-
-    bool fillColorIsNotEqualToStrokeColor = fillColor() != strokeColor();
-    if (fillColorIsNotEqualToStrokeColor)
-        setCGFillColor(platformContext(), strokeColor(), strokeColorSpace());
</del><span class="cx">     CGContextFillRect(platformContext(), bounds);
</span><del>-    if (fillColorIsNotEqualToStrokeColor)
-        setCGFillColor(platformContext(), fillColor(), fillColorSpace());
-    CGContextSetShouldAntialias(platformContext(), savedShouldAntialias);
</del><span class="cx"> 
</span><del>-    if (restoreAntialiasMode)
-        CGContextSetShouldAntialias(platformContext(), true);
-#else
-    CGContextRef context = platformContext();
-    CGContextSaveGState(context);
-
-    Color color(strokeColor());
-    
-    bool shouldAntialiasLine;
-    FloatRect rect = computeLineBoundsAndAntialiasingModeForText(*this, point, width, printing, shouldAntialiasLine, color);
-
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">     if (m_state.shouldUseContextColors)
</span><del>-        setCGFillColor(context, color, strokeColorSpace());
-    CGContextFillRect(context, rect);
-
-    CGContextRestoreGState(context);
</del><span class="cx"> #endif
</span><ins>+        if (fillColorIsNotEqualToStrokeColor)
+            setCGFillColor(platformContext(), fillColor(), fillColorSpace());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GraphicsContext::drawLinesForText(const FloatPoint&amp; point, const DashArray&amp; widths, bool printing)
</span><span class="lines">@@ -1489,9 +1432,11 @@
</span><span class="cx">     if (widths.size() &lt;= 0)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-#if !PLATFORM(IOS)
</del><ins>+    Color localStrokeColor(strokeColor());
+
</ins><span class="cx">     bool shouldAntialiasLine;
</span><del>-    FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(*this, point, widths.last(), printing, shouldAntialiasLine);
</del><ins>+    FloatRect bounds = computeLineBoundsAndAntialiasingModeForText(*this, point, widths.last(), printing, shouldAntialiasLine, localStrokeColor);
+    bool fillColorIsNotEqualToStrokeColor = fillColor() != localStrokeColor;
</ins><span class="cx">     
</span><span class="cx">     Vector&lt;CGRect, 4&gt; dashBounds;
</span><span class="cx">     ASSERT(!(widths.size() % 2));
</span><span class="lines">@@ -1499,43 +1444,19 @@
</span><span class="cx">     for (size_t i = 0; i &lt; widths.size(); i += 2)
</span><span class="cx">         dashBounds.append(CGRectMake(bounds.x() + widths[i], bounds.y(), widths[i+1] - widths[i], bounds.height()));
</span><span class="cx"> 
</span><del>-    bool savedShouldAntialias = shouldAntialias();
-    bool restoreAntialiasMode = savedShouldAntialias != shouldAntialiasLine;
</del><ins>+#if PLATFORM(IOS)
+    if (m_state.shouldUseContextColors)
+#endif
+        if (fillColorIsNotEqualToStrokeColor)
+            setCGFillColor(platformContext(), localStrokeColor, strokeColorSpace());
</ins><span class="cx"> 
</span><del>-    if (restoreAntialiasMode)
-        CGContextSetShouldAntialias(platformContext(), shouldAntialiasLine);
-
-    bool fillColorIsNotEqualToStrokeColor = fillColor() != strokeColor();
-    if (fillColorIsNotEqualToStrokeColor)
-        setCGFillColor(platformContext(), strokeColor(), strokeColorSpace());
</del><span class="cx">     CGContextFillRects(platformContext(), dashBounds.data(), dashBounds.size());
</span><del>-    if (fillColorIsNotEqualToStrokeColor)
-        setCGFillColor(platformContext(), fillColor(), fillColorSpace());
-    CGContextSetShouldAntialias(platformContext(), savedShouldAntialias);
</del><span class="cx"> 
</span><del>-    if (restoreAntialiasMode)
-        CGContextSetShouldAntialias(platformContext(), true);
-#else
-    CGContextRef context = platformContext();
-    CGContextSaveGState(context);
-
-    Color color(strokeColor());
-    
-    bool shouldAntialiasLine;
-    FloatRect rect = computeLineBoundsAndAntialiasingModeForText(*this, point, widths.last(), printing, shouldAntialiasLine, color);
-    
-    Vector&lt;CGRect, 4&gt; dashBounds;
-    ASSERT(!(widths.size() % 2));
-    dashBounds.reserveInitialCapacity(dashBounds.size() / 2);
-    for (size_t i = 0; i &lt; widths.size(); i += 2)
-        dashBounds.append(CGRectMake(rect.x() + widths[i], rect.y(), widths[i+1] - widths[i], rect.height()));
-
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">     if (m_state.shouldUseContextColors)
</span><del>-        setCGFillColor(context, color, strokeColorSpace());
-    CGContextFillRects(context, dashBounds.data(), dashBounds.size());
-
-    CGContextRestoreGState(context);
</del><span class="cx"> #endif
</span><ins>+        if (fillColorIsNotEqualToStrokeColor)
+            setCGFillColor(platformContext(), fillColor(), fillColorSpace());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GraphicsContext::setURLForRect(const URL&amp; link, const IntRect&amp; destRect)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (163920 => 163921)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp        2014-02-12 01:53:03 UTC (rev 163920)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp        2014-02-12 01:54:19 UTC (rev 163921)
</span><span class="lines">@@ -1059,9 +1059,7 @@
</span><span class="cx">     
</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><del>-#if !PLATFORM(IOS)
-    context.setStrokeThickness(textDecorationThickness);
-#else
</del><ins>+
</ins><span class="cx">     // On iOS we want to draw crisp decorations. The function drawLineForText takes the context's
</span><span class="cx">     // strokeThickness and renders that at device pixel scale (i.e. a strokeThickness of 1 will
</span><span class="cx">     // produce a 1 device pixel line, so thinner on retina than non-retina). We will also scale
</span><span class="lines">@@ -1075,7 +1073,6 @@
</span><span class="cx">     float fontSizeScaling = renderer().style().fontSize() / textDecorationBaseFontSize;
</span><span class="cx">     float strokeThickness = roundf(textDecorationThickness * fontSizeScaling * pageScale);
</span><span class="cx">     context.setStrokeThickness(strokeThickness);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     bool linesAreOpaque = !isPrinting &amp;&amp; (!(decoration &amp; TextDecorationUnderline) || underline.alpha() == 255) &amp;&amp; (!(decoration &amp; TextDecorationOverline) || overline.alpha() == 255) &amp;&amp; (!(decoration &amp; TextDecorationLineThrough) || linethrough.alpha() == 255);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>