Add a DOMMatrix2dInit dictionary type

This is needed for CanvasRenderingContext2D's setTransform().

Fixes #210.

Tests: web-platform-tests/wpt#7007

Author: zcorpan

geometry/Overview.bs

@@ -817,7 +817,7 @@ interface DOMMatrix : DOMMatrixReadOnly {
     [Exposed=Window] DOMMatrix setMatrixValue(DOMString transformList);
 };
 
-dictionary DOMMatrixInit {
+dictionary DOMMatrix2DInit {
     unrestricted double a;
     unrestricted double b;
     unrestricted double c;
@@ -826,18 +826,21 @@ dictionary DOMMatrixInit {
     unrestricted double f;
     unrestricted double m11;
     unrestricted double m12;
-    unrestricted double m13 = 0;
-    unrestricted double m14 = 0;
     unrestricted double m21;
     unrestricted double m22;
+    unrestricted double m41;
+    unrestricted double m42;
+};
+
+dictionary DOMMatrixInit : DOMMatrix2DInit {
+    unrestricted double m13 = 0;
+    unrestricted double m14 = 0;
     unrestricted double m23 = 0;
     unrestricted double m24 = 0;
     unrestricted double m31 = 0;
     unrestricted double m32 = 0;
     unrestricted double m33 = 1;
     unrestricted double m34 = 0;
-    unrestricted double m41;
-    unrestricted double m42;
     unrestricted double m43 = 0;
     unrestricted double m44 = 1;
     boolean is2D;
@@ -865,59 +868,62 @@ prose.
 interface from SVG. [[SVG11]]
 
 
-<h3 id=dommatrixinit-dictionary>DOMMatrixInit dictionary</h3>
+<h3 id=dommatrixinit-dictionary>DOMMatrix2DInit and DOMMatrixInit dictionaries</h3>
 
-<p>To <dfn dfn-for=matrix>validate and fixup</dfn> a {{DOMMatrixInit}} dictionary <var>dict</var>,
-run the following steps:
+<p>To <dfn dfn-for=matrix>validate and fixup</dfn> a {{DOMMatrix2DInit}} or {{DOMMatrixInit}}
+dictionary <var>dict</var>, given a boolean <var>ignore3D</var> (<code>false</code> if not
+provided), run the following steps:
 
 <ol>
   <li>
    <p>If if at least one of the following conditions are true for <var>dict</var>, throw a
    {{TypeError}} exception and abort these steps.
 
    <ul>
-    <li><p>{{DOMMatrixInit/a}} and {{DOMMatrixInit/m11}} are both present and
-    [=SameValueZero=]({{DOMMatrixInit/a}}, {{DOMMatrixInit/m11}}) is <code>false</code>.
+    <li><p>{{DOMMatrix2DInit/a}} and {{DOMMatrix2DInit/m11}} are both present and
+    [=SameValueZero=]({{DOMMatrix2DInit/a}}, {{DOMMatrix2DInit/m11}}) is <code>false</code>.
 
-    <li><p>{{DOMMatrixInit/b}} and {{DOMMatrixInit/m12}} are both present and
-    [=SameValueZero=]({{DOMMatrixInit/b}}, {{DOMMatrixInit/m12}}) is <code>false</code>.
+    <li><p>{{DOMMatrix2DInit/b}} and {{DOMMatrix2DInit/m12}} are both present and
+    [=SameValueZero=]({{DOMMatrix2DInit/b}}, {{DOMMatrix2DInit/m12}}) is <code>false</code>.
 
-    <li><p>{{DOMMatrixInit/c}} and {{DOMMatrixInit/m21}} are both present and
-    [=SameValueZero=]({{DOMMatrixInit/c}}, {{DOMMatrixInit/m21}}) is <code>false</code>.
+    <li><p>{{DOMMatrix2DInit/c}} and {{DOMMatrix2DInit/m21}} are both present and
+    [=SameValueZero=]({{DOMMatrix2DInit/c}}, {{DOMMatrix2DInit/m21}}) is <code>false</code>.
 
-    <li><p>{{DOMMatrixInit/d}} and {{DOMMatrixInit/m22}} are both present and
-    [=SameValueZero=]({{DOMMatrixInit/d}}, {{DOMMatrixInit/m22}}) is <code>false</code>.
+    <li><p>{{DOMMatrix2DInit/d}} and {{DOMMatrix2DInit/m22}} are both present and
+    [=SameValueZero=]({{DOMMatrix2DInit/d}}, {{DOMMatrix2DInit/m22}}) is <code>false</code>.
 
-    <li><p>{{DOMMatrixInit/e}} and {{DOMMatrixInit/m41}} are both present and
-    [=SameValueZero=]({{DOMMatrixInit/e}}, {{DOMMatrixInit/m41}}) is <code>false</code>.
+    <li><p>{{DOMMatrix2DInit/e}} and {{DOMMatrix2DInit/m41}} are both present and
+    [=SameValueZero=]({{DOMMatrix2DInit/e}}, {{DOMMatrix2DInit/m41}}) is <code>false</code>.
 
-    <li><p>{{DOMMatrixInit/f}} and {{DOMMatrixInit/m42}} are both present and
-    [=SameValueZero=]({{DOMMatrixInit/f}}, {{DOMMatrixInit/m42}}) is <code>false</code>.
+    <li><p>{{DOMMatrix2DInit/f}} and {{DOMMatrix2DInit/m42}} are both present and
+    [=SameValueZero=]({{DOMMatrix2DInit/f}}, {{DOMMatrix2DInit/m42}}) is <code>false</code>.
 
-    <li><p>{{DOMMatrixInit/is2D}} is <code>true</code> and at least one of {{DOMMatrixInit/m13}},
-    {{DOMMatrixInit/m14}}, {{DOMMatrixInit/m23}}, {{DOMMatrixInit/m24}}, {{DOMMatrixInit/m31}},
-    {{DOMMatrixInit/m32}}, {{DOMMatrixInit/m34}}, {{DOMMatrixInit/m43}} are present with a value
-    other than ''0'' or ''-0'', or at least one of {{DOMMatrixInit/m33}}, {{DOMMatrixInit/m44}} are
-    present with a value other than ''1''.
+    <li><p><var>ignore3D</var> is <code>false</code> and {{DOMMatrixInit/is2D}} is <code>true</code>
+    and: at least one of {{DOMMatrixInit/m13}}, {{DOMMatrixInit/m14}}, {{DOMMatrixInit/m23}},
+    {{DOMMatrixInit/m24}}, {{DOMMatrixInit/m31}}, {{DOMMatrixInit/m32}}, {{DOMMatrixInit/m34}},
+    {{DOMMatrixInit/m43}} are present with a value other than ''0'' or ''-0'', or at least one of
+    {{DOMMatrixInit/m33}}, {{DOMMatrixInit/m44}} are present with a value other than ''1''.
    </ul>
 
-  <li><p>If {{DOMMatrixInit/m11}} is not present then set it to the value of member
-  {{DOMMatrixInit/a}}, or value ''1'' if {{DOMMatrixInit/a}} is also not present.
+  <li><p>If {{DOMMatrix2DInit/m11}} is not present then set it to the value of member
+  {{DOMMatrix2DInit/a}}, or value ''1'' if {{DOMMatrix2DInit/a}} is also not present.
+
+  <li><p>If {{DOMMatrix2DInit/m12}} is not present then set it to the value of member
+  {{DOMMatrix2DInit/b}}, or value ''0'' if {{DOMMatrix2DInit/b}} is also not present.
 
-  <li><p>If {{DOMMatrixInit/m12}} is not present then set it to the value of member
-  {{DOMMatrixInit/b}}, or value ''0'' if {{DOMMatrixInit/b}} is also not present.
+  <li><p>If {{DOMMatrix2DInit/m21}} is not present then set it to the value of member
+  {{DOMMatrix2DInit/c}}, or value ''0'' if {{DOMMatrix2DInit/c}} is also not present.
 
-  <li><p>If {{DOMMatrixInit/m21}} is not present then set it to the value of member
-  {{DOMMatrixInit/c}}, or value ''0'' if {{DOMMatrixInit/c}} is also not present.
+  <li><p>If {{DOMMatrix2DInit/m22}} is not present then set it to the value of member
+  {{DOMMatrix2DInit/d}}, or value ''1'' if {{DOMMatrix2DInit/d}} is also not present.
 
-  <li><p>If {{DOMMatrixInit/m22}} is not present then set it to the value of member
-  {{DOMMatrixInit/d}}, or value ''1'' if {{DOMMatrixInit/d}} is also not present.
+  <li><p>If {{DOMMatrix2DInit/m41}} is not present then set it to the value of member
+  {{DOMMatrix2DInit/e}}, or value ''0'' if {{DOMMatrix2DInit/e}} is also not present.
 
-  <li><p>If {{DOMMatrixInit/m41}} is not present then set it to the value of member
-  {{DOMMatrixInit/e}}, or value ''0'' if {{DOMMatrixInit/e}} is also not present.
+  <li><p>If {{DOMMatrix2DInit/m42}} is not present then set it to the value of member
+  {{DOMMatrix2DInit/f}}, or value ''0'' if {{DOMMatrix2DInit/f}} is also not present.
 
-  <li><p>If {{DOMMatrixInit/m42}} is not present then set it to the value of member
-  {{DOMMatrixInit/f}}, or value ''0'' if {{DOMMatrixInit/f}} is also not present.
+  <li><p>If <var>ignore3D</var> is <code>true</code>, then return.
 
   <li><p>If {{DOMMatrixInit/is2D}} is not present and at least one of {{DOMMatrixInit/m13}},
   {{DOMMatrixInit/m14}}, {{DOMMatrixInit/m23}}, {{DOMMatrixInit/m24}}, {{DOMMatrixInit/m31}},
@@ -1074,23 +1080,25 @@ id=dom-dommatrix-frommatrix><code>fromMatrix(<var>other</var>)</code></dfn> stat
 <p>To <dfn lt="create a DOMMatrixReadOnly from the dictionary">create a
 <code>DOMMatrixReadOnly</code> from a dictionary</dfn> <var>other</var> or to <dfn lt="create a
 DOMMatrix from the dictionary">create a <code>DOMMatrix</code> from a dictionary</dfn>
-<var>other</var>, follow these steps:
+<var>other</var>, given a boolean <var>ignore3D</var> (<code>false</code> if not provided), follow
+these steps:
 
 <ol>
- <li><a for=matrix>Validate and fixup</a> <var>other</var>.
+ <li><a for=matrix>Validate and fixup</a> <var>other</var>, given <var>ignore3D</var>.
 
  <li>
   <dl class=switch>
-   <dt>If the {{DOMMatrixInit/is2D}} dictionary member of <var>other</var> is <code>true</code>
+   <dt>If <var>ignore3D</var> is <code>true</code> or if the {{DOMMatrixInit/is2D}} dictionary
+   member of <var>other</var> is <code>true</code>
    <dd><p>Return the result of invoking <a>create a 2d matrix</a> of type {{DOMMatrixReadOnly}} or
    {{DOMMatrix}} as appropriate, with a sequence of numbers, the values being the 6 elements
-   {{DOMMatrixInit/m11}}, {{DOMMatrixInit/m12}}, {{DOMMatrixInit/m21}}, {{DOMMatrixInit/m22}},
-   {{DOMMatrixInit/m41}} and {{DOMMatrixInit/m42}} of <var>other</var> in the given order.
+   {{DOMMatrix2DInit/m11}}, {{DOMMatrix2DInit/m12}}, {{DOMMatrix2DInit/m21}}, {{DOMMatrix2DInit/m22}},
+   {{DOMMatrix2DInit/m41}} and {{DOMMatrix2DInit/m42}} of <var>other</var> in the given order.
 
    <dt>Otherwise
    <dd><p>Return the result of invoking <a>create a 3d matrix</a> of type {{DOMMatrixReadOnly}} or
    {{DOMMatrix}} as appropriate, with a sequence of numbers, the values being the 16 elements
-   {{DOMMatrixInit/m11}}, {{DOMMatrixInit/m12}}, {{DOMMatrixInit/m13}}, ..., {{DOMMatrixInit/m44}}
+   {{DOMMatrix2DInit/m11}}, {{DOMMatrix2DInit/m12}}, {{DOMMatrixInit/m13}}, ..., {{DOMMatrixInit/m44}}
    of <var>other</var> in the given order.
   </dl>
 </ol>