<!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>[194736] trunk/Source/WebCore</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/194736">194736</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-01-07 15:33:04 -0800 (Thu, 07 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use wavy offset for decoration painting when line style is TextDecorationStyleWavy.
https://bugs.webkit.org/show_bug.cgi?id=152856
Reviewed by Simon Fraser.
No change in functionality.
* rendering/TextDecorationPainter.cpp:
(WebCore::TextDecorationPainter::paintTextDecoration):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingTextDecorationPaintercpp">trunk/Source/WebCore/rendering/TextDecorationPainter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194735 => 194736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-07 23:32:29 UTC (rev 194735)
+++ trunk/Source/WebCore/ChangeLog 2016-01-07 23:33:04 UTC (rev 194736)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-07 Zalan Bujtas <zalan@apple.com>
+
+ Use wavy offset for decoration painting when line style is TextDecorationStyleWavy.
+ https://bugs.webkit.org/show_bug.cgi?id=152856
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/TextDecorationPainter.cpp:
+ (WebCore::TextDecorationPainter::paintTextDecoration):
+
</ins><span class="cx"> 2016-01-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Various imported/w3c/indexeddb tests fail due to expecting the wrong exception.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextDecorationPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextDecorationPainter.cpp (194735 => 194736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2016-01-07 23:32:29 UTC (rev 194735)
+++ trunk/Source/WebCore/rendering/TextDecorationPainter.cpp 2016-01-07 23:33:04 UTC (rev 194736)
</span><span class="lines">@@ -269,9 +269,9 @@
</span><span class="cx"> m_context.setStrokeColor(color);
</span><span class="cx"> m_context.setStrokeStyle(strokeStyle);
</span><span class="cx">
</span><del>- if (style == TextDecorationStyleWavy) {
</del><ins>+ if (style == TextDecorationStyleWavy)
</ins><span class="cx"> strokeWavyTextDecoration(m_context, start, end, textDecorationThickness);
</span><del>- } else if (decoration == TextDecorationUnderline || decoration == TextDecorationOverline) {
</del><ins>+ else if (decoration == TextDecorationUnderline || decoration == TextDecorationOverline) {
</ins><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><span class="lines">@@ -279,11 +279,11 @@
</span><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(FloatPoint(localOrigin.x(), localOrigin.y() + offset), m_width, m_isPrinting, style == TextDecorationStyleDouble);
</del><ins>+ m_context.drawLineForText(start, m_width, m_isPrinting, style == TextDecorationStyleDouble);
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(decoration == TextDecorationLineThrough);
</span><del>- m_context.drawLineForText(FloatPoint(localOrigin.x(), localOrigin.y() + 2 * m_baseline / 3), m_width, m_isPrinting, style == TextDecorationStyleDouble);
</del><ins>+ m_context.drawLineForText(start, m_width, m_isPrinting, style == TextDecorationStyleDouble);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -329,18 +329,20 @@
</span><span class="cx"> // These decorations should match the visual overflows computed in visualOverflowForDecorations()
</span><span class="cx"> if (m_decoration & TextDecorationUnderline) {
</span><span class="cx"> const int offset = computeUnderlineOffset(m_lineStyle.textUnderlinePosition(), m_lineStyle.fontMetrics(), m_inlineTextBox, textDecorationThickness);
</span><del>- FloatPoint start(localOrigin.x(), localOrigin.y() + offset + m_wavyOffset);
- FloatPoint end(localOrigin.x() + m_width, localOrigin.y() + offset + m_wavyOffset);
</del><ins>+ int wavyOffset = m_underlineStyle == TextDecorationStyleWavy ? m_wavyOffset : 0;
+ FloatPoint start = localOrigin + FloatSize(0, offset + wavyOffset);
+ FloatPoint end = localOrigin + FloatSize(m_width, offset + wavyOffset);
</ins><span class="cx"> paintDecoration(TextDecorationUnderline, m_underlineStyle, m_underlineColor, textDecorationStyleToStrokeStyle(m_underlineStyle), start, end, offset);
</span><span class="cx"> }
</span><span class="cx"> if (m_decoration & TextDecorationOverline) {
</span><del>- FloatPoint start(localOrigin.x(), localOrigin.y() - m_wavyOffset);
- FloatPoint end(localOrigin.x() + m_width, localOrigin.y() - m_wavyOffset);
</del><ins>+ int wavyOffset = m_overlineStyle == TextDecorationStyleWavy ? m_wavyOffset : 0;
+ FloatPoint start = localOrigin - FloatSize(0, wavyOffset);
+ FloatPoint end = localOrigin + FloatSize(m_width, -wavyOffset);
</ins><span class="cx"> paintDecoration(TextDecorationOverline, m_overlineStyle, m_overlineColor, textDecorationStyleToStrokeStyle(m_overlineStyle), start, end, 0);
</span><span class="cx"> }
</span><span class="cx"> if (m_decoration & TextDecorationLineThrough) {
</span><del>- FloatPoint start(localOrigin.x(), localOrigin.y() + 2 * m_baseline / 3);
- FloatPoint end(localOrigin.x() + m_width, localOrigin.y() + 2 * m_baseline / 3);
</del><ins>+ FloatPoint start = localOrigin + FloatSize(0, 2 * m_baseline / 3);
+ FloatPoint end = localOrigin + FloatSize(m_width, 2 * m_baseline / 3);
</ins><span class="cx"> paintDecoration(TextDecorationLineThrough, m_linethroughStyle, m_linethroughColor, textDecorationStyleToStrokeStyle(m_linethroughStyle), start, end, 0);
</span><span class="cx"> }
</span><span class="cx"> } while (shadow);
</span></span></pre>
</div>
</div>
</body>
</html>