<!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>[217776] 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/217776">217776</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-06-04 23:09:01 -0700 (Sun, 04 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Percentages are calculated wrong in SVG transform CSS property
https://bugs.webkit.org/show_bug.cgi?id=172901

Reviewed by Zalan Bujtas.
Source/WebCore:

The code added in <a href="http://trac.webkit.org/projects/webkit/changeset/217236">r217236</a> was just fetching viewBox(), but that can be empty.
SVGLengthContext::determineViewport() does the correct thing to get
the appropriate viewport.

Test: svg/transforms/percent-transform-values-viewbox.html

* svg/SVGGraphicsElement.cpp:
(WebCore::SVGGraphicsElement::animatedLocalTransform):

LayoutTests:

* svg/transforms/percent-transform-values-viewbox-expected.html: Added.
* svg/transforms/percent-transform-values-viewbox.html: Added.
* svg/transforms/transform-origin-css-property-expected.xhtml:
* svg/transforms/transform-origin-css-property.xhtml: Make this test a bit less
annoying to maintain by applying the transforms relative to the fill-box, which means all
the transform origins are no longer offset by the box position. Other tests exercise
view-box relative transform origins.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestssvgtransformstransformorigincsspropertyexpectedxhtml">trunk/LayoutTests/svg/transforms/transform-origin-css-property-expected.xhtml</a></li>
<li><a href="#trunkLayoutTestssvgtransformstransformorigincsspropertyxhtml">trunk/LayoutTests/svg/transforms/transform-origin-css-property.xhtml</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGGraphicsElementcpp">trunk/Source/WebCore/svg/SVGGraphicsElement.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgtransformspercenttransformvaluesviewboxexpectedhtml">trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgtransformspercenttransformvaluesviewboxhtml">trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (217775 => 217776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2017-06-04 20:56:58 UTC (rev 217775)
+++ trunk/LayoutTests/ChangeLog 2017-06-05 06:09:01 UTC (rev 217776)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-06-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Percentages are calculated wrong in SVG transform CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=172901
+
+        Reviewed by Zalan Bujtas.
+
+        * svg/transforms/percent-transform-values-viewbox-expected.html: Added.
+        * svg/transforms/percent-transform-values-viewbox.html: Added.
+        * svg/transforms/transform-origin-css-property-expected.xhtml:
+        * svg/transforms/transform-origin-css-property.xhtml: Make this test a bit less
+        annoying to maintain by applying the transforms relative to the fill-box, which means all
+        the transform origins are no longer offset by the box position. Other tests exercise
+        view-box relative transform origins.
+
</ins><span class="cx"> 2017-06-04  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [MediaStream] Page capture state not reported correctly
</span></span></pre></div>
<a id="trunkLayoutTestssvgtransformspercenttransformvaluesviewboxexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox-expected.html (0 => 217776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox-expected.html                          (rev 0)
+++ trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox-expected.html     2017-06-05 06:09:01 UTC (rev 217776)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+    <style>
+        svg {
+            border: 1px solid black;
+            display: block;
+            margin: 2px;
+        }
+    </style>
+</head>
+<body>
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="0 0 780 80" style="width: 780px; height: 80px">
+        <rect width="120" height="30" fill="green" style="transform: translate(390px, 5px)"/>
+        <rect width="120" height="30" fill="green" style="transform: translate(330px, 40px)"/>
+    </svg>
+    <!-- No viewBox -->
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" style="width: 780px; height: 80px">
+        <rect width="120" height="30" fill="green" style="transform: translate(390px, 5px)"/>
+        <rect width="120" height="30" fill="green" style="transform: translate(330px, 40px)"/>
+    </svg>
+
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="0 0 100 400" style="width: 100px; height: 400px; display: inline-block;">
+        <rect width="30" height="120" fill="green" style="transform: translate(5px, 200px"/>
+        <rect width="30" height="120" fill="green" style="transform: translate(40px, 140px)"/>
+    </svg>
+    <!-- No viewBox -->
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" style="width: 100px; height: 400px; display: inline-block;">
+        <rect width="30" height="120" fill="green" style="transform: translate(5px, 200px)"/>
+        <rect width="30" height="120" fill="green" style="transform: translate(40px, 140px)"/>
+    </svg>
+
+    <!-- viewBox with non-zero origin -->
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="-20 50 100 400" style="width: 100px; height: 400px; display: inline-block;">
+        <rect width="30" height="120" fill="green" style="transform: translate(5px, 200px"/>
+        <rect width="30" height="120" fill="green" style="transform: translate(40px, 140px)"/>
+    </svg>
+
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" style="width: 400px; height: 400px; display: inline-block;">
+        <rect width="80" height="80" fill="green" style="transform: translate(200px, 200px); transform-box: view-box;"/>
+        <rect width="80" height="80" fill="blue" style="transform: translate(40px, 40px); transform-box: fill-box;"/>
+    </svg>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtransformspercenttransformvaluesviewboxhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox.html (0 => 217776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox.html                           (rev 0)
+++ trunk/LayoutTests/svg/transforms/percent-transform-values-viewbox.html      2017-06-05 06:09:01 UTC (rev 217776)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+    <style>
+        svg {
+            border: 1px solid black;
+            display: block;
+            margin: 2px;
+        }
+    </style>
+</head>
+<body>
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="0 0 780 80" style="width: 780px; height: 80px">
+        <rect width="120" height="30" fill="green" style="transform: translate(50%, 5px)"/>
+        <rect width="120" height="30" fill="green" style="transform: translate(calc(50% - 60px), 40px)"/>
+    </svg>
+    <!-- No viewBox -->
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" style="width: 780px; height: 80px">
+        <rect width="120" height="30" fill="green" style="transform: translate(50%, 5px)"/>
+        <rect width="120" height="30" fill="green" style="transform: translate(calc(50% - 60px), 40px)"/>
+    </svg>
+
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="0 0 100 400" style="width: 100px; height: 400px; display: inline-block;">
+        <rect width="30" height="120" fill="green" style="transform: translate(5px, 50%)"/>
+        <rect width="30" height="120" fill="green" style="transform: translate(40px, calc(50% - 60px))"/>
+    </svg>
+    <!-- No viewBox -->
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" style="width: 100px; height: 400px; display: inline-block;">
+        <rect width="30" height="120" fill="green" style="transform: translate(5px, 50%)"/>
+        <rect width="30" height="120" fill="green" style="transform: translate(40px, calc(50% - 60px))"/>
+    </svg>
+
+    <!-- viewBox with non-zero origin -->
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="-20 50 100 400" style="width: 100px; height: 400px; display: inline-block;">
+        <rect width="30" height="120" fill="green" style="transform: translate(5px, 200px"/>
+        <rect width="30" height="120" fill="green" style="transform: translate(40px, 140px)"/>
+    </svg>
+
+    <svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" style="width: 400px; height: 400px; display: inline-block;">
+        <rect width="80" height="80" fill="green" style="transform: translate(50%, 50%); transform-box: view-box;"/>
+        <rect width="80" height="80" fill="blue" style="transform: translate(50%, 50%); transform-box: fill-box;"/>
+    </svg>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtransformstransformorigincsspropertyexpectedxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/transforms/transform-origin-css-property-expected.xhtml (217775 => 217776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/transforms/transform-origin-css-property-expected.xhtml    2017-06-04 20:56:58 UTC (rev 217775)
+++ trunk/LayoutTests/svg/transforms/transform-origin-css-property-expected.xhtml       2017-06-05 06:09:01 UTC (rev 217776)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">    width: 30px;
</span><span class="cx">    height: 30px;
</span><span class="cx">    background: green;
</span><del>-   -webkit-transform: rotate(90deg);
</del><ins>+   transform: rotate(90deg);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> 
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">     {
</span><span class="cx">        var div = document.createElement("div");
</span><span class="cx">        div.setAttribute("id", "transformOriginDiv");
</span><del>-       div.setAttribute("style", "top: " + y + "px; left: "+ x + "px; -webkit-transform-origin: " + transformOrigin + ";");
</del><ins>+       div.setAttribute("style", "top: " + y + "px; left: "+ x + "px; transform-origin: " + transformOrigin + ";");
</ins><span class="cx">        document.getElementById("divRoot").appendChild(div);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestssvgtransformstransformorigincsspropertyxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/transforms/transform-origin-css-property.xhtml (217775 => 217776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/transforms/transform-origin-css-property.xhtml     2017-06-04 20:56:58 UTC (rev 217775)
+++ trunk/LayoutTests/svg/transforms/transform-origin-css-property.xhtml        2017-06-05 06:09:01 UTC (rev 217776)
</span><span class="lines">@@ -30,13 +30,13 @@
</span><span class="cx">     function addTransformOriginRect(x, y, s)
</span><span class="cx">     {
</span><span class="cx">        var rect = document.createElementNS(svgNS, "rect");
</span><del>-       var transformOrigin = (typeof(s) == "string") ? s :  (x + s[0]) + "px " + (y + s[1]) + "px";
</del><ins>+       var transformOrigin = (typeof(s) == "string") ? s :  s[0] + "px " + s[1] + "px";
</ins><span class="cx">        rect.setAttribute("id", "transformOriginRect");
</span><span class="cx">        rect.setAttribute("x", x);
</span><span class="cx">        rect.setAttribute("y", y);
</span><span class="cx">        rect.setAttribute("width", 30);
</span><span class="cx">        rect.setAttribute("height", 30);
</span><del>-       rect.setAttribute("style", "transform-box: view-box; transform-origin: " + transformOrigin + ";");
</del><ins>+       rect.setAttribute("style", "transform-box: fill-box; transform-origin: " + transformOrigin + ";");
</ins><span class="cx">        document.getElementById("svgRoot").appendChild(rect);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (217775 => 217776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-06-04 20:56:58 UTC (rev 217775)
+++ trunk/Source/WebCore/ChangeLog      2017-06-05 06:09:01 UTC (rev 217776)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-06-04  Simon Fraser  <simon.fraser@apple.com>
+
+        Percentages are calculated wrong in SVG transform CSS property
+        https://bugs.webkit.org/show_bug.cgi?id=172901
+
+        Reviewed by Zalan Bujtas.
+        
+        The code added in r217236 was just fetching viewBox(), but that can be empty.
+        SVGLengthContext::determineViewport() does the correct thing to get
+        the appropriate viewport.
+
+        Test: svg/transforms/percent-transform-values-viewbox.html
+
+        * svg/SVGGraphicsElement.cpp:
+        (WebCore::SVGGraphicsElement::animatedLocalTransform):
+
</ins><span class="cx"> 2017-06-04  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [MediaStream] Page capture state not reported correctly
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGGraphicsElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGGraphicsElement.cpp (217775 => 217776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGGraphicsElement.cpp  2017-06-04 20:56:58 UTC (rev 217775)
+++ trunk/Source/WebCore/svg/SVGGraphicsElement.cpp     2017-06-05 06:09:01 UTC (rev 217776)
</span><span class="lines">@@ -88,12 +88,12 @@
</span><span class="cx">             break;
</span><span class="cx">         case TransformBox::BorderBox:
</span><span class="cx">             // For SVG elements without an associated CSS layout box, the used value for border-box is view-box.
</span><del>-        case TransformBox::ViewBox:
-            if (auto *viewportElement = nearestViewportElement()) {
-                if (is<SVGSVGElement>(*viewportElement))
-                    boundingBox = downcast<SVGSVGElement>(*viewportElement).viewBox();
</del><ins>+        case TransformBox::ViewBox: {
+            FloatSize viewportSize;
+            SVGLengthContext(this).determineViewport(viewportSize);
+            boundingBox.setSize(viewportSize);
+            break;
</ins><span class="cx">             }
</span><del>-            break;
</del><span class="cx">         }
</span><span class="cx">         
</span><span class="cx">         // Note: objectBoundingBox is an emptyRect for elements like pattern or clipPath.
</span></span></pre>
</div>
</div>

</body>
</html>