<!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>[207028] 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/207028">207028</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-10-10 15:10:55 -0700 (Mon, 10 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win][Direct2D] Correct Radial Graident Bug
https://bugs.webkit.org/show_bug.cgi?id=163241
Reviewed by Darin Adler.
Radial gradients were not working correctly under Direct2D because the
points and radius values used were incorrect. D2D wants a center point and
an offset, not a start and end point. It wants an X and Y radius (for an
ellipse), not a radius at the start point, and a radius at the end point.
Covered by existing fast/gradients/css-radial-gradients.html (and others).
* platform/graphics/Image.cpp:
(WebCore::Image::drawTiled): Remove 'notImplemented' code path.
* platform/graphics/win/GradientDirect2D.cpp:
(WebCore::Gradient::generateGradient): Use correct input values to
the Radial Gradient constructor.
(WebCore::Gradient::fill): Generate a gradient if we have no active
one to use.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImagecpp">trunk/Source/WebCore/platform/graphics/Image.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGradientDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/GradientDirect2D.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207027 => 207028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-10 22:07:19 UTC (rev 207027)
+++ trunk/Source/WebCore/ChangeLog 2016-10-10 22:10:55 UTC (rev 207028)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Win][Direct2D] Correct Radial Graident Bug
+ https://bugs.webkit.org/show_bug.cgi?id=163241
+
+ Reviewed by Darin Adler.
+
+ Radial gradients were not working correctly under Direct2D because the
+ points and radius values used were incorrect. D2D wants a center point and
+ an offset, not a start and end point. It wants an X and Y radius (for an
+ ellipse), not a radius at the start point, and a radius at the end point.
+
+ Covered by existing fast/gradients/css-radial-gradients.html (and others).
+
+ * platform/graphics/Image.cpp:
+ (WebCore::Image::drawTiled): Remove 'notImplemented' code path.
+ * platform/graphics/win/GradientDirect2D.cpp:
+ (WebCore::Gradient::generateGradient): Use correct input values to
+ the Radial Gradient constructor.
+ (WebCore::Gradient::fill): Generate a gradient if we have no active
+ one to use.
+
</ins><span class="cx"> 2016-10-10 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename CryptoAlgorithmParameters to CryptoAlgorithmParametersDeprecated
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Image.cpp (207027 => 207028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Image.cpp 2016-10-10 22:07:19 UTC (rev 207027)
+++ trunk/Source/WebCore/platform/graphics/Image.cpp 2016-10-10 22:10:55 UTC (rev 207028)
</span><span class="lines">@@ -93,9 +93,6 @@
</span><span class="cx">
</span><span class="cx"> void Image::drawTiled(GraphicsContext& ctxt, const FloatRect& destRect, const FloatPoint& srcPoint, const FloatSize& scaledTileSize, const FloatSize& spacing, CompositeOperator op, BlendMode blendMode)
</span><span class="cx"> {
</span><del>-#if USE(DIRECT2D)
- notImplemented();
-#else
</del><span class="cx"> Color color = singlePixelSolidColor();
</span><span class="cx"> if (color.isValid()) {
</span><span class="cx"> fillWithSolidColor(ctxt, destRect, color, op);
</span><span class="lines">@@ -203,7 +200,6 @@
</span><span class="cx"> #else
</span><span class="cx"> startAnimation();
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Merge with the other drawTiled eventually, since we need a combination of both for some things.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGradientDirect2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GradientDirect2D.cpp (207027 => 207028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GradientDirect2D.cpp 2016-10-10 22:07:19 UTC (rev 207027)
+++ trunk/Source/WebCore/platform/graphics/win/GradientDirect2D.cpp 2016-10-10 22:10:55 UTC (rev 207028)
</span><span class="lines">@@ -67,9 +67,12 @@
</span><span class="cx"> RELEASE_ASSERT(SUCCEEDED(hr));
</span><span class="cx">
</span><span class="cx"> if (m_radial) {
</span><ins>+ FloatSize offset = p1() - p0();
</ins><span class="cx"> ID2D1RadialGradientBrush* radialGradient = nullptr;
</span><ins>+ float radiusX = endRadius() + offset.width();
+ float radiusY = radiusX / m_aspectRatio;
</ins><span class="cx"> hr = renderTarget->CreateRadialGradientBrush(
</span><del>- D2D1::RadialGradientBrushProperties(p0(), p1(), startRadius(), endRadius()),
</del><ins>+ D2D1::RadialGradientBrushProperties(p0(), D2D1::Point2F(offset.width(), offset.height()), radiusX, radiusY),
</ins><span class="cx"> D2D1::BrushProperties(), gradientStopCollection.get(),
</span><span class="cx"> &radialGradient);
</span><span class="cx"> RELEASE_ASSERT(SUCCEEDED(hr));
</span><span class="lines">@@ -109,7 +112,7 @@
</span><span class="cx"> d2dContext->SetTransform(ctm);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_cachedHash)
</del><ins>+ if (!m_cachedHash || !m_gradient)
</ins><span class="cx"> generateGradient(d2dContext);
</span><span class="cx">
</span><span class="cx"> if (!context->didBeginDraw())
</span></span></pre>
</div>
</div>
</body>
</html>