<!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>[201777] 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/201777">201777</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-06-07 17:06:28 -0700 (Tue, 07 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Text-decoration-style: dashed / dotted rendered as solid
https://bugs.webkit.org/show_bug.cgi?id=134336
Reviewed by Dean Jackson.
Source/WebCore:
We already had most of the infrastructure for dotted / dashed underlines.
Previously, we were setting the stroke style for the underlines, but then
filling the underlines (which means the stroke styles is irrelevant).
Instead, we should just compute the individual dots / dashes to fill.
The implementation of this is done inside GraphicsContext because
GraphicsContext is already responsible for handling the single / double
underline distinction. Extending it to be responsible for dotted / dashed
is the natural thing to do.
Tests: fast/css3-text/css3-text-decoration/text-decoration-dashed.html
fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html
fast/css3-text/css3-text-decoration/text-decoration-dotted.html
* platform/graphics/GraphicsContext.h:
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::drawLineForText):
(WebCore::GraphicsContext::drawLinesForText):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::drawLineForText):
(WebCore::GraphicsContext::drawLinesForText):
* rendering/TextDecorationPainter.cpp:
(WebCore::drawSkipInkUnderline):
(WebCore::TextDecorationPainter::paintTextDecoration):
LayoutTests:
Make sure that the dotted / dashed / solid renderings are all distinct.
* fast/css3-text/css3-text-decoration/text-decoration-dashed-expected-mismatch.html: Added.
* fast/css3-text/css3-text-decoration/text-decoration-dashed.html: Added.
* fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed-expected-mismatch.html: Added.
* fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html: Added.
* fast/css3-text/css3-text-decoration/text-decoration-dotted-expected-mismatch.html: Added.
* fast/css3-text/css3-text-decoration/text-decoration-dotted.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="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextDecorationPaintercpp">trunk/Source/WebCore/rendering/TextDecorationPainter.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdashedexpectedmismatchhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdashedhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdotteddashedexpectedmismatchhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdotteddashedhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdottedexpectedmismatchhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdottedhtml">trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201776 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-07 23:45:53 UTC (rev 201776)
+++ trunk/LayoutTests/ChangeLog 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-07 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text-decoration-style: dashed / dotted rendered as solid
+ https://bugs.webkit.org/show_bug.cgi?id=134336
+
+ Reviewed by Dean Jackson.
+
+ Make sure that the dotted / dashed / solid renderings are all distinct.
+
+ * fast/css3-text/css3-text-decoration/text-decoration-dashed-expected-mismatch.html: Added.
+ * fast/css3-text/css3-text-decoration/text-decoration-dashed.html: Added.
+ * fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed-expected-mismatch.html: Added.
+ * fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html: Added.
+ * fast/css3-text/css3-text-decoration/text-decoration-dotted-expected-mismatch.html: Added.
+ * fast/css3-text/css3-text-decoration/text-decoration-dotted.html: Added.
+
</ins><span class="cx"> 2016-06-07 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Skipping http/tests/websocket/tests/hybi/upgrade-simple-ws.html
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdashedexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed-expected-mismatch.html (0 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed-expected-mismatch.html 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 40px; -webkit-text-decoration-style: solid; text-decoration: underline;">dotyedgdesc</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdashedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed.html (0 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dashed.html 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 40px; -webkit-text-decoration-style: dashed; text-decoration: underline;">dotyedgdesc</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdotteddashedexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed-expected-mismatch.html (0 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed-expected-mismatch.html 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 40px; -webkit-text-decoration-style: dashed; text-decoration: underline;">dotyedgdesc</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdotteddashedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html (0 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 40px; -webkit-text-decoration-style: dotted; text-decoration: underline;">dotyedgdesc</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdottedexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-expected-mismatch.html (0 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted-expected-mismatch.html 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 40px; -webkit-text-decoration-style: solid; text-decoration: underline;">dotyedgdesc</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastcss3textcss3textdecorationtextdecorationdottedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted.html (0 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted.html (rev 0)
+++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-dotted.html 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font-size: 40px; -webkit-text-decoration-style: dotted; text-decoration: underline;">dotyedgdesc</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201776 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-07 23:45:53 UTC (rev 201776)
+++ trunk/Source/WebCore/ChangeLog 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-06-07 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text-decoration-style: dashed / dotted rendered as solid
+ https://bugs.webkit.org/show_bug.cgi?id=134336
+
+ Reviewed by Dean Jackson.
+
+ We already had most of the infrastructure for dotted / dashed underlines.
+ Previously, we were setting the stroke style for the underlines, but then
+ filling the underlines (which means the stroke styles is irrelevant).
+ Instead, we should just compute the individual dots / dashes to fill.
+
+ The implementation of this is done inside GraphicsContext because
+ GraphicsContext is already responsible for handling the single / double
+ underline distinction. Extending it to be responsible for dotted / dashed
+ is the natural thing to do.
+
+ Tests: fast/css3-text/css3-text-decoration/text-decoration-dashed.html
+ fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html
+ fast/css3-text/css3-text-decoration/text-decoration-dotted.html
+
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::drawLineForText):
+ (WebCore::GraphicsContext::drawLinesForText):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::drawLineForText):
+ (WebCore::GraphicsContext::drawLinesForText):
+ * rendering/TextDecorationPainter.cpp:
+ (WebCore::drawSkipInkUnderline):
+ (WebCore::TextDecorationPainter::paintTextDecoration):
+
</ins><span class="cx"> 2016-06-07 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: iOS: Need to expose whether object is a dialog element
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (201776 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-06-07 23:45:53 UTC (rev 201776)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -395,8 +395,8 @@
</span><span class="cx"> FloatRect roundToDevicePixels(const FloatRect&, RoundingMode = RoundAllSides);
</span><span class="cx">
</span><span class="cx"> FloatRect computeUnderlineBoundsForText(const FloatPoint&, float width, bool printing);
</span><del>- WEBCORE_EXPORT void drawLineForText(const FloatPoint&, float width, bool printing, bool doubleLines = false);
- void drawLinesForText(const FloatPoint&, const DashArray& widths, bool printing, bool doubleLines = false);
</del><ins>+ WEBCORE_EXPORT void drawLineForText(const FloatPoint&, float width, bool printing, bool doubleLines = false, StrokeStyle = SolidStroke);
+ void drawLinesForText(const FloatPoint&, const DashArray& widths, bool printing, bool doubleLines = false, StrokeStyle = SolidStroke);
</ins><span class="cx"> enum DocumentMarkerLineStyle {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> TextCheckingDictationPhraseWithAlternativesLineStyle,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (201776 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2016-06-07 23:45:53 UTC (rev 201776)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> drawFocusRing(path, width, 0, color);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawLineForText(const FloatPoint& origin, float width, bool printing, bool doubleUnderlines)
</del><ins>+void GraphicsContext::drawLineForText(const FloatPoint& origin, float width, bool printing, bool doubleUnderlines, StrokeStyle)
</ins><span class="cx"> {
</span><span class="cx"> DashArray widths;
</span><span class="cx"> widths.append(width);
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> drawLinesForText(origin, widths, printing, doubleUnderlines);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing, bool doubleUnderlines)
</del><ins>+void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing, bool doubleUnderlines, StrokeStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (201776 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-06-07 23:45:53 UTC (rev 201776)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -1479,15 +1479,15 @@
</span><span class="cx"> return FloatRect(roundedOrigin, roundedLowerRight - roundedOrigin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawLineForText(const FloatPoint& point, float width, bool printing, bool doubleLines)
</del><ins>+void GraphicsContext::drawLineForText(const FloatPoint& point, float width, bool printing, bool doubleLines, StrokeStyle strokeStyle)
</ins><span class="cx"> {
</span><span class="cx"> DashArray widths;
</span><span class="cx"> widths.append(width);
</span><span class="cx"> widths.append(0);
</span><del>- drawLinesForText(point, widths, printing, doubleLines);
</del><ins>+ drawLinesForText(point, widths, printing, doubleLines, strokeStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing, bool doubleLines)
</del><ins>+void GraphicsContext::drawLinesForText(const FloatPoint& point, const DashArray& widths, bool printing, bool doubleLines, StrokeStyle strokeStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (paintingDisabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -1508,9 +1508,33 @@
</span><span class="cx"> Vector<CGRect, 4> dashBounds;
</span><span class="cx"> ASSERT(!(widths.size() % 2));
</span><span class="cx"> dashBounds.reserveInitialCapacity(dashBounds.size() / 2);
</span><del>- for (size_t i = 0; i < widths.size(); i += 2)
- dashBounds.append(CGRectMake(bounds.x() + widths[i], bounds.y(), widths[i+1] - widths[i], bounds.height()));
</del><span class="cx">
</span><ins>+ float dashWidth = 0;
+ switch (strokeStyle) {
+ case DottedStroke:
+ dashWidth = bounds.height();
+ break;
+ case DashedStroke:
+ dashWidth = 2 * bounds.height();
+ break;
+ case SolidStroke:
+ default:
+ break;
+ }
+
+ for (size_t i = 0; i < widths.size(); i += 2) {
+ auto left = widths[i];
+ auto width = widths[i+1] - widths[i];
+ if (!dashWidth)
+ dashBounds.append(CGRectMake(bounds.x() + left, bounds.y(), width, bounds.height()));
+ else {
+ auto startParticle = static_cast<unsigned>(std::ceil(left / (2 * dashWidth)));
+ auto endParticle = static_cast<unsigned>((left + width) / (2 * dashWidth));
+ for (unsigned j = startParticle; j < endParticle; ++j)
+ dashBounds.append(CGRectMake(bounds.x() + j * 2 * dashWidth, bounds.y(), dashWidth, bounds.height()));
+ }
+ }
+
</ins><span class="cx"> if (doubleLines) {
</span><span class="cx"> // The space between double underlines is equal to the height of the underline
</span><span class="cx"> for (size_t i = 0; i < widths.size(); i += 2)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextDecorationPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextDecorationPainter.cpp (201776 => 201777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2016-06-07 23:45:53 UTC (rev 201776)
+++ trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2016-06-08 00:06:28 UTC (rev 201777)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void drawSkipInkUnderline(GraphicsContext& context, const FontCascade& font, const TextRun& textRun, const FloatPoint& textOrigin, const FloatPoint& localOrigin,
</span><del>- float underlineOffset, float width, bool isPrinting, bool doubleLines)
</del><ins>+ float underlineOffset, float width, bool isPrinting, bool doubleLines, StrokeStyle strokeStyle)
</ins><span class="cx"> {
</span><span class="cx"> FloatPoint adjustedLocalOrigin = localOrigin;
</span><span class="cx"> adjustedLocalOrigin.move(0, underlineOffset);
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> DashArray intersections = font.dashesForIntersectionsWithRect(textRun, textOrigin, underlineBoundingBox);
</span><span class="cx"> DashArray a = translateIntersectionPointsToSkipInkBoundaries(intersections, underlineBoundingBox.height(), width);
</span><span class="cx"> ASSERT(!(a.size() % 2));
</span><del>- context.drawLinesForText(adjustedLocalOrigin, a, isPrinting, doubleLines);
</del><ins>+ context.drawLinesForText(adjustedLocalOrigin, a, isPrinting, doubleLines, strokeStyle);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -267,7 +267,6 @@
</span><span class="cx"> auto paintDecoration = [&](TextDecoration decoration, TextDecorationStyle style, Color color, StrokeStyle strokeStyle,
</span><span class="cx"> const FloatPoint& start, const FloatPoint& end, int offset) {
</span><span class="cx"> m_context.setStrokeColor(color);
</span><del>- m_context.setStrokeStyle(strokeStyle);
</del><span class="cx">
</span><span class="cx"> if (style == TextDecorationStyleWavy)
</span><span class="cx"> strokeWavyTextDecoration(m_context, start, end, textDecorationThickness);
</span><span class="lines">@@ -275,15 +274,15 @@
</span><span class="cx"> #if ENABLE(CSS3_TEXT_DECORATION_SKIP_INK)
</span><span class="cx"> if ((m_lineStyle.textDecorationSkip() == TextDecorationSkipInk || m_lineStyle.textDecorationSkip() == TextDecorationSkipAuto) && m_isHorizontal) {
</span><span class="cx"> if (!m_context.paintingDisabled())
</span><del>- drawSkipInkUnderline(m_context, *m_font, textRun, textOrigin, localOrigin, offset, m_width, m_isPrinting, style == TextDecorationStyleDouble);
</del><ins>+ drawSkipInkUnderline(m_context, *m_font, textRun, textOrigin, localOrigin, offset, m_width, m_isPrinting, style == TextDecorationStyleDouble, strokeStyle);
</ins><span class="cx"> } else
</span><span class="cx"> // FIXME: Need to support text-decoration-skip: none.
</span><span class="cx"> #endif
</span><del>- m_context.drawLineForText(start, m_width, m_isPrinting, style == TextDecorationStyleDouble);
</del><ins>+ m_context.drawLineForText(start, m_width, m_isPrinting, style == TextDecorationStyleDouble, strokeStyle);
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(decoration == TextDecorationLineThrough);
</span><del>- m_context.drawLineForText(start, m_width, m_isPrinting, style == TextDecorationStyleDouble);
</del><ins>+ m_context.drawLineForText(start, m_width, m_isPrinting, style == TextDecorationStyleDouble, strokeStyle);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>