Do nothing for NaN in setTransform(transform)/addPath(b, transform)

zcorpan · web-flow · commit 5b19b37c6c6d · 2017-09-26T11:01:42.000+02:00
Fixes whatwg#2845. Tests: web-platform-tests/wpt#7473
diff --git a/source b/source
@@ -3726,7 +3726,13 @@ a.setAttribute('href', 'https://example.com/'); // change the content attribute
     spec=GEOMETRY></p>
 
     <ul class="brief">
-     <li><dfn data-x-href="https://drafts.fxtf.org/geometry/#dommatrix"><code>DOMMatrix</code></dfn> interface</li>
+     <li><dfn data-x-href="https://drafts.fxtf.org/geometry/#dommatrix"><code>DOMMatrix</code></dfn> interface, and associated
+         <dfn data-x-href="https://drafts.fxtf.org/geometry/#matrix-m11-element">m11 element</dfn>,
+         <dfn data-x-href="https://drafts.fxtf.org/geometry/#matrix-m12-element">m12 element</dfn>,
+         <dfn data-x-href="https://drafts.fxtf.org/geometry/#matrix-m21-element">m21 element</dfn>,
+         <dfn data-x-href="https://drafts.fxtf.org/geometry/#matrix-m22-element">m22 element</dfn>,
+         <dfn data-x-href="https://drafts.fxtf.org/geometry/#matrix-m41-element">m41 element</dfn>, and
+         <dfn data-x-href="https://drafts.fxtf.org/geometry/#matrix-m42-element">m42 element</dfn></li>
      <li><dfn data-x-href="https://drafts.fxtf.org/geometry/#dictdef-dommatrix2dinit"><code>DOMMatrix2DInit</code></dfn> and
          <dfn data-x-href="https://drafts.fxtf.org/geometry/#dictdef-dommatrixinit"><code>DOMMatrixInit</code></dfn> dictionaries</li>
      <li>The <dfn data-x-href="https://drafts.fxtf.org/geometry/#create-a-dommatrix-from-the-dictionary">create a <code>DOMMatrix</code> from a dictionary</dfn> algorithm for <code>DOMMatrix2DInit</code> or <code>DOMMatrixInit</code></li>
@@ -60565,7 +60571,7 @@ idea from Mihai:
    <li><p>Let <var>a</var> be the argument.</p></li>
 
    <li><p>If any value in <var>a</var> is not finite (e.g. an Infinity or a NaN value), or
-   if any value is negative (less than zero), then abort these steps (without throwing an exception;
+   if any value is negative (less than zero), then return (without throwing an exception;
    user agents could show a message on a developer console, though, as that would be helpful for
    debugging).</p></li>
 
@@ -61713,7 +61719,7 @@ try {
   method, when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If either of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Create a new subpath with the specified point as its first (and only) point.</p></li>
   </ol>
@@ -61746,7 +61752,7 @@ try {
   method, when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If either of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>If the object's path has no subpaths, then <span>ensure there is a subpath</span> for
    <span data-x="">(<var>x</var>, <var>y</var>)</span>.</p></li>
@@ -61761,7 +61767,7 @@ try {
   steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p><span>Ensure there is a subpath</span> for <span data-x="">(<var>cpx</var>,
    <var>cpy</var>)</span></p></li>
@@ -61778,7 +61784,7 @@ try {
   method, when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p><span>Ensure there is a subpath</span> for <span data-x="">(<var>cp1x</var>,
    <var>cp1y</var>)</span>.</p></li>
@@ -61797,7 +61803,7 @@ try {
   when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p><span>Ensure there is a subpath</span> for <span data-x="">(<var>x1</var>,
    <var>y1</var>)</span>.</p></li>
@@ -61853,7 +61859,7 @@ try {
   steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>If either <var>radiusX</var> or <var>radiusY</var> are negative, then throw an
    <span>"<code>IndexSizeError</code>"</span> <code>DOMException</code>.</p></li>
@@ -61898,7 +61904,7 @@ try {
   <var>h</var>)</code></dfn> method, when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Create a new subpath containing just the four points (<var>x</var>, <var>y</var>),
    (<var>x</var>+<var>w</var>, <var>y</var>), (<var>x</var>+<var>w</var>,
@@ -62075,14 +62081,18 @@ try {
 
   <ol>
 
-   <li><p>If the <code>Path2D</code> object <var>b</var> has no subpaths, then abort these
-   steps.</p></li>
-
-   <li><p>Create a copy of all the subpaths in <var>b</var>. Let this copy be known as <var>c</var>.</p></li>
+   <li><p>If the <code>Path2D</code> object <var>b</var> has no subpaths, then return.</p></li>
 
    <li><p>Let <var>matrix</var> be the result of <span data-x="create a DOMMatrix from a
-   dictionary">creating a <code>DOMMatrix</code> from a dictionary</span>
-   <var>transform</var>, with <var>ignore3D</var> set to true.</p></li>
+   dictionary">creating a <code>DOMMatrix</code> from the dictionary</span> <var>transform</var>,
+   with <var>ignore3D</var> set to true.</p></li>
+
+   <li><p>If one or more of <var>matrix</var>'s <span>m11 element</span>, <span>m12 element</span>,
+   <span>m21 element</span>, <span>m22 element</span>, <span>m41 element</span>, or <span>m42
+   element</span> are infinite or NaN, then return.</p></li>
+
+   <li><p>Create a copy of all the subpaths in <var>b</var>. Let this copy be known as
+   <var>c</var>.</p></li>
 
    <li><p>Transform all the coordinates and lines in <var>c</var> by the transform matrix
    <var>matrix</var>.</p></li>
@@ -62092,7 +62102,8 @@ try {
 
    <li><p>Add all the subpaths in <var>c</var> to <var>a</var>.</p></li>
 
-   <li><p>Create a new subpath in <var>a</var> with (<var>x</var>, <var>y</var>) as the only point in the subpath.</p></li>
+   <li><p>Create a new subpath in <var>a</var> with (<var>x</var>, <var>y</var>) as the only point
+   in the subpath.</p></li>
 
   </ol>
 
@@ -62206,7 +62217,7 @@ try {
   method, when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If either of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Add the scaling transformation described by the arguments to the <span>current
    transformation matrix</span>. The <var>x</var> argument represents the scale factor in the
@@ -62218,7 +62229,7 @@ try {
   when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If <var>angle</var> is infinite or NaN, then abort these steps.</p></li>
+   <li><p>If <var>angle</var> is infinite or NaN, then return.</p></li>
 
    <li><p>Add the rotation transformation described by the argument to the <span>current
    transformation matrix</span>. The <var>angle</var> argument represents a clockwise rotation angle
@@ -62229,7 +62240,7 @@ try {
   <var>y</var>)</code></dfn> method, when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If either of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Add the translation transformation described by the arguments to the <span>current
    transformation matrix</span>. The <var>x</var> argument represents the translation distance in
@@ -62242,7 +62253,7 @@ try {
   run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Replace the <span>current transformation matrix</span> with the result of multiplying the
    current transformation matrix with the matrix described by:</p></li>
@@ -62291,7 +62302,7 @@ try {
   run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Reset the <span>current transformation matrix</span> to the identity matrix.</p></li>
 
@@ -62301,9 +62312,19 @@ try {
   </ol>
 
   <p>The <dfn><code data-x="">setTransform(<var>transform</var>)</code></dfn> method, when invoked,
-  must reset the <span>current transformation matrix</span> to the value represented by the result
-  of <span data-x="create a DOMMatrix from a dictionary">creating a <code>DOMMatrix</code> from a
-  dictionary</span> <var>transform</var>, with <var>ignore3D</var> set to true.</p>
+  must run these steps:</p>
+
+  <ol>
+   <li><p>Let <var>matrix</var> be the result of <span data-x="create a DOMMatrix from a
+   dictionary">creating a <code>DOMMatrix</code> from the dictionary</span> <var>transform</var>,
+   with <var>ignore3D</var> set to true.</p>
+
+   <li><p>If one or more of <var>matrix</var>'s <span>m11 element</span>, <span>m12 element</span>,
+   <span>m21 element</span>, <span>m22 element</span>, <span>m41 element</span>, or <span>m42
+   element</span> are infinite or NaN, then return.</p></li>
+
+   <li><p>Reset the <span>current transformation matrix</span> to <var>matrix</var>.</p></li>
+  </ol>
 
   <p>The <dfn><code data-x="dom-context-2d-resetTransform">resetTransform()</code></dfn> method,
   when invoked, must reset the <span>current transformation matrix</span> to the identity
@@ -62750,9 +62771,19 @@ try {
 
   <p>The <dfn><code
   data-x="dom-canvaspattern-setTransform">setTransform(<var>transform</var>)</code></dfn> method,
-  when invoked, must reset the pattern's transformation matrix to the value represented by the
-  result of <span data-x="create a DOMMatrix from a dictionary">creating a <code>DOMMatrix</code>
-  from a dictionary</span> <var>transform</var>, with <var>ignore3D</var> set to true.</p>
+  when invoked, must run these steps:</p>
+
+  <ol>
+   <li><p>Let <var>matrix</var> be the result of <span data-x="create a DOMMatrix from a
+   dictionary">creating a <code>DOMMatrix</code> from the dictionary</span> <var>transform</var>,
+   with <var>ignore3D</var> set to true.</p>
+
+   <li><p>If one or more of <var>matrix</var>'s <span>m11 element</span>, <span>m12 element</span>,
+   <span>m21 element</span>, <span>m22 element</span>, <span>m41 element</span>, or <span>m42
+   element</span> are infinite or NaN, then return.</p></li>
+
+   <li><p>Reset the pattern's transformation matrix to <var>matrix</var>.</p></li>
+  </ol>
 
   <p>When a pattern is to be rendered within an area, the user agent must run the following steps to
   determine what is rendered:</p>
@@ -62869,7 +62900,7 @@ try {
 
   <ol>
 
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Let <var>pixels</var> be the set of pixels in the specified rectangle that also
    intersect the current <span>clipping region</span>.</p></li>
@@ -62886,7 +62917,7 @@ try {
   <var>w</var>, <var>h</var>)</code></dfn> method, when invoked, must must run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>If either <var>w</var> or <var>h</var> are zero, then abort these steps.</p></li>
 
@@ -62898,7 +62929,7 @@ try {
   <var>w</var>, <var>h</var>)</code></dfn> method, when invoked, must run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Take the result of <span data-x="trace a path">tracing the path</span> described below,
    using the <code>CanvasPathDrawingStyles</code> interface's line styles, and fill it with the
@@ -62983,7 +63014,7 @@ try {
   are invoked, the user agent must run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p>Run the <span>text preparation algorithm</span>, passing it <var>text</var>, the object
    implementing the <code>CanvasText</code> interface, and, if the <var>maxWidth</var> argument was
@@ -63713,7 +63744,7 @@ v6DVT (also check for '- -' bits in the part above) -->
   agent must run these steps:</p>
 
   <ol>
-   <li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li>
+   <li><p>If any of the arguments are infinite or NaN, then return.</p></li>
 
    <li><p><span>Check the usability of the <var>image</var> argument</span>. If this
    returns <i>aborted</i>, then an exception has been thrown and the method doesn't return anything;
