<!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>[188148] 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/188148">188148</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-08-07 12:40:45 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Shadows don't draw on fillText when using a gradient fill
https://bugs.webkit.org/show_bug.cgi?id=147758
<rdar://problem/20860912>
Reviewed by Myles Maxfield.
Source/WebCore:
Since we use a mask to render a pattern or gradient
into text, any shadow was being clipped out. Change
this to draw the shadow before the mask + fill operation,
using a technique similar to text-shadow.
Test: fast/canvas/gradient-text-with-shadow.html
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawTextInternal): Get the current shadow
style, paint the text with a transformed shadow offset so that we only
see the shadow and not the text, then combine with the existing pattern/gradient
fill.
LayoutTests:
New test that exercises shadows on gradient fills. This really
should be a ref test, but there is a very small rendering difference
caused by masking, so instead it uses JS to look for pixels of
the correct color.
* fast/canvas/gradient-text-with-shadow-expected.txt: Added.
* fast/canvas/gradient-text-with-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="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvasgradienttextwithshadowexpectedtxt">trunk/LayoutTests/fast/canvas/gradient-text-with-shadow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvasgradienttextwithshadowhtml">trunk/LayoutTests/fast/canvas/gradient-text-with-shadow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188147 => 188148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-07 19:34:13 UTC (rev 188147)
+++ trunk/LayoutTests/ChangeLog 2015-08-07 19:40:45 UTC (rev 188148)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-06 Dean Jackson <dino@apple.com>
+
+ Shadows don't draw on fillText when using a gradient fill
+ https://bugs.webkit.org/show_bug.cgi?id=147758
+ <rdar://problem/20860912>
+
+ Reviewed by Myles Maxfield.
+
+ New test that exercises shadows on gradient fills. This really
+ should be a ref test, but there is a very small rendering difference
+ caused by masking, so instead it uses JS to look for pixels of
+ the correct color.
+
+ * fast/canvas/gradient-text-with-shadow-expected.txt: Added.
+ * fast/canvas/gradient-text-with-shadow.html: Added.
+
</ins><span class="cx"> 2015-08-07 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement font-feature-settings
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasgradienttextwithshadowexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/gradient-text-with-shadow-expected.txt (0 => 188148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/gradient-text-with-shadow-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/gradient-text-with-shadow-expected.txt 2015-08-07 19:40:45 UTC (rev 188148)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASSED
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/gradient-text-with-shadow-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcanvasgradienttextwithshadowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/gradient-text-with-shadow.html (0 => 188148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/gradient-text-with-shadow.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/gradient-text-with-shadow.html 2015-08-07 19:40:45 UTC (rev 188148)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<script>
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function runTest() {
+
+ var canvas = document.querySelector("canvas");
+ var context = canvas.getContext('2d');
+
+ context.shadowOffsetX = 0;
+ context.shadowOffsetY = 10;
+ context.shadowBlur = 0;
+ context.shadowColor = "rgb(255, 0, 0)";
+
+ context.font = "80px sans-serif";
+
+ var gradient = context.createLinearGradient(0, 0, 0, 100);
+ gradient.addColorStop(0, "blue");
+ gradient.addColorStop(1, "blue");
+
+ context.fillStyle = gradient;
+ context.fillText("hello", 10, 95);
+
+ // If we correctly drew the shadow, there will be some
+ // red pixels along the bottom line of the canvas.
+
+ var buffer = context.getImageData(0, canvas.height - 1, canvas.width, 1);
+ var passed = false;
+ for (var i = 0; i < canvas.width; ++i) {
+ if (buffer.data[i * 4] > 0) {
+ passed = true;
+ break;
+ }
+ }
+ document.querySelector("p").textContent = passed ? "PASSED" : "FAILED";
+}
+
+window.addEventListener("load", runTest, false);
+
+</script>
+<canvas width="200" height="100"></canvas>
+<p></p>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/canvas/gradient-text-with-shadow.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188147 => 188148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-07 19:34:13 UTC (rev 188147)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 19:40:45 UTC (rev 188148)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-08-06 Dean Jackson <dino@apple.com>
+
+ Shadows don't draw on fillText when using a gradient fill
+ https://bugs.webkit.org/show_bug.cgi?id=147758
+ <rdar://problem/20860912>
+
+ Reviewed by Myles Maxfield.
+
+ Since we use a mask to render a pattern or gradient
+ into text, any shadow was being clipped out. Change
+ this to draw the shadow before the mask + fill operation,
+ using a technique similar to text-shadow.
+
+ Test: fast/canvas/gradient-text-with-shadow.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawTextInternal): Get the current shadow
+ style, paint the text with a transformed shadow offset so that we only
+ see the shadow and not the text, then combine with the existing pattern/gradient
+ fill.
+
</ins><span class="cx"> 2015-08-07 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement font-feature-settings
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (188147 => 188148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-08-07 19:34:13 UTC (rev 188147)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-08-07 19:40:45 UTC (rev 188148)
</span><span class="lines">@@ -2357,8 +2357,40 @@
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> const CanvasStyle& drawStyle = fill ? state().m_fillStyle : state().m_strokeStyle;
</span><span class="cx"> if (drawStyle.canvasGradient() || drawStyle.canvasPattern()) {
</span><ins>+
</ins><span class="cx"> IntRect maskRect = enclosingIntRect(textRect);
</span><span class="cx">
</span><ins>+ // If we have a shadow, we need to draw it before the mask operation.
+ // Follow a procedure similar to paintTextWithShadows in TextPainter.
+
+ if (shouldDrawShadows()) {
+ GraphicsContextStateSaver stateSaver(*c);
+
+ FloatSize offset = FloatSize(0, 2 * maskRect.height());
+
+ FloatSize shadowOffset;
+ float shadowRadius;
+ Color shadowColor;
+ ColorSpace shadowColorSpace;
+ c->getShadow(shadowOffset, shadowRadius, shadowColor, shadowColorSpace);
+
+ FloatRect shadowRect(maskRect);
+ shadowRect.inflate(shadowRadius * 1.4);
+ shadowRect.move(shadowOffset * -1);
+ c->clip(shadowRect);
+
+ shadowOffset += offset;
+
+ c->setLegacyShadow(shadowOffset, shadowRadius, shadowColor, shadowColorSpace);
+
+ if (fill)
+ c->setFillColor(Color::black, ColorSpaceDeviceRGB);
+ else
+ c->setStrokeColor(Color::black, ColorSpaceDeviceRGB);
+
+ c->drawBidiText(font, textRun, location + offset, FontCascade::UseFallbackIfFontNotReady);
+ }
+
</ins><span class="cx"> std::unique_ptr<ImageBuffer> maskImage = c->createCompatibleBuffer(maskRect.size());
</span><span class="cx">
</span><span class="cx"> GraphicsContext* maskImageContext = maskImage->context();
</span></span></pre>
</div>
</div>
</body>
</html>