Diff
Modified: trunk/LayoutTests/ChangeLog (267653 => 267654)
--- trunk/LayoutTests/ChangeLog 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/ChangeLog 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1,5 +1,21 @@
2020-09-27 Rob Buis <[email protected]>
+ Alias WebKitCSSMatrix to DOMMatrix
+ https://bugs.webkit.org/show_bug.cgi?id=153675
+
+ Reviewed by Chris Dumez.
+
+ Adapt tests to expect DOMMatrix behavior rather than WebKitCSSMatrix.
+
+ * platform/ios/ios/css/construct-WebKitCSSMatrix-expected.txt:
+ * platform/ios/ios/css/resources/construct-WebKitCSSMatrix.js:
+ * transforms/cssmatrix-2d-interface-expected.txt:
+ * transforms/cssmatrix-2d-interface.xhtml:
+ * transforms/cssmatrix-3d-interface-expected.txt:
+ * transforms/cssmatrix-3d-interface.xhtml:
+
+2020-09-27 Rob Buis <[email protected]>
+
Clean up type parameter for Event idl
https://bugs.webkit.org/show_bug.cgi?id=217013
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (267653 => 267654)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1,5 +1,17 @@
2020-09-27 Rob Buis <[email protected]>
+ Alias WebKitCSSMatrix to DOMMatrix
+ https://bugs.webkit.org/show_bug.cgi?id=153675
+
+ Reviewed by Chris Dumez.
+
+ Update imrpved test results.
+
+ * web-platform-tests/css/geometry/DOMMatrix-stringifier-expected.txt:
+ * web-platform-tests/css/geometry/WebKitCSSMatrix-expected.txt:
+
+2020-09-27 Rob Buis <[email protected]>
+
Clean up type parameter for Event idl
https://bugs.webkit.org/show_bug.cgi?id=217013
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/geometry/DOMMatrix-stringifier-expected.txt (267653 => 267654)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/geometry/DOMMatrix-stringifier-expected.txt 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/geometry/DOMMatrix-stringifier-expected.txt 2020-09-27 12:35:28 UTC (rev 267654)
@@ -52,29 +52,29 @@
PASS DOMMatrixReadOnly stringifier: throwing getters (2d)
PASS DOMMatrixReadOnly stringifier: throwing getters (3d)
PASS WebKitCSSMatrix stringifier: identity (2d)
-FAIL WebKitCSSMatrix stringifier: identity (3d) self[constr].fromMatrix is not a function. (In 'self[constr].fromMatrix({is2D: false})', 'self[constr].fromMatrix' is undefined)
-FAIL WebKitCSSMatrix stringifier: NaN (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: NaN (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Infinity (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Infinity (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: -Infinity (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: -Infinity (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 1/3 (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 1/3 (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 1/300000 (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 1/300000 (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 1/300000000 (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 1/300000000 (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 100000 + (1/3) (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: 100000 + (1/3) (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Math.pow(2, 53) + 1 (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Math.pow(2, 53) + 1 (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Math.pow(2, 53) + 2 (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Math.pow(2, 53) + 2 (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Number.MAX_VALUE (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Number.MAX_VALUE (3d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Number.MIN_VALUE (2d) The string did not match the expected pattern.
-FAIL WebKitCSSMatrix stringifier: Number.MIN_VALUE (3d) The string did not match the expected pattern.
+PASS WebKitCSSMatrix stringifier: identity (3d)
+PASS WebKitCSSMatrix stringifier: NaN (2d)
+PASS WebKitCSSMatrix stringifier: NaN (3d)
+PASS WebKitCSSMatrix stringifier: Infinity (2d)
+PASS WebKitCSSMatrix stringifier: Infinity (3d)
+PASS WebKitCSSMatrix stringifier: -Infinity (2d)
+PASS WebKitCSSMatrix stringifier: -Infinity (3d)
+PASS WebKitCSSMatrix stringifier: 1/3 (2d)
+PASS WebKitCSSMatrix stringifier: 1/3 (3d)
+PASS WebKitCSSMatrix stringifier: 1/300000 (2d)
+PASS WebKitCSSMatrix stringifier: 1/300000 (3d)
+PASS WebKitCSSMatrix stringifier: 1/300000000 (2d)
+PASS WebKitCSSMatrix stringifier: 1/300000000 (3d)
+PASS WebKitCSSMatrix stringifier: 100000 + (1/3) (2d)
+PASS WebKitCSSMatrix stringifier: 100000 + (1/3) (3d)
+PASS WebKitCSSMatrix stringifier: Math.pow(2, 53) + 1 (2d)
+PASS WebKitCSSMatrix stringifier: Math.pow(2, 53) + 1 (3d)
+PASS WebKitCSSMatrix stringifier: Math.pow(2, 53) + 2 (2d)
+PASS WebKitCSSMatrix stringifier: Math.pow(2, 53) + 2 (3d)
+PASS WebKitCSSMatrix stringifier: Number.MAX_VALUE (2d)
+PASS WebKitCSSMatrix stringifier: Number.MAX_VALUE (3d)
+PASS WebKitCSSMatrix stringifier: Number.MIN_VALUE (2d)
+PASS WebKitCSSMatrix stringifier: Number.MIN_VALUE (3d)
PASS WebKitCSSMatrix stringifier: throwing getters (2d)
-FAIL WebKitCSSMatrix stringifier: throwing getters (3d) self[constr].fromMatrix is not a function. (In 'self[constr].fromMatrix({is2D: false})', 'self[constr].fromMatrix' is undefined)
+PASS WebKitCSSMatrix stringifier: throwing getters (3d)
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/geometry/WebKitCSSMatrix-expected.txt (267653 => 267654)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/geometry/WebKitCSSMatrix-expected.txt 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/geometry/WebKitCSSMatrix-expected.txt 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1,9 +1,5 @@
-FAIL Equivalence test assert_equals: interface object expected function "function DOMMatrix() {
- [native code]
-}" but got function "function WebKitCSSMatrix() {
- [native code]
-}"
+PASS Equivalence test
PASS Property descriptor for WebKitCSSMatrix
PASS Property descriptor for DOMMatrix
Modified: trunk/LayoutTests/platform/ios/ios/css/construct-WebKitCSSMatrix-expected.txt (267653 => 267654)
--- trunk/LayoutTests/platform/ios/ios/css/construct-WebKitCSSMatrix-expected.txt 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/platform/ios/ios/css/construct-WebKitCSSMatrix-expected.txt 2020-09-27 12:35:28 UTC (rev 267654)
@@ -5,7 +5,7 @@
PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix) is 'matrix(1, 0, 0, 1, 0, 0)'
PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix(new WebKitCSSMatrix)) is 'matrix(1, 0, 0, 1, 0, 0)'
-PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix('matrix3d(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000)')) is 'matrix(1, 0, 0, 1, 0, 0)'
+PASS WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix('matrix3d(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000)')) is 'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/ios/ios/css/resources/construct-WebKitCSSMatrix.js (267653 => 267654)
--- trunk/LayoutTests/platform/ios/ios/css/resources/construct-WebKitCSSMatrix.js 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/platform/ios/ios/css/resources/construct-WebKitCSSMatrix.js 2020-09-27 12:35:28 UTC (rev 267654)
@@ -9,6 +9,6 @@
"'matrix(1, 0, 0, 1, 0, 0)'");
shouldBe("WebKitCSSMatrix.prototype.toString.call(new WebKitCSSMatrix('matrix3d(1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000)'))",
- "'matrix(1, 0, 0, 1, 0, 0)'");
+ "'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'");
var successfullyParsed = true;
Modified: trunk/LayoutTests/transforms/cssmatrix-2d-interface-expected.txt (267653 => 267654)
--- trunk/LayoutTests/transforms/cssmatrix-2d-interface-expected.txt 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/transforms/cssmatrix-2d-interface-expected.txt 2020-09-27 12:35:28 UTC (rev 267654)
@@ -189,7 +189,12 @@
PASS sx.f is 0
Test multiply with missing argument
-PASS m2 is null
+PASS m2.a is 1
+PASS m2.b is 2
+PASS m2.c is 3
+PASS m2.d is 4
+PASS m2.e is 5
+PASS m2.f is 6
Test inverse
PASS parseFloat(m2.a) is 0.5
@@ -208,8 +213,21 @@
PASS parseFloat(m.f) is 20
Test throwing exception from inverse
-PASS m.inverse() threw exception NotSupportedError: The operation is not supported..
+PASS m2.a is NaN
+PASS m2.b is NaN
+PASS m2.c is NaN
+PASS m2.d is NaN
+PASS m2.e is NaN
+PASS m2.f is NaN
+Test immutability of inverse
+PASS m.a is 0
+PASS m.b is 0
+PASS m.c is 0
+PASS m.d is 0
+PASS m.e is 0
+PASS m.f is 0
+
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/transforms/cssmatrix-2d-interface.xhtml (267653 => 267654)
--- trunk/LayoutTests/transforms/cssmatrix-2d-interface.xhtml 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/transforms/cssmatrix-2d-interface.xhtml 2020-09-27 12:35:28 UTC (rev 267654)
@@ -255,7 +255,12 @@
debug("Test multiply with missing argument");
m = new WebKitCSSMatrix("matrix(1, 2, 3, 4, 5, 6)");
m2 = m.multiply();
-shouldBe('m2', 'null');
+shouldBe('m2.a', '1');
+shouldBe('m2.b', '2');
+shouldBe('m2.c', '3');
+shouldBe('m2.d', '4');
+shouldBe('m2.e', '5');
+shouldBe('m2.f', '6');
debug("");
debug("Test inverse");
@@ -281,10 +286,26 @@
debug("");
debug("Test throwing exception from inverse");
m = new WebKitCSSMatrix("matrix(0, 0, 0, 0, 0, 0)"); // not invertible
-shouldThrow('m.inverse()');
+m2 = m.inverse();
+shouldBeNaN('m2.a');
+shouldBeNaN('m2.b');
+shouldBeNaN('m2.c');
+shouldBeNaN('m2.d');
+shouldBeNaN('m2.e');
+shouldBeNaN('m2.f');
+
debug("");
+debug("Test immutability of inverse");
+shouldBe('m.a', '0');
+shouldBe('m.b', '0');
+shouldBe('m.c', '0');
+shouldBe('m.d', '0');
+shouldBe('m.e', '0');
+shouldBe('m.f', '0');
+debug("");
+
</script>
<script src=""
Modified: trunk/LayoutTests/transforms/cssmatrix-3d-interface-expected.txt (267653 => 267654)
--- trunk/LayoutTests/transforms/cssmatrix-3d-interface-expected.txt 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/transforms/cssmatrix-3d-interface-expected.txt 2020-09-27 12:35:28 UTC (rev 267654)
@@ -216,9 +216,6 @@
PASS parseFloat(m.m43) is 30
PASS parseFloat(m.m44) is 1
-Test throwing exception from inverse
-PASS m.inverse() threw exception NotSupportedError: The operation is not supported..
-
Test translate
PASS m2.m11 is 1
PASS m2.m12 is 0
Modified: trunk/LayoutTests/transforms/cssmatrix-3d-interface.xhtml (267653 => 267654)
--- trunk/LayoutTests/transforms/cssmatrix-3d-interface.xhtml 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/LayoutTests/transforms/cssmatrix-3d-interface.xhtml 2020-09-27 12:35:28 UTC (rev 267654)
@@ -277,11 +277,6 @@
shouldBe('parseFloat(m.m44)', '1');
debug("");
-debug("Test throwing exception from inverse");
-m = new WebKitCSSMatrix("matrix3d(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)"); // not invertible
-shouldThrow('m.inverse()');
-
-debug("");
debug("Test translate");
m = new WebKitCSSMatrix();
var m2 = m.translate(10, 20, 30);
Modified: trunk/Source/WebCore/CMakeLists.txt (267653 => 267654)
--- trunk/Source/WebCore/CMakeLists.txt 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-09-27 12:35:28 UTC (rev 267654)
@@ -742,8 +742,6 @@
css/typedom/TypedOMCSSUnitValue.idl
css/typedom/TypedOMCSSUnparsedValue.idl
- css/WebKitCSSMatrix.idl
-
dom/AbortAlgorithm.idl
dom/AbortController.idl
dom/AbortSignal.idl
Modified: trunk/Source/WebCore/ChangeLog (267653 => 267654)
--- trunk/Source/WebCore/ChangeLog 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/ChangeLog 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1,5 +1,28 @@
2020-09-27 Rob Buis <[email protected]>
+ Alias WebKitCSSMatrix to DOMMatrix
+ https://bugs.webkit.org/show_bug.cgi?id=153675
+
+ Reviewed by Chris Dumez.
+
+ Alias WebKitCSSMatrix to DOMMatrix and remove
+ the generated JSWebKitCSSMatrix as well as
+ WebKitCSSMatrix itself since it is no longer
+ needed.
+
+ * CMakeLists.txt:
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources-output.xcfilelist:
+ * DerivedSources.make:
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/DOMMatrix.idl:
+ * css/WebKitCSSMatrix.cpp: Removed.
+ * css/WebKitCSSMatrix.h: Removed.
+ * css/WebKitCSSMatrix.idl: Removed.
+
+2020-09-27 Rob Buis <[email protected]>
+
Clean up type parameter for Event idl
https://bugs.webkit.org/show_bug.cgi?id=217013
Modified: trunk/Source/WebCore/DerivedSources-input.xcfilelist (267653 => 267654)
--- trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/DerivedSources-input.xcfilelist 2020-09-27 12:35:28 UTC (rev 267654)
@@ -635,7 +635,6 @@
$(PROJECT_DIR)/css/StyleMedia.idl
$(PROJECT_DIR)/css/StyleSheet.idl
$(PROJECT_DIR)/css/StyleSheetList.idl
-$(PROJECT_DIR)/css/WebKitCSSMatrix.idl
$(PROJECT_DIR)/css/WebKitCSSViewportRule.idl
$(PROJECT_DIR)/css/WebKitFontFamilyNames.in
$(PROJECT_DIR)/css/dialog.css
Modified: trunk/Source/WebCore/DerivedSources-output.xcfilelist (267653 => 267654)
--- trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/DerivedSources-output.xcfilelist 2020-09-27 12:35:28 UTC (rev 267654)
@@ -2362,8 +2362,6 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitAudioListener.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitAudioPannerNode.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitAudioPannerNode.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitCSSMatrix.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitCSSMatrix.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitCSSViewportRule.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitCSSViewportRule.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSWebKitDynamicsCompressorNode.cpp
Modified: trunk/Source/WebCore/DerivedSources.make (267653 => 267654)
--- trunk/Source/WebCore/DerivedSources.make 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/DerivedSources.make 2020-09-27 12:35:28 UTC (rev 267654)
@@ -692,7 +692,6 @@
$(WebCore)/css/typedom/TypedOMCSSStyleValue.idl \
$(WebCore)/css/typedom/TypedOMCSSUnitValue.idl \
$(WebCore)/css/typedom/TypedOMCSSUnparsedValue.idl \
- $(WebCore)/css/WebKitCSSMatrix.idl \
$(WebCore)/dom/AbortAlgorithm.idl \
$(WebCore)/dom/AbortController.idl \
$(WebCore)/dom/AbortSignal.idl \
Modified: trunk/Source/WebCore/Sources.txt (267653 => 267654)
--- trunk/Source/WebCore/Sources.txt 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/Sources.txt 2020-09-27 12:35:28 UTC (rev 267654)
@@ -765,7 +765,6 @@
css/StyleSheetContents.cpp
css/StyleSheetList.cpp
css/TransformFunctions.cpp
-css/WebKitCSSMatrix.cpp
css/parser/CSSAtRuleID.cpp
css/parser/CSSDeferredParser.cpp
css/parser/CSSParser.cpp
@@ -3600,7 +3599,6 @@
JSWebKitAudioContext.cpp
JSWebKitAudioListener.cpp
JSWebKitAudioPannerNode.cpp
-JSWebKitCSSMatrix.cpp
JSWebKitDynamicsCompressorNode.cpp
JSWebKitMediaKeyError.cpp
JSWebKitMediaKeyMessageEvent.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (267653 => 267654)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1273,8 +1273,6 @@
494BD7950F55C8EE00747828 /* WebKitPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 494BD7930F55C8EE00747828 /* WebKitPoint.h */; };
494BD79E0F55C94C00747828 /* JSWebKitPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 494BD79C0F55C94C00747828 /* JSWebKitPoint.h */; };
4969B0F313D0B33F00DF3521 /* HitTestingTransformState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4969B0F113D0B33F00DF3521 /* HitTestingTransformState.h */; };
- 498391400F1E767500C23782 /* JSWebKitCSSMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 4983913E0F1E767500C23782 /* JSWebKitCSSMatrix.h */; };
- 498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 498391560F1E776900C23782 /* WebKitCSSMatrix.h */; };
498770F11242C535002226BA /* Texture.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770D81242C535002226BA /* Texture.h */; };
498770F31242C535002226BA /* TilingData.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770DA1242C535002226BA /* TilingData.h */; };
4998AEC613F9D0EA0090B1AA /* RequestAnimationFrameCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 4998AEC413F9D0EA0090B1AA /* RequestAnimationFrameCallback.h */; };
@@ -8044,11 +8042,6 @@
4958782012A57DDF007238AC /* PlatformCALayerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCALayerCocoa.mm; sourceTree = "<group>"; };
4969B0F013D0B33F00DF3521 /* HitTestingTransformState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestingTransformState.cpp; sourceTree = "<group>"; };
4969B0F113D0B33F00DF3521 /* HitTestingTransformState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HitTestingTransformState.h; sourceTree = "<group>"; };
- 4983913D0F1E767500C23782 /* JSWebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSMatrix.cpp; sourceTree = "<group>"; };
- 4983913E0F1E767500C23782 /* JSWebKitCSSMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitCSSMatrix.h; sourceTree = "<group>"; };
- 498391550F1E776900C23782 /* WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSMatrix.cpp; sourceTree = "<group>"; };
- 498391560F1E776900C23782 /* WebKitCSSMatrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSMatrix.h; sourceTree = "<group>"; };
- 498391570F1E776900C23782 /* WebKitCSSMatrix.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSMatrix.idl; sourceTree = "<group>"; };
498770D71242C535002226BA /* Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Texture.cpp; sourceTree = "<group>"; };
498770D81242C535002226BA /* Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Texture.h; sourceTree = "<group>"; };
498770D91242C535002226BA /* TilingData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TilingData.cpp; sourceTree = "<group>"; };
@@ -24929,8 +24922,6 @@
BCE013990C0BEF180043860A /* JSStyleSheet.h */,
A84EBD820CB8C97700079609 /* JSStyleSheetList.cpp */,
A84EBD810CB8C97700079609 /* JSStyleSheetList.h */,
- 4983913D0F1E767500C23782 /* JSWebKitCSSMatrix.cpp */,
- 4983913E0F1E767500C23782 /* JSWebKitCSSMatrix.h */,
3F2B33E9165AF15500E3987C /* JSWebKitCSSViewportRule.cpp */,
3F2B33EA165AF15500E3987C /* JSWebKitCSSViewportRule.h */,
);
@@ -28897,9 +28888,6 @@
B2227B040D00BFF10071B782 /* SVGCSSValueKeywords.in */,
FB484F4A171F821E00040755 /* TransformFunctions.cpp */,
FB484F4B171F821E00040755 /* TransformFunctions.h */,
- 498391550F1E776900C23782 /* WebKitCSSMatrix.cpp */,
- 498391560F1E776900C23782 /* WebKitCSSMatrix.h */,
- 498391570F1E776900C23782 /* WebKitCSSMatrix.idl */,
31055BB81E4FE18900EB604E /* WebKitFontFamilyNames.in */,
);
path = css;
@@ -32738,7 +32726,6 @@
31A089891E738D5A003B6609 /* JSWebGPUTexture.h in Headers */,
31A0898C1E738D5A003B6609 /* JSWebGPUTextureDescriptor.h in Headers */,
31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */,
- 498391400F1E767500C23782 /* JSWebKitCSSMatrix.h in Headers */,
3F2B33EF165AF15600E3987C /* JSWebKitCSSViewportRule.h in Headers */,
7CC69941191EC5F500AF2270 /* JSWebKitNamespace.h in Headers */,
0FDA7C271883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h in Headers */,
@@ -34534,7 +34521,6 @@
8356F97F24D9F818006C3E41 /* WebKitAudioListener.h in Headers */,
831B61762499A5BB00C07C79 /* WebKitAudioPannerNode.h in Headers */,
5DFEBAB718592B6D00C75BEB /* WebKitAvailability.h in Headers */,
- 498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */,
830EEABA24DB6A64009EFBCE /* WebKitDynamicsCompressorNode.h in Headers */,
2D0621451DA639BA00A7FB26 /* WebKitMediaKeyMessageEvent.h in Headers */,
2D0621511DA63A9F00A7FB26 /* WebKitMediaKeyNeededEvent.h in Headers */,
Modified: trunk/Source/WebCore/css/DOMMatrix.idl (267653 => 267654)
--- trunk/Source/WebCore/css/DOMMatrix.idl 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/css/DOMMatrix.idl 2020-09-27 12:35:28 UTC (rev 267654)
@@ -27,6 +27,7 @@
[
ExportMacro=WEBCORE_EXPORT,
Exposed=(Window,Worker),
+ LegacyWindowAlias=WebKitCSSMatrix,
ImplementationLacksVTable
] interface DOMMatrix : DOMMatrixReadOnly {
[CallWith=ScriptExecutionContext] constructor(optional (DOMString or sequence<unrestricted double>) init);
Deleted: trunk/Source/WebCore/css/WebKitCSSMatrix.cpp (267653 => 267654)
--- trunk/Source/WebCore/css/WebKitCSSMatrix.cpp 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/css/WebKitCSSMatrix.cpp 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebKitCSSMatrix.h"
-
-#include "CSSParser.h"
-#include "CSSPrimitiveValue.h"
-#include "CSSPropertyNames.h"
-#include "CSSToLengthConversionData.h"
-#include "CSSValueKeywords.h"
-#include "StyleProperties.h"
-#include "TransformFunctions.h"
-#include <wtf/IsoMallocInlines.h>
-#include <wtf/MathExtras.h>
-#include <wtf/text/StringConcatenateNumbers.h>
-
-namespace WebCore {
-
-WTF_MAKE_ISO_ALLOCATED_IMPL(WebKitCSSMatrix);
-
-inline WebKitCSSMatrix::WebKitCSSMatrix(const TransformationMatrix& matrix)
- : m_matrix(matrix)
-{
-}
-
-Ref<WebKitCSSMatrix> WebKitCSSMatrix::create(const TransformationMatrix& matrix)
-{
- return adoptRef(*new WebKitCSSMatrix(matrix));
-}
-
-ExceptionOr<Ref<WebKitCSSMatrix>> WebKitCSSMatrix::create(const String& string)
-{
- auto result = adoptRef(*new WebKitCSSMatrix);
- auto setMatrixValueResult = result->setMatrixValue(string);
- if (setMatrixValueResult.hasException())
- return setMatrixValueResult.releaseException();
- return result;
-}
-
-WebKitCSSMatrix::~WebKitCSSMatrix() = default;
-
-ExceptionOr<void> WebKitCSSMatrix::setMatrixValue(const String& string)
-{
- if (string.isEmpty())
- return { };
-
- auto styleDeclaration = MutableStyleProperties::create();
- if (CSSParser::parseValue(styleDeclaration, CSSPropertyTransform, string, true, HTMLStandardMode) == CSSParser::ParseResult::Error)
- return Exception { SyntaxError };
-
- // Convert to TransformOperations. This can fail if a property requires style (i.e., param uses 'ems' or 'exs')
- auto value = styleDeclaration->getPropertyCSSValue(CSSPropertyTransform);
-
- // Check for a "none" or empty transform. In these cases we can use the default identity matrix.
- if (!value || (is<CSSPrimitiveValue>(*value) && downcast<CSSPrimitiveValue>(*value).valueID() == CSSValueNone))
- return { };
-
- TransformOperations operations;
- if (!transformsForValue(*value, CSSToLengthConversionData(), operations))
- return Exception { SyntaxError };
-
- // Convert transform operations to a TransformationMatrix. This can fail if a parameter has a percentage ('%').
- TransformationMatrix matrix;
- for (auto& operation : operations.operations()) {
- if (operation->apply(matrix, IntSize(0, 0)))
- return Exception { SyntaxError };
- }
- m_matrix = matrix;
- return { };
-}
-
-// Perform a concatenation of the matrices (this * secondMatrix)
-RefPtr<WebKitCSSMatrix> WebKitCSSMatrix::multiply(WebKitCSSMatrix* secondMatrix) const
-{
- if (!secondMatrix)
- return nullptr;
-
- auto matrix = create(m_matrix);
- matrix->m_matrix.multiply(secondMatrix->m_matrix);
- return matrix;
-}
-
-ExceptionOr<Ref<WebKitCSSMatrix>> WebKitCSSMatrix::inverse() const
-{
- auto inverse = m_matrix.inverse();
- if (!inverse)
- return Exception { NotSupportedError };
- return create(inverse.value());
-}
-
-Ref<WebKitCSSMatrix> WebKitCSSMatrix::translate(double x, double y, double z) const
-{
- if (std::isnan(x))
- x = 0;
- if (std::isnan(y))
- y = 0;
- if (std::isnan(z))
- z = 0;
-
- auto matrix = create(m_matrix);
- matrix->m_matrix.translate3d(x, y, z);
- return matrix;
-}
-
-Ref<WebKitCSSMatrix> WebKitCSSMatrix::scale(double scaleX, double scaleY, double scaleZ) const
-{
- if (std::isnan(scaleX))
- scaleX = 1;
- if (std::isnan(scaleY))
- scaleY = scaleX;
- if (std::isnan(scaleZ))
- scaleZ = 1;
-
- auto matrix = create(m_matrix);
- matrix->m_matrix.scale3d(scaleX, scaleY, scaleZ);
- return matrix;
-}
-
-Ref<WebKitCSSMatrix> WebKitCSSMatrix::rotate(double rotX, double rotY, double rotZ) const
-{
- if (std::isnan(rotX))
- rotX = 0;
-
- if (std::isnan(rotY) && std::isnan(rotZ)) {
- rotZ = rotX;
- rotX = 0;
- rotY = 0;
- }
-
- if (std::isnan(rotY))
- rotY = 0;
- if (std::isnan(rotZ))
- rotZ = 0;
-
- auto matrix = create(m_matrix);
- matrix->m_matrix.rotate3d(rotX, rotY, rotZ);
- return matrix;
-}
-
-Ref<WebKitCSSMatrix> WebKitCSSMatrix::rotateAxisAngle(double x, double y, double z, double angle) const
-{
- if (std::isnan(x))
- x = 0;
- if (std::isnan(y))
- y = 0;
- if (std::isnan(z))
- z = 0;
- if (std::isnan(angle))
- angle = 0;
- if (x == 0 && y == 0 && z == 0)
- z = 1;
-
- auto matrix = create(m_matrix);
- matrix->m_matrix.rotate3d(x, y, z, angle);
- return matrix;
-}
-
-Ref<WebKitCSSMatrix> WebKitCSSMatrix::skewX(double angle) const
-{
- if (std::isnan(angle))
- angle = 0;
-
- auto matrix = create(m_matrix);
- matrix->m_matrix.skewX(angle);
- return matrix;
-}
-
-Ref<WebKitCSSMatrix> WebKitCSSMatrix::skewY(double angle) const
-{
- if (std::isnan(angle))
- angle = 0;
-
- auto matrix = create(m_matrix);
- matrix->m_matrix.skewY(angle);
- return matrix;
-}
-
-ExceptionOr<String> WebKitCSSMatrix::toString() const
-{
- if (!m_matrix.containsOnlyFiniteValues())
- return Exception { InvalidStateError, "Matrix contains non-finite values"_s };
-
- if (m_matrix.isAffine())
- return makeString("matrix(", m_matrix.a(), ", ", m_matrix.b(), ", ", m_matrix.c(), ", ", m_matrix.d(), ", ", m_matrix.e(), ", ", m_matrix.f(), ')');
-
- return makeString("matrix3d(", 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(), ')');
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/css/WebKitCSSMatrix.h (267653 => 267654)
--- trunk/Source/WebCore/css/WebKitCSSMatrix.h 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/css/WebKitCSSMatrix.h 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1,151 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "ExceptionOr.h"
-#include "ScriptWrappable.h"
-#include "TransformationMatrix.h"
-
-namespace WebCore {
-
-// FIXME: Remove this class once WebKitCSSMatrix becomes an alias to DOMMatrix.
-class WebKitCSSMatrix final : public ScriptWrappable, public RefCounted<WebKitCSSMatrix> {
- WTF_MAKE_ISO_ALLOCATED(WebKitCSSMatrix);
-public:
- static Ref<WebKitCSSMatrix> create(const TransformationMatrix&);
- static ExceptionOr<Ref<WebKitCSSMatrix>> create(const String&);
-
- ~WebKitCSSMatrix();
-
- double a() const { return m_matrix.a(); }
- double b() const { return m_matrix.b(); }
- double c() const { return m_matrix.c(); }
- double d() const { return m_matrix.d(); }
- double e() const { return m_matrix.e(); }
- double f() const { return m_matrix.f(); }
-
- void setA(double f) { m_matrix.setA(f); }
- void setB(double f) { m_matrix.setB(f); }
- void setC(double f) { m_matrix.setC(f); }
- void setD(double f) { m_matrix.setD(f); }
- void setE(double f) { m_matrix.setE(f); }
- void setF(double f) { m_matrix.setF(f); }
-
- double m11() const { return m_matrix.m11(); }
- double m12() const { return m_matrix.m12(); }
- double m13() const { return m_matrix.m13(); }
- double m14() const { return m_matrix.m14(); }
- double m21() const { return m_matrix.m21(); }
- double m22() const { return m_matrix.m22(); }
- double m23() const { return m_matrix.m23(); }
- double m24() const { return m_matrix.m24(); }
- double m31() const { return m_matrix.m31(); }
- double m32() const { return m_matrix.m32(); }
- double m33() const { return m_matrix.m33(); }
- double m34() const { return m_matrix.m34(); }
- double m41() const { return m_matrix.m41(); }
- double m42() const { return m_matrix.m42(); }
- double m43() const { return m_matrix.m43(); }
- double m44() const { return m_matrix.m44(); }
-
- void setM11(double f) { m_matrix.setM11(f); }
- void setM12(double f) { m_matrix.setM12(f); }
- void setM13(double f) { m_matrix.setM13(f); }
- void setM14(double f) { m_matrix.setM14(f); }
- void setM21(double f) { m_matrix.setM21(f); }
- void setM22(double f) { m_matrix.setM22(f); }
- void setM23(double f) { m_matrix.setM23(f); }
- void setM24(double f) { m_matrix.setM24(f); }
- void setM31(double f) { m_matrix.setM31(f); }
- void setM32(double f) { m_matrix.setM32(f); }
- void setM33(double f) { m_matrix.setM33(f); }
- void setM34(double f) { m_matrix.setM34(f); }
- void setM41(double f) { m_matrix.setM41(f); }
- void setM42(double f) { m_matrix.setM42(f); }
- void setM43(double f) { m_matrix.setM43(f); }
- void setM44(double f) { m_matrix.setM44(f); }
-
- ExceptionOr<void> setMatrixValue(const String&);
-
- // The following math function return a new matrix with the
- // specified operation applied. The this value is not modified.
-
- // Multiply this matrix by secondMatrix, on the right (result = this * secondMatrix)
- RefPtr<WebKitCSSMatrix> multiply(WebKitCSSMatrix* secondMatrix) const;
-
- // Return the inverse of this matrix. Throw an exception if the matrix is not invertible
- ExceptionOr<Ref<WebKitCSSMatrix>> inverse() const;
-
- // Return this matrix translated by the passed values.
- // Passing a NaN will use a value of 0. This allows the 3D form to used for 2D operations
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the translation values on the left (result = translation(x,y,z) * this)
- Ref<WebKitCSSMatrix> translate(double x, double y, double z) const;
-
- // Returns this matrix scaled by the passed values.
- // Passing scaleX or scaleZ as NaN uses a value of 1, but passing scaleY of NaN
- // makes it the same as scaleX. This allows the 3D form to used for 2D operations
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the scale values on the left (result = scale(x,y,z) * this)
- Ref<WebKitCSSMatrix> scale(double scaleX, double scaleY, double scaleZ) const;
-
- // Returns this matrix rotated by the passed values.
- // If rotY and rotZ are NaN, rotate about Z (rotX=0, rotateY=0, rotateZ=rotX).
- // Otherwise use a rotation value of 0 for any passed NaN.
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the rotation values on the left (result = rotation(x,y,z) * this)
- Ref<WebKitCSSMatrix> rotate(double rotX, double rotY, double rotZ) const;
-
- // Returns this matrix rotated about the passed axis by the passed angle.
- // Passing a NaN will use a value of 0. If the axis is (0,0,0) use a value
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the rotation values on the left (result = rotation(x,y,z,angle) * this)
- Ref<WebKitCSSMatrix> rotateAxisAngle(double x, double y, double z, double angle) const;
-
- // Return this matrix skewed along the X axis by the passed values.
- // Passing a NaN will use a value of 0.
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the skew values on the left (result = skewX(angle) * this)
- Ref<WebKitCSSMatrix> skewX(double angle) const;
-
- // Return this matrix skewed along the Y axis by the passed values.
- // Passing a NaN will use a value of 0.
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the skew values on the left (result = skewY(angle) * this)
- Ref<WebKitCSSMatrix> skewY(double angle) const;
-
- const TransformationMatrix& transform() const { return m_matrix; }
-
- ExceptionOr<String> toString() const;
-
-private:
- WebKitCSSMatrix() = default;
- WebKitCSSMatrix(const TransformationMatrix&);
-
- TransformationMatrix m_matrix;
-};
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/css/WebKitCSSMatrix.idl (267653 => 267654)
--- trunk/Source/WebCore/css/WebKitCSSMatrix.idl 2020-09-27 08:14:36 UTC (rev 267653)
+++ trunk/Source/WebCore/css/WebKitCSSMatrix.idl 2020-09-27 12:35:28 UTC (rev 267654)
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// FIXME: This should be removed and made an alias to DOMRect.
-[
- ImplementationLacksVTable,
-] interface WebKitCSSMatrix {
- constructor(optional DOMString cssValue);
-
- // These attributes are simple aliases for certain elements of the 4x4 matrix
- attribute unrestricted double a; // alias for m11
- attribute unrestricted double b; // alias for m12
- attribute unrestricted double c; // alias for m21
- attribute unrestricted double d; // alias for m22
- attribute unrestricted double e; // alias for m41
- attribute unrestricted double f; // alias for m42
-
- attribute unrestricted double m11;
- attribute unrestricted double m12;
- attribute unrestricted double m13;
-
- attribute unrestricted double m14;
- attribute unrestricted double m21;
- attribute unrestricted double m22;
- attribute unrestricted double m23;
- attribute unrestricted double m24;
- attribute unrestricted double m31;
- attribute unrestricted double m32;
- attribute unrestricted double m33;
- attribute unrestricted double m34;
- attribute unrestricted double m41;
- attribute unrestricted double m42;
- attribute unrestricted double m43;
- attribute unrestricted double m44;
-
- // FIXME: Using "undefined" as default parameter value is wrong.
- [MayThrowException] undefined setMatrixValue(optional DOMString string = "undefined");
-
- // Multiply this matrix by secondMatrix, on the right (result = this * secondMatrix)
- WebKitCSSMatrix multiply(optional WebKitCSSMatrix? secondMatrix = null);
-
- // Return the inverse of this matrix. Throw an exception if the matrix is not invertible
- [MayThrowException] WebKitCSSMatrix inverse();
-
- // Return this matrix translated by the passed values.
- // Passing a NaN will use a value of 0. This allows the 3D form to used for 2D operations
- WebKitCSSMatrix translate(optional unrestricted double x = NaN, optional unrestricted double y = NaN, optional unrestricted double z = NaN);
-
- // Returns this matrix scaled by the passed values.
- // Passing scaleX or scaleZ as NaN uses a value of 1, but passing scaleY of NaN
- // makes it the same as scaleX. This allows the 3D form to used for 2D operations
- WebKitCSSMatrix scale(optional unrestricted double scaleX = NaN, optional unrestricted double scaleY = NaN, optional unrestricted double scaleZ = NaN);
-
- // Returns this matrix rotated by the passed values.
- // If rotY and rotZ are NaN, rotate about Z (rotX=0, rotateY=0, rotateZ=rotX).
- // Otherwise use a rotation value of 0 for any passed NaN.
- WebKitCSSMatrix rotate(optional unrestricted double rotX = NaN, optional unrestricted double rotY = NaN, optional unrestricted double rotZ = NaN);
-
- // Returns this matrix rotated about the passed axis by the passed angle.
- // Passing a NaN will use a value of 0. If the axis is (0,0,0) use a value
- // of (0,0,1).
- WebKitCSSMatrix rotateAxisAngle(optional unrestricted double x = NaN, optional unrestricted double y = NaN, optional unrestricted double z = NaN, optional unrestricted double angle = NaN);
-
- // Returns this matrix skewed along the X axis by the passed values.
- // Passing a NaN will use a value of 0.
- WebKitCSSMatrix skewX(optional unrestricted double angle = NaN);
-
- // Returns this matrix skewed along the Y axis by the passed values.
- // Passing a NaN will use a value of 0.
- WebKitCSSMatrix skewY(optional unrestricted double angle = NaN);
-
- [MayThrowException] stringifier;
-};
