<!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>[235877] 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/235877">235877</a></dd>
<dt>Author</dt> <dd>megan_gardner@apple.com</dd>
<dt>Date</dt> <dd>2018-09-10 17:51:42 -0700 (Mon, 10 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Correctly interpret from angle for conic gradients
https://bugs.webkit.org/show_bug.cgi?id=189445

Reviewed by Simon Fraser

No new tests, no functionality is changing.

Just renaming angle to angleRadians to make the type more clear,
and hopefully avoid bugs in the future. Update patch to original bug
fix.

* css/CSSGradientValue.cpp:
(WebCore::CSSConicGradientValue::createGradient):
* inspector/InspectorCanvas.cpp:
(WebCore::InspectorCanvas::buildArrayForCanvasGradient):
* platform/graphics/Gradient.cpp:
(WebCore::Gradient::hash const):
* platform/graphics/Gradient.h:
* platform/graphics/cg/GradientCG.cpp:
(WebCore::Gradient::paint):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGradientValuecpp">trunk/Source/WebCore/css/CSSGradientValue.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvascpp">trunk/Source/WebCore/inspector/InspectorCanvas.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradientcpp">trunk/Source/WebCore/platform/graphics/Gradient.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradienth">trunk/Source/WebCore/platform/graphics/Gradient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGradientCGcpp">trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (235876 => 235877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-09-11 00:44:15 UTC (rev 235876)
+++ trunk/Source/WebCore/ChangeLog      2018-09-11 00:51:42 UTC (rev 235877)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2018-09-10  Megan Gardner  <megan_gardner@apple.com>
+
+        Correctly interpret from angle for conic gradients
+        https://bugs.webkit.org/show_bug.cgi?id=189445
+
+        Reviewed by Simon Fraser
+
+        No new tests, no functionality is changing.
+
+        Just renaming angle to angleRadians to make the type more clear, 
+        and hopefully avoid bugs in the future. Update patch to original bug
+        fix.
+
+        * css/CSSGradientValue.cpp:
+        (WebCore::CSSConicGradientValue::createGradient):
+        * inspector/InspectorCanvas.cpp:
+        (WebCore::InspectorCanvas::buildArrayForCanvasGradient):
+        * platform/graphics/Gradient.cpp:
+        (WebCore::Gradient::hash const):
+        * platform/graphics/Gradient.h:
+        * platform/graphics/cg/GradientCG.cpp:
+        (WebCore::Gradient::paint):
+
</ins><span class="cx"> 2018-09-10  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         ontrack events should be fired even if an existing transceiver exists
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGradientValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGradientValue.cpp (235876 => 235877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGradientValue.cpp    2018-09-11 00:44:15 UTC (rev 235876)
+++ trunk/Source/WebCore/css/CSSGradientValue.cpp       2018-09-11 00:51:42 UTC (rev 235877)
</span><span class="lines">@@ -1434,11 +1434,11 @@
</span><span class="cx">     if (!m_firstY)
</span><span class="cx">         centerPoint.setY(size.height() / 2);
</span><span class="cx"> 
</span><del>-    float angle = 0;
</del><ins>+    float angleRadians = 0;
</ins><span class="cx">     if (m_angle)
</span><del>-        angle = m_angle->floatValue(CSSPrimitiveValue::CSS_RAD);
</del><ins>+        angleRadians = m_angle->floatValue(CSSPrimitiveValue::CSS_RAD);
</ins><span class="cx"> 
</span><del>-    Gradient::ConicData data { centerPoint, angle };
</del><ins>+    Gradient::ConicData data { centerPoint, angleRadians };
</ins><span class="cx">     ConicGradientAdapter adapter;
</span><span class="cx">     auto stops = computeStops(adapter, conversionData, renderer.style(), 1);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvascpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCanvas.cpp (235876 => 235877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvas.cpp       2018-09-11 00:44:15 UTC (rev 235876)
+++ trunk/Source/WebCore/inspector/InspectorCanvas.cpp  2018-09-11 00:51:42 UTC (rev 235877)
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx">         [&parameters] (const Gradient::ConicData& data) {
</span><span class="cx">             parameters->addItem(data.point0.x());
</span><span class="cx">             parameters->addItem(data.point0.y());
</span><del>-            parameters->addItem(data.angle);
</del><ins>+            parameters->addItem(data.angleRadians);
</ins><span class="cx">         }
</span><span class="cx">     );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Gradient.cpp (235876 => 235877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Gradient.cpp      2018-09-11 00:44:15 UTC (rev 235876)
+++ trunk/Source/WebCore/platform/graphics/Gradient.cpp 2018-09-11 00:51:42 UTC (rev 235877)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">         float startRadius;
</span><span class="cx">         float endRadius;
</span><span class="cx">         float aspectRatio;
</span><del>-        float angle;
</del><ins>+        float angleRadians;
</ins><span class="cx">         GradientSpreadMethod spreadMethod;
</span><span class="cx">         AffineTransform gradientSpaceTransformation;
</span><span class="cx">     } parameters;
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">             parameters.startRadius = 0;
</span><span class="cx">             parameters.endRadius = 0;
</span><span class="cx">             parameters.aspectRatio = 0;
</span><del>-            parameters.angle = 0;
</del><ins>+            parameters.angleRadians = 0;
</ins><span class="cx">             parameters.type = Type::Linear;
</span><span class="cx">         },
</span><span class="cx">         [&parameters] (const RadialData& data) {
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">             parameters.startRadius = data.startRadius;
</span><span class="cx">             parameters.endRadius = data.endRadius;
</span><span class="cx">             parameters.aspectRatio = data.aspectRatio;
</span><del>-            parameters.angle = 0;
</del><ins>+            parameters.angleRadians = 0;
</ins><span class="cx">             parameters.type = Type::Radial;
</span><span class="cx">         },
</span><span class="cx">         [&parameters] (const ConicData& data) {
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">             parameters.startRadius = 0;
</span><span class="cx">             parameters.endRadius = 0;
</span><span class="cx">             parameters.aspectRatio = 0;
</span><del>-            parameters.angle = data.angle;
</del><ins>+            parameters.angleRadians = data.angleRadians;
</ins><span class="cx">             parameters.type = Type::Conic;
</span><span class="cx">         }
</span><span class="cx">     );
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Gradient.h (235876 => 235877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Gradient.h        2018-09-11 00:44:15 UTC (rev 235876)
+++ trunk/Source/WebCore/platform/graphics/Gradient.h   2018-09-11 00:51:42 UTC (rev 235877)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">     
</span><span class="cx">     struct ConicData {
</span><span class="cx">         FloatPoint point0;
</span><del>-        float angle;
</del><ins>+        float angleRadians;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     using Data = Variant<LinearData, RadialData, ConicData>;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGradientCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp (235876 => 235877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp 2018-09-11 00:44:15 UTC (rev 235876)
+++ trunk/Source/WebCore/platform/graphics/cg/GradientCG.cpp    2018-09-11 00:51:42 UTC (rev 235877)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">             CGContextTranslateCTM(platformContext, data.point0.x(), data.point0.y());
</span><span class="cx">             CGContextRotateCTM(platformContext, (CGFloat)-M_PI_2);
</span><span class="cx">             CGContextTranslateCTM(platformContext, -data.point0.x(), -data.point0.y());
</span><del>-            CGContextDrawConicGradient(platformContext, platformGradient(), data.point0, data.angle);
</del><ins>+            CGContextDrawConicGradient(platformContext, platformGradient(), data.point0, data.angleRadians);
</ins><span class="cx">             CGContextRestoreGState(platformContext);
</span><span class="cx"> #else
</span><span class="cx">             UNUSED_PARAM(data);
</span></span></pre>
</div>
</div>

</body>
</html>