Changeset 247735 in webkit

Timestamp:

Jul 23, 2019 1:39:25 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

CanvasRenderingContext2D.setTransfrom() reads only the aliases attributes of DOMMatrix2DInit
​https://bugs.webkit.org/show_bug.cgi?id=199850

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2019-07-23
Reviewed by Simon Fraser.

Source/WebCore:

The validateAndFixup step of DOMMatrix2DInit sets the matrix attributes
(m fields) from the aliases attributes (a, b, c, d, e, f) if the former
ones do not exist and the later ones exist. See
​https://www.w3.org/TR/geometry-1/#dommatrixinit-dictionary and
DOMMatrixReadOnly::validateAndFixup(DOMMatrix2DInit& init).

Since CanvasRenderingContext2DBase::setTransform() validates and fixes
the input DOMMatrix2DInit, it should rely on matrix attributes.

Test: fast/canvas/setTransfrom-aliases-transform.html

• html/canvas/CanvasRenderingContext2DBase.cpp:

(WebCore::CanvasRenderingContext2DBase::setTransform):

LayoutTests:

• fast/canvas/setTransfrom-aliases-transform-expected.html: Added.
• fast/canvas/setTransfrom-aliases-transform.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/setTransfrom-aliases-transform-expected.html (added)
• LayoutTests/fast/canvas/setTransfrom-aliases-transform.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-23  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        CanvasRenderingContext2D.setTransfrom() reads only the aliases attributes of DOMMatrix2DInit
+        https://bugs.webkit.org/show_bug.cgi?id=199850
+
+        Reviewed by Simon Fraser.
+
+        * fast/canvas/setTransfrom-aliases-transform-expected.html: Added.
+        * fast/canvas/setTransfrom-aliases-transform.html: Added.
+
 2019-07-23  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-23  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        CanvasRenderingContext2D.setTransfrom() reads only the aliases attributes of DOMMatrix2DInit
+        https://bugs.webkit.org/show_bug.cgi?id=199850
+
+        Reviewed by Simon Fraser.
+
+        The validateAndFixup step of DOMMatrix2DInit sets the matrix attributes 
+        (m** fields) from the aliases attributes (a, b, c, d, e, f) if the former
+        ones do not exist and the later ones exist. See
+        https://www.w3.org/TR/geometry-1/#dommatrixinit-dictionary and
+        DOMMatrixReadOnly::validateAndFixup(DOMMatrix2DInit& init).
+
+        Since CanvasRenderingContext2DBase::setTransform() validates and fixes
+        the input DOMMatrix2DInit, it should rely on matrix attributes.
+
+        Test: fast/canvas/setTransfrom-aliases-transform.html
+
+        * html/canvas/CanvasRenderingContext2DBase.cpp:
+        (WebCore::CanvasRenderingContext2DBase::setTransform):
+
 2019-07-23  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp

@@ -914 +914 @@
         return checkValid.releaseException();
 
-    setTransform(matrixInit.a.valueOr(1), matrixInit.b.valueOr(0), matrixInit.c.valueOr(0), matrixInit.d.valueOr(1), matrixInit.e.valueOr(0), matrixInit.f.valueOr(0));
+    setTransform(matrixInit.m11.value(), matrixInit.m12.value(), matrixInit.m21.value(), matrixInit.m22.value(), matrixInit.m41.value(), matrixInit.m42.value());
     return { };
 }