Changeset 216881 in webkit

Timestamp:

May 15, 2017 3:07:54 PM (7 years ago)

Author:

Chris Dumez

Message:

Align WebKitCSSMatrix stringifier with spec for DOMMatrix
​https://bugs.webkit.org/show_bug.cgi?id=172114

Reviewed by Simon Fraser.

Source/WebCore:

Align WebKitCSSMatrix stringifier with spec for DOMMatrix after:

• ​https://github.com/w3c/fxtf-drafts/pull/148

The following changes were made:

• Use EcmaScript's ToString() to convert floating point values to string
• Throw an invalid state error if the matrix contains non-finite values
• Made WebKitCSSMatrix.toString enumerable as per [1].

[1] ​https://heycam.github.io/webidl/#es-stringifier

Test: fast/css/matrix-stringifier.html

• css/WebKitCSSMatrix.cpp:

(WebCore::WebKitCSSMatrix::toString):

• css/WebKitCSSMatrix.h:
• css/WebKitCSSMatrix.idl:
• platform/graphics/transforms/TransformationMatrix.cpp:

(WebCore::TransformationMatrix::containsOnlyFiniteValues):

• platform/graphics/transforms/TransformationMatrix.h:

LayoutTests:

• fast/css/matrix-stringifier-expected.txt: Added.
• fast/css/matrix-stringifier.html: Added.

Add layout test coverage.

• fast/dom/Window/custom-constructors-expected.txt:
• fast/dom/Window/custom-constructors.html:

Rebaseline existing test to reflect behavior change.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/matrix-stringifier-expected.txt (added)
• LayoutTests/fast/css/matrix-stringifier.html (added)
• LayoutTests/fast/dom/Window/custom-constructors-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/Window/custom-constructors.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/WebKitCSSMatrix.cpp (modified) (2 diffs)
• Source/WebCore/css/WebKitCSSMatrix.h (modified) (1 diff)
• Source/WebCore/css/WebKitCSSMatrix.idl (modified) (1 diff)
• Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-15  Chris Dumez  <cdumez@apple.com>
+
+        Align WebKitCSSMatrix stringifier with spec for DOMMatrix
+        https://bugs.webkit.org/show_bug.cgi?id=172114
+
+        Reviewed by Simon Fraser.
+
+        * fast/css/matrix-stringifier-expected.txt: Added.
+        * fast/css/matrix-stringifier.html: Added.
+        Add layout test coverage.
+
+        * fast/dom/Window/custom-constructors-expected.txt:
+        * fast/dom/Window/custom-constructors.html:
+        Rebaseline existing test to reflect behavior change.
+
 2017-05-15  Mark Lam  <mark.lam@apple.com>
 

trunk/LayoutTests/fast/dom/Window/custom-constructors-expected.txt

@@ -7 +7 @@
 PASS Option.prototype.toString.call(new Option) is '[object HTMLOptionElement]'
 PASS WebKitPoint.prototype.toString.call(new WebKitPoint) is '[object WebKitPoint]'
-PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix) is 'matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)'
-PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix()) is 'matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)'
-PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix(undefined)) is 'matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)'
+PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix) is 'matrix(1, 0, 0, 1, 0, 0)'
+PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix()) is 'matrix(1, 0, 0, 1, 0, 0)'
+PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix(undefined)) is 'matrix(1, 0, 0, 1, 0, 0)'
 PASS new WebKitCSSMatrix(null) threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
 PASS XMLHttpRequest.prototype.toString.call(new XMLHttpRequest) is '[object XMLHttpRequest]'

trunk/LayoutTests/fast/dom/Window/custom-constructors.html

@@ -16 +16 @@
     shouldBe("Option.prototype.toString.call(new Option)", "'[object HTMLOptionElement]'");
     shouldBe("WebKitPoint.prototype.toString.call(new WebKitPoint)", "'[object WebKitPoint]'");
-    shouldBe("WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix)", "'matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)'");
-    shouldBe("WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix())", "'matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)'");
-    shouldBe("WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix(undefined))", "'matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)'");
+    shouldBe("WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix)", "'matrix(1, 0, 0, 1, 0, 0)'");
+    shouldBe("WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix())", "'matrix(1, 0, 0, 1, 0, 0)'");
+    shouldBe("WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix(undefined))", "'matrix(1, 0, 0, 1, 0, 0)'");
     shouldThrow("new WebKitCSSMatrix(null)");
     shouldBe("XMLHttpRequest.prototype.toString.call(new XMLHttpRequest)", "'[object XMLHttpRequest]'");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-15  Chris Dumez  <cdumez@apple.com>
+
+        Align WebKitCSSMatrix stringifier with spec for DOMMatrix
+        https://bugs.webkit.org/show_bug.cgi?id=172114
+
+        Reviewed by Simon Fraser.
+
+        Align WebKitCSSMatrix stringifier with spec for DOMMatrix after:
+        - https://github.com/w3c/fxtf-drafts/pull/148
+
+        The following changes were made:
+        - Use EcmaScript's ToString() to convert floating point values to string
+        - Throw an invalid state error if the matrix contains non-finite values
+        - Made WebKitCSSMatrix.toString enumerable as per [1].
+
+        [1] https://heycam.github.io/webidl/#es-stringifier
+
+        Test: fast/css/matrix-stringifier.html
+
+        * css/WebKitCSSMatrix.cpp:
+        (WebCore::WebKitCSSMatrix::toString):
+        * css/WebKitCSSMatrix.h:
+        * css/WebKitCSSMatrix.idl:
+        * platform/graphics/transforms/TransformationMatrix.cpp:
+        (WebCore::TransformationMatrix::containsOnlyFiniteValues):
+        * platform/graphics/transforms/TransformationMatrix.h:
+
 2017-05-15  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/WebCore/css/WebKitCSSMatrix.cpp

@@ -36 +36 @@
 #include "TransformFunctions.h"
 #include <wtf/MathExtras.h>
+#include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
@@ -198 +199 @@
 }
 
-String WebKitCSSMatrix::toString() const
-{
-    // FIXME - Need to ensure valid CSS floating point values (https://bugs.webkit.org/show_bug.cgi?id=20674)
-    if (m_matrix.isAffine())
-        return String::format("matrix(%f, %f, %f, %f, %f, %f)", m_matrix.a(), m_matrix.b(), m_matrix.c(), m_matrix.d(), m_matrix.e(), m_matrix.f());
-    return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)",
-        m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(),
-        m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(),
-        m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(),
-        m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44());
+ExceptionOr<String> WebKitCSSMatrix::toString() const
+{
+    if (!m_matrix.containsOnlyFiniteValues())
+        return Exception { INVALID_STATE_ERR, ASCIILiteral("Matrix contains non-finite values") };
+
+    StringBuilder builder;
+    if (m_matrix.isAffine()) {
+        builder.appendLiteral("matrix(");
+        builder.append(String::numberToStringECMAScript(m_matrix.a()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.b()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.c()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.d()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.e()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.f()));
+    } else {
+        builder.appendLiteral("matrix3d(");
+        builder.append(String::numberToStringECMAScript(m_matrix.m11()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m12()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m13()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m14()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m21()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m22()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m23()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m24()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m31()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m32()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m33()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m34()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m41()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m42()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m43()));
+        builder.appendLiteral(", ");
+        builder.append(String::numberToStringECMAScript(m_matrix.m44()));
+    }
+    builder.append(')');
+    return builder.toString();
 }
 

trunk/Source/WebCore/css/WebKitCSSMatrix.h

@@ -138 +138 @@
     const TransformationMatrix& transform() const { return m_matrix; }
 
-    String toString() const;
+    ExceptionOr<String> toString() const;
 
 private:

trunk/Source/WebCore/css/WebKitCSSMatrix.idl

@@ -92 +92 @@
     WebKitCSSMatrix skewY(optional unrestricted double angle = NaN);
 
-    [NotEnumerable] DOMString toString();
+    [MayThrowException] DOMString toString(); // FIXME: Should be stringifier; once we support it.
 };

trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp

@@ -34 +34 @@
 #include "LayoutRect.h"
 #include "TextStream.h"
+#include <cmath>
 #include <wtf/Assertions.h>
 #include <wtf/MathExtras.h>
@@ -1694 +1695 @@
 }
 
+bool TransformationMatrix::containsOnlyFiniteValues() const
+{
+    return std::isfinite(m_matrix[0][0]) && std::isfinite(m_matrix[0][1]) && std::isfinite(m_matrix[0][2]) && std::isfinite(m_matrix[0][3])
+        && std::isfinite(m_matrix[1][0]) && std::isfinite(m_matrix[1][1]) && std::isfinite(m_matrix[1][2]) && std::isfinite(m_matrix[1][3])
+        && std::isfinite(m_matrix[2][0]) && std::isfinite(m_matrix[2][1]) && std::isfinite(m_matrix[2][2]) && std::isfinite(m_matrix[2][3])
+        && std::isfinite(m_matrix[3][0]) && std::isfinite(m_matrix[3][1]) && std::isfinite(m_matrix[3][2]) && std::isfinite(m_matrix[3][3]);
+}
+
 TransformationMatrix TransformationMatrix::to2dTransform() const
 {

trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

@@ -381 +381 @@
     bool isIntegerTranslation() const;
 
+    bool containsOnlyFiniteValues() const;
+
     // Returns the matrix without 3D components.
     TransformationMatrix to2dTransform() const;