<!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>[237510] releases/WebKitGTK/webkit-2.22</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/237510">237510</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2018-10-28 06:42:58 -0700 (Sun, 28 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/237119">r237119</a> - [Cairo] Incorrect rendering for 135-deg skews
https://bugs.webkit.org/show_bug.cgi?id=190513

Source/WebCore:

Compensation value to zero the the translation components
of the transformation matrix is incorrect if the matrix
has a shear factor.

Reviewed by Žan Doberšek.

Tests: fast/transforms/skew-x-135deg-with-gradient.html
       fast/transforms/skew-y-135deg-with-gradient.html

* platform/graphics/cairo/CairoUtilities.cpp:
(WebCore::drawPatternToCairoContext):

LayoutTests:

Reviewed by Žan Doberšek.

* fast/transforms/skew-x-135deg-with-gradient-expected.html: Added.
* fast/transforms/skew-x-135deg-with-gradient.html: Added.
* fast/transforms/skew-y-135deg-with-gradient-expected.html: Added.
* fast/transforms/skew-y-135deg-with-gradient.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscairoCairoUtilitiescpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewx135degwithgradientexpectedhtml">releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewx135degwithgradienthtml">releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient.html</a></li>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewy135degwithgradientexpectedhtml">releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewy135degwithgradienthtml">releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit222LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog (237509 => 237510)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog     2018-10-28 13:42:48 UTC (rev 237509)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/ChangeLog        2018-10-28 13:42:58 UTC (rev 237510)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2018-10-15  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
+
+        [Cairo] Incorrect rendering for 135-deg skews
+        https://bugs.webkit.org/show_bug.cgi?id=190513
+
+        Reviewed by Žan Doberšek.
+
+        * fast/transforms/skew-x-135deg-with-gradient-expected.html: Added.
+        * fast/transforms/skew-x-135deg-with-gradient.html: Added.
+        * fast/transforms/skew-y-135deg-with-gradient-expected.html: Added.
+        * fast/transforms/skew-y-135deg-with-gradient.html: Added.
+
</ins><span class="cx"> 2018-10-09  Said Abou-Hallawa  <sabouhallawa@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r234620): SVGLangSpace::svgAttributeChanged() should invalidate the renderer of the SVGGeometryElement descendant only
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewx135degwithgradientexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient-expected.html (0 => 237510)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient-expected.html                             (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient-expected.html        2018-10-28 13:42:58 UTC (rev 237510)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<html>
+<head>
+<style>
+#content {
+  margin:100px;
+  width:110px;
+  height:110px;
+  background-color:skyblue;
+  transform:skew(135deg, 0deg);
+  border:1px solid black;
+}
+
+#border {
+  width:100px;
+  height:100px;
+  position:absolute;
+  left: -5px;
+  top: -5px;
+  border:10px solid black;
+}
+
+</style>
+</head>
+In the example below you should see a skewed block filled with skyblue.
+
+<div id="content">
+  <div id="border"></div>
+</div>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewx135degwithgradienthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient.html (0 => 237510)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient.html                              (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-x-135deg-with-gradient.html 2018-10-28 13:42:58 UTC (rev 237510)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<html>
+<head>
+<style>
+#content {
+  margin:100px;
+  width:110px;
+  height:110px;
+  background:linear-gradient(skyblue,skyblue);
+  transform:skew(135deg, 0deg);
+  border:1px solid black;
+}
+
+#border {
+  width:100px;
+  height:100px;
+  position:absolute;
+  left: -5px;
+  top: -5px;
+  border:10px solid black;
+}
+
+</style>
+</head>
+In the example below you should see a skewed block filled with skyblue.
+
+<div id="content">
+  <div id="border"></div>
+</div>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewy135degwithgradientexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient-expected.html (0 => 237510)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient-expected.html                             (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient-expected.html        2018-10-28 13:42:58 UTC (rev 237510)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<html>
+<head>
+<style>
+#content {
+  margin:100px;
+  width:110px;
+  height:110px;
+  background-color:skyblue;
+  transform:skew(0deg, 135deg);
+  border:1px solid black;
+}
+
+#border {
+  width:100px;
+  height:100px;
+  position:absolute;
+  left: -5px;
+  top: -5px;
+  border:10px solid black;
+}
+
+</style>
+</head>
+In the example below you should see a skewed block filled with skyblue.
+
+<div id="content">
+  <div id="border"></div>
+</div>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit222LayoutTestsfasttransformsskewy135degwithgradienthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient.html (0 => 237510)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient.html                              (rev 0)
+++ releases/WebKitGTK/webkit-2.22/LayoutTests/fast/transforms/skew-y-135deg-with-gradient.html 2018-10-28 13:42:58 UTC (rev 237510)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<html>
+<head>
+<style>
+#content {
+  margin:100px;
+  width:110px;
+  height:110px;
+  background:linear-gradient(skyblue,skyblue);
+  transform:skew(0deg, 135deg);
+  border:1px solid black;
+}
+
+#border {
+  width:100px;
+  height:100px;
+  position:absolute;
+  left: -5px;
+  top: -5px;
+  border:10px solid black;
+}
+
+</style>
+</head>
+In the example below you should see a skewed block filled with skyblue.
+
+<div id="content">
+  <div id="border"></div>
+</div>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (237509 => 237510)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog  2018-10-28 13:42:48 UTC (rev 237509)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog     2018-10-28 13:42:58 UTC (rev 237510)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-10-15  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
+
+        [Cairo] Incorrect rendering for 135-deg skews
+        https://bugs.webkit.org/show_bug.cgi?id=190513
+
+        Compensation value to zero the the translation components
+        of the transformation matrix is incorrect if the matrix
+        has a shear factor.
+
+        Reviewed by Žan Doberšek.
+
+        Tests: fast/transforms/skew-x-135deg-with-gradient.html
+               fast/transforms/skew-y-135deg-with-gradient.html
+
+        * platform/graphics/cairo/CairoUtilities.cpp:
+        (WebCore::drawPatternToCairoContext):
+
</ins><span class="cx"> 2018-10-09  Said Abou-Hallawa  <sabouhallawa@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r234620): SVGLangSpace::svgAttributeChanged() should invalidate the renderer of the SVGGeometryElement descendant only
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscairoCairoUtilitiescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp (237509 => 237510)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2018-10-28 13:42:48 UTC (rev 237509)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp    2018-10-28 13:42:58 UTC (rev 237510)
</span><span class="lines">@@ -232,21 +232,20 @@
</span><span class="cx">     // user space coordinates to pattern coordinates). The overflow happens only in the translation components of the matrices.
</span><span class="cx"> 
</span><span class="cx">     // To avoid the problem in the transformation matrix what we do is remove the translation components of the transformation matrix
</span><del>-    // and perform the translation by moving the destination rectangle instead. For this, we get its translation components (which are in
-    // device coordinates) and divide them by the scale factor to take them to user space coordinates. Then we move the transformation
-    // matrix by the opposite of that amount (which will zero the translation components of the transformation matrix), and move
-    // the destination rectangle by the same amount. We also need to apply the same translation to the pattern matrix, so we get the
-    // same pattern coordinates for the new destination rectangle.
</del><ins>+    // and perform the translation by moving the destination rectangle instead. For this, we calculate such a translation amount (dx, dy)
+    // that its opposite translate (-dx, -dy) will zero the translation components of the transformation matrix. We move the current
+    // transformation matrix by (-dx, -dy) and move the destination rectangle by (dx, dy). We also need to apply the same translation to
+    // the pattern matrix, so we get the same pattern coordinates for the new destination rectangle. (dx, dy) is caclucated by transforming
+    // the current translation components by the inverse matrix of the current transformation matrix.
</ins><span class="cx"> 
</span><span class="cx">     cairo_matrix_t ctm;
</span><span class="cx">     cairo_get_matrix(cr, &ctm);
</span><span class="cx">     double dx = 0, dy = 0;
</span><span class="cx">     cairo_matrix_transform_point(&ctm, &dx, &dy);
</span><del>-    double xScale = 1, yScale = 1;
-    cairo_matrix_transform_distance(&ctm, &xScale, &yScale);
</del><ins>+    cairo_matrix_t inv = ctm;
+    if (cairo_matrix_invert(&inv) == CAIRO_STATUS_SUCCESS)
+        cairo_matrix_transform_distance(&inv, &dx, &dy);
</ins><span class="cx"> 
</span><del>-    dx = dx / xScale;
-    dy = dy / yScale;
</del><span class="cx">     cairo_translate(cr, -dx, -dy);
</span><span class="cx">     FloatRect adjustedDestRect(destRect);
</span><span class="cx">     adjustedDestRect.move(dx, dy);
</span></span></pre>
</div>
</div>

</body>
</html>