<!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>[172153] 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/172153">172153</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-08-06 10:35:59 -0700 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Text-shadow with (0, 0) offset and radius = 0 is ugly
https://bugs.webkit.org/show_bug.cgi?id=135357
Reviewed by Darin Adler.
Source/WebCore:
Instead, check for this kind of shadow and don't draw it.
Test: fast/text/empty-shadow.html
* rendering/TextPainter.cpp:
(WebCore::isEmptyShadow): Does a shadow match these criteria?
(WebCore::paintTextWithShadows): If so, don't draw it.
LayoutTests:
Check that this kind of shadow ends up invisible.
* fast/text/empty-shadow-expected.html: Added
* fast/text/empty-shadow.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="#trunkSourceWebCorerenderingTextPaintercpp">trunk/Source/WebCore/rendering/TextPainter.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextemptyshadowexpectedhtml">trunk/LayoutTests/fast/text/empty-shadow-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextemptyshadowhtml">trunk/LayoutTests/fast/text/empty-shadow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172152 => 172153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-06 17:27:41 UTC (rev 172152)
+++ trunk/LayoutTests/ChangeLog        2014-08-06 17:35:59 UTC (rev 172153)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text-shadow with (0, 0) offset and radius = 0 is ugly
+ https://bugs.webkit.org/show_bug.cgi?id=135357
+
+ Reviewed by Darin Adler.
+
+ Check that this kind of shadow ends up invisible.
+
+ * fast/text/empty-shadow-expected.html: Added
+ * fast/text/empty-shadow.html: Added
+
</ins><span class="cx"> 2014-08-06 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Move full screen tests into fast/regions/fullscreen
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextemptyshadowexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/empty-shadow-expected.html (0 => 172153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/empty-shadow-expected.html         (rev 0)
+++ trunk/LayoutTests/fast/text/empty-shadow-expected.html        2014-08-06 17:35:59 UTC (rev 172153)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This tests that text drawn with text-shadows of radius 0 and (0, 0) offset are not drawn.
+This is a better outcome than them being drawn in an ugly way.
+This test is successful if the text below is completely invisible.
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextemptyshadowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/empty-shadow.html (0 => 172153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/empty-shadow.html         (rev 0)
+++ trunk/LayoutTests/fast/text/empty-shadow.html        2014-08-06 17:35:59 UTC (rev 172153)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This tests that text drawn with text-shadows of radius 0 and (0, 0) offset are not drawn.
+This is a better outcome than them being drawn in an ugly way.
+This test is successful if the text below is completely invisible.
+<div style="color:#fff;text-shadow:0 0 #000">This is some text</div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172152 => 172153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-06 17:27:41 UTC (rev 172152)
+++ trunk/Source/WebCore/ChangeLog        2014-08-06 17:35:59 UTC (rev 172153)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text-shadow with (0, 0) offset and radius = 0 is ugly
+ https://bugs.webkit.org/show_bug.cgi?id=135357
+
+ Reviewed by Darin Adler.
+
+ Instead, check for this kind of shadow and don't draw it.
+
+ Test: fast/text/empty-shadow.html
+
+ * rendering/TextPainter.cpp:
+ (WebCore::isEmptyShadow): Does a shadow match these criteria?
+ (WebCore::paintTextWithShadows): If so, don't draw it.
+
</ins><span class="cx"> 2014-08-06 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] QuickLook returns an invalid MIME type for some documents
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (172152 => 172153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp        2014-08-06 17:27:41 UTC (rev 172152)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp        2014-08-06 17:35:59 UTC (rev 172153)
</span><span class="lines">@@ -60,6 +60,13 @@
</span><span class="cx"> context.drawEmphasisMarks(font, textRun, emphasisMark, point + IntSize(0, emphasisMarkOffset), from, to);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isEmptyShadow(const ShadowData* shadowPtr)
+{
+ if (!shadowPtr)
+ return true;
+ return shadow->location() == IntPoint() && !shadow->radius();
+}
+
</ins><span class="cx"> static void paintTextWithShadows(GraphicsContext* context, const Font& font, const TextRun& textRun, const AtomicString& emphasisMark,
</span><span class="cx"> int emphasisMarkOffset, int startOffset, int endOffset, int truncationPoint, const FloatPoint& textOrigin, const FloatRect& boxRect,
</span><span class="cx"> const ShadowData* shadow, bool stroked, bool horizontal)
</span><span class="lines">@@ -72,7 +79,8 @@
</span><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> IntSize extraOffset;
</span><del>- if (shadow)
</del><ins>+ bool shadowIsEmpty = isEmptyShadow(shadow);
+ if (!shadowIsEmpty)
</ins><span class="cx"> extraOffset = roundedIntSize(InlineTextBox::applyShadowToGraphicsContext(context, shadow, boxRect, stroked, opaque, horizontal));
</span><span class="cx"> else if (!opaque)
</span><span class="cx"> context->setFillColor(fillColor, fillColorSpace);
</span><span class="lines">@@ -91,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> if (shadow->next() || stroked || !opaque)
</span><span class="cx"> context->restore();
</span><del>- else
</del><ins>+ else if (!shadowIsEmpty)
</ins><span class="cx"> context->clearShadow();
</span><span class="cx">
</span><span class="cx"> shadow = shadow->next();
</span></span></pre>
</div>
</div>
</body>
</html>