<!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>[173418] 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/173418">173418</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-09-08 19:56:24 -0700 (Mon, 08 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/172153">r172153</a>): Text drawn with wrong color when second text shadow has zero offset and blur (breaks buttons at aws.amazon.com)
https://bugs.webkit.org/show_bug.cgi?id=136612
Reviewed by Darin Adler.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/172153">r172153</a> was fundamentally broken, and would restore graphics contexts that had never been saved. This patch
reimplements <a href="http://trac.webkit.org/projects/webkit/changeset/172153">r172153</a> by using "continue" to skip loop iterations instead of changing the internal logic of
the loop.
In addition, I have refactored InlineTextBox::applyShadowToGraphicsContext() to take an extra boolean
reference as an out parameter in order to make it obvious it if saved a graphics context that needs
to be restored. This should make it less likely to make these kinds of mistakes in the future.
Test: fast/text/empty-shadow-with-color.html
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::applyShadowToGraphicsContext): Add bool reference out param.
* rendering/InlineTextBox.h: Ditto.
* rendering/TextPainter.cpp:
(WebCore::isEmptyShadow): Change logic to not skip loop iterations on a null shadow.
(WebCore::paintTextWithShadows): Use continue to skip loop iterations for empty shadows. In addition,
use the out param in InlineTextBox::applyShadowToGraphicsContext().
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::paintTextWithShadows): Update for new sigurature of
InlineTextBox::applyShadowToGraphicsContext().
LayoutTests:
Make sure that text is drawn with correct color when second text shadow has zero offset and blur
* fast/text/empty-shadow-with-color-expected.html: Added.
* fast/text/empty-shadow-with-color.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>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintercpp">trunk/Source/WebCore/rendering/TextPainter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextemptyshadowwithcolorexpectedhtml">trunk/LayoutTests/fast/text/empty-shadow-with-color-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextemptyshadowwithcolorhtml">trunk/LayoutTests/fast/text/empty-shadow-with-color.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173417 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-09 02:31:21 UTC (rev 173417)
+++ trunk/LayoutTests/ChangeLog 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION (r172153): Text drawn with wrong color when second text shadow has zero offset and blur (breaks buttons at aws.amazon.com)
+ https://bugs.webkit.org/show_bug.cgi?id=136612
+
+ Reviewed by Darin Adler.
+
+ Make sure that text is drawn with correct color when second text shadow has zero offset and blur
+
+ * fast/text/empty-shadow-with-color-expected.html: Added.
+ * fast/text/empty-shadow-with-color.html: Added.
+
</ins><span class="cx"> 2014-09-08 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. More webgl conformance test gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextemptyshadowwithcolorexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/empty-shadow-with-color-expected.html (0 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/empty-shadow-with-color-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/empty-shadow-with-color-expected.html 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#test {
+ color: green;
+ font-size: 16px;
+}
+</style>
+</head>
+<body>
+This test makes sure that text drawn with an empty shadow is colored correctly. It passes if the following text is green.
+<div id="test">This should be green.</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextemptyshadowwithcolorhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/empty-shadow-with-color.html (0 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/empty-shadow-with-color.html (rev 0)
+++ trunk/LayoutTests/fast/text/empty-shadow-with-color.html 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#test {
+ color: green;
+ font-size: 16px;
+ text-shadow: red 20px 20px, red 0px 0px;
+ overflow: hidden;
+}
+</style>
+</head>
+<body>
+This test makes sure that text drawn with an empty shadow is colored correctly. It passes if the following text is green.
+<div id="test">This should be green.</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173417 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-09 02:31:21 UTC (rev 173417)
+++ trunk/Source/WebCore/ChangeLog 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-09-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION (r172153): Text drawn with wrong color when second text shadow has zero offset and blur (breaks buttons at aws.amazon.com)
+ https://bugs.webkit.org/show_bug.cgi?id=136612
+
+ Reviewed by Darin Adler.
+
+ r172153 was fundamentally broken, and would restore graphics contexts that had never been saved. This patch
+ reimplements r172153 by using "continue" to skip loop iterations instead of changing the internal logic of
+ the loop.
+
+ In addition, I have refactored InlineTextBox::applyShadowToGraphicsContext() to take an extra boolean
+ reference as an out parameter in order to make it obvious it if saved a graphics context that needs
+ to be restored. This should make it less likely to make these kinds of mistakes in the future.
+
+ Test: fast/text/empty-shadow-with-color.html
+
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::applyShadowToGraphicsContext): Add bool reference out param.
+ * rendering/InlineTextBox.h: Ditto.
+ * rendering/TextPainter.cpp:
+ (WebCore::isEmptyShadow): Change logic to not skip loop iterations on a null shadow.
+ (WebCore::paintTextWithShadows): Use continue to skip loop iterations for empty shadows. In addition,
+ use the out param in InlineTextBox::applyShadowToGraphicsContext().
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::paintTextWithShadows): Update for new sigurature of
+ InlineTextBox::applyShadowToGraphicsContext().
+
</ins><span class="cx"> 2014-09-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173402.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (173417 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-09-09 02:31:21 UTC (rev 173417)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatSize InlineTextBox::applyShadowToGraphicsContext(GraphicsContext* context, const ShadowData* shadow, const FloatRect& textRect, bool stroked, bool opaque, bool horizontal)
</del><ins>+FloatSize InlineTextBox::applyShadowToGraphicsContext(GraphicsContext* context, const ShadowData* shadow, const FloatRect& textRect, bool stroked, bool opaque, bool horizontal, bool& didSaveContext)
</ins><span class="cx"> {
</span><span class="cx"> if (!shadow)
</span><span class="cx"> return FloatSize();
</span><span class="lines">@@ -445,6 +445,7 @@
</span><span class="cx">
</span><span class="cx"> extraOffset = FloatSize(0, 2 * textRect.height() + std::max(0.0f, shadowOffset.height()) + shadowRadius);
</span><span class="cx"> shadowOffset -= extraOffset;
</span><ins>+ didSaveContext = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> context->setShadow(shadowOffset, shadowRadius, shadowColor, context->fillColorSpace());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (173417 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2014-09-09 02:31:21 UTC (rev 173417)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> virtual float positionForOffset(int offset) const;
</span><span class="cx">
</span><span class="cx"> // Needs to be public, so the static paintTextWithShadows() function can use it.
</span><del>- static FloatSize applyShadowToGraphicsContext(GraphicsContext*, const ShadowData*, const FloatRect& textRect, bool stroked, bool opaque, bool horizontal);
</del><ins>+ static FloatSize applyShadowToGraphicsContext(GraphicsContext*, const ShadowData*, const FloatRect& textRect, bool stroked, bool opaque, bool horizontal, bool& didSaveContext);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void paintCompositionBackground(GraphicsContext*, const FloatPoint& boxOrigin, const RenderStyle&, const Font&, int startPos, int endPos);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (173417 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2014-09-09 02:31:21 UTC (rev 173417)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> static bool isEmptyShadow(const ShadowData* shadow)
</span><span class="cx"> {
</span><span class="cx"> if (!shadow)
</span><del>- return true;
</del><ins>+ return false;
</ins><span class="cx"> return shadow->location() == IntPoint() && !shadow->radius();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,10 +78,15 @@
</span><span class="cx"> context->setFillColor(Color::black, fillColorSpace);
</span><span class="cx">
</span><span class="cx"> do {
</span><ins>+ if (isEmptyShadow(shadow)) {
+ shadow = shadow->next();
+ continue;
+ }
+
</ins><span class="cx"> IntSize extraOffset;
</span><del>- bool shadowIsEmpty = isEmptyShadow(shadow);
- if (!shadowIsEmpty)
- extraOffset = roundedIntSize(InlineTextBox::applyShadowToGraphicsContext(context, shadow, boxRect, stroked, opaque, horizontal));
</del><ins>+ bool didSaveContext = false;
+ if (shadow)
+ extraOffset = roundedIntSize(InlineTextBox::applyShadowToGraphicsContext(context, shadow, boxRect, stroked, opaque, horizontal, didSaveContext));
</ins><span class="cx"> else if (!opaque)
</span><span class="cx"> context->setFillColor(fillColor, fillColorSpace);
</span><span class="cx">
</span><span class="lines">@@ -97,9 +102,9 @@
</span><span class="cx"> if (!shadow)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- if (shadow->next() || stroked || !opaque)
</del><ins>+ if (didSaveContext)
</ins><span class="cx"> context->restore();
</span><del>- else if (!shadowIsEmpty)
</del><ins>+ else
</ins><span class="cx"> context->clearShadow();
</span><span class="cx">
</span><span class="cx"> shadow = shadow->next();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (173417 => 173418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-09-09 02:31:21 UTC (rev 173417)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-09-09 02:56:24 UTC (rev 173418)
</span><span class="lines">@@ -595,8 +595,9 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> FloatSize extraOffset;
</span><ins>+ bool didSaveContext = false;
</ins><span class="cx"> if (shadow)
</span><del>- extraOffset = applyShadowToGraphicsContext(context, shadow, shadowRect, false /* stroked */, true /* opaque */, true /* horizontal */);
</del><ins>+ extraOffset = applyShadowToGraphicsContext(context, shadow, shadowRect, false /* stroked */, true /* opaque */, true /* horizontal */, didSaveContext);
</ins><span class="cx">
</span><span class="cx"> context->save();
</span><span class="cx"> context->scale(FloatSize(1 / scalingFactor, 1 / scalingFactor));
</span><span class="lines">@@ -606,7 +607,7 @@
</span><span class="cx"> context->restore();
</span><span class="cx">
</span><span class="cx"> if (shadow) {
</span><del>- if (shadow->next())
</del><ins>+ if (didSaveContext)
</ins><span class="cx"> context->restore();
</span><span class="cx"> else
</span><span class="cx"> context->clearShadow();
</span></span></pre>
</div>
</div>
</body>
</html>