Skip to content

Commit 0edc164

Browse files
authored
Use DOMMatrix2DInit dictionary in 2d canvas setTransform()/addPath()
Fixes whatwg#2826. The DOMMatrix2DInit dictionary is introduced in w3c/fxtf-drafts#211 Tests: web-platform-tests/wpt#7007
1 parent 5f59b7a commit 0edc164

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

source

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3612,8 +3612,9 @@ a.setAttribute('href', 'https://example.com/'); // change the content attribute
36123612

36133613
<ul class="brief">
36143614
<li><dfn data-x-href="https://drafts.fxtf.org/geometry/#dommatrix"><code>DOMMatrix</code></dfn> interface</li>
3615-
<li><dfn data-x-href="https://drafts.fxtf.org/geometry/#dictdef-dommatrixinit"><code>DOMMatrixInit</code></dfn> interface</li>
3616-
<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>DOMMatrixInit</code></li>
3615+
<li><dfn data-x-href="https://drafts.fxtf.org/geometry/#dictdef-dommatrix2dinit"><code>DOMMatrix2DInit</code></dfn> and
3616+
<dfn data-x-href="https://drafts.fxtf.org/geometry/#dictdef-dommatrixinit"><code>DOMMatrixInit</code></dfn> dictionaries</li>
3617+
<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>
36173618
</ul>
36183619

36193620
</dd>
@@ -59849,7 +59850,7 @@ interface <dfn>CanvasTransform</dfn> {
5984959850

5985059851
[NewObject] <span>DOMMatrix</span> <span data-x="dom-context-2d-getTransform">getTransform</span>();
5985159852
void <span data-x="dom-context-2d-setTransform">setTransform</span>(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
59852-
void <span data-x="dom-context-2d-setTransform">setTransform</span>(optional <span>DOMMatrixInit</span> transform);
59853+
void <span data-x="dom-context-2d-setTransform">setTransform</span>(optional <span>DOMMatrix2DInit</span> transform);
5985359854
void <span data-x="dom-context-2d-resetTransform">resetTransform</span>();
5985459855
<!--
5985559856
// v7 we've also received requests (though not many so far) for:
@@ -60027,7 +60028,7 @@ interface <dfn>CanvasGradient</dfn> {
6002760028
[Exposed=(Window,Worker)]
6002860029
interface <dfn>CanvasPattern</dfn> {
6002960030
// opaque object
60030-
void <span data-x="dom-canvaspattern-setTransform">setTransform</span>(optional <span>DOMMatrixInit</span> transform);
60031+
void <span data-x="dom-canvaspattern-setTransform">setTransform</span>(optional <span>DOMMatrix2DInit</span> transform);
6003160032
};
6003260033

6003360034
[Exposed=Window]
@@ -60065,7 +60066,7 @@ interface <dfn>ImageData</dfn> {
6006560066
<span data-x="dom-Path2D-merge">Constructor</span>(sequence&lt;<span>Path2D</span>&gt; paths, optional <span>CanvasFillRule</span> fillRule = "<span data-x="dom-context-2d-fillRule-nonzero">nonzero</span>"),
6006660067
<span data-x="dom-Path2D-withdata">Constructor</span>(DOMString d), Exposed=(Window,Worker)]
6006760068
interface <dfn>Path2D</dfn> {
60068-
void <span data-x="dom-Path2D-addPath">addPath</span>(<span>Path2D</span> path, optional <span>DOMMatrixInit</span> transform);
60069+
void <span data-x="dom-Path2D-addPath">addPath</span>(<span>Path2D</span> path, optional <span>DOMMatrix2DInit</span> transform);
6006960070
};
6007060071
<span>Path2D</span> implements <span>CanvasPath</span>;</pre>
6007160072

@@ -62170,7 +62171,7 @@ try {
6217062171

6217162172
<li><p>Let <var>matrix</var> be the result of <span data-x="create a DOMMatrix from a
6217262173
dictionary">creating a <code>DOMMatrix</code> from a dictionary</span>
62173-
<var>transform</var>.</p></li>
62174+
<var>transform</var>, with <var>ignore3D</var> set to true.</p></li>
6217462175

6217562176
<li><p>Transform all the coordinates and lines in <var>c</var> by the transform matrix
6217662177
<var>matrix</var>.</p></li>
@@ -62274,7 +62275,7 @@ try {
6227462275
<dd>
6227562276

6227662277
<p>Changes the <span>current transformation matrix</span> <em>to</em> the matrix represented by
62277-
the passed <code>DOMMatrixInit</code> dictionary.</p>
62278+
the passed <code>DOMMatrix2DInit</code> dictionary.</p>
6227862279

6227962280
</dd>
6228062281

@@ -62391,7 +62392,7 @@ try {
6239162392
<p>The <dfn><code data-x="">setTransform(<var>transform</var>)</code></dfn> method, when invoked,
6239262393
must reset the <span>current transformation matrix</span> to the value represented by the result
6239362394
of <span data-x="create a DOMMatrix from a dictionary">creating a <code>DOMMatrix</code> from a
62394-
dictionary</span> <var>transform</var>.</p>
62395+
dictionary</span> <var>transform</var>, with <var>ignore3D</var> set to true.</p>
6239562396

6239662397
<p>The <dfn><code data-x="dom-context-2d-resetTransform">resetTransform()</code></dfn> method,
6239762398
when invoked, must reset the <span>current transformation matrix</span> to the identity
@@ -62840,7 +62841,7 @@ try {
6284062841
data-x="dom-canvaspattern-setTransform">setTransform(<var>transform</var>)</code></dfn> method,
6284162842
when invoked, must reset the pattern's transformation matrix to the value represented by the
6284262843
result of <span data-x="create a DOMMatrix from a dictionary">creating a <code>DOMMatrix</code>
62843-
from a dictionary</span> <var>transform</var>.</p>
62844+
from a dictionary</span> <var>transform</var>, with <var>ignore3D</var> set to true.</p>
6284462845

6284562846
<p>When a pattern is to be rendered within an area, the user agent must run the following steps to
6284662847
determine what is rendered:</p>

0 commit comments

Comments
 (0)