Created
February 2, 2016 22:56
-
-
Save miketaylr/944ac222dc9e03d39c2d to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/dom/base/WebKitCSSMatrix.cpp b/dom/base/WebKitCSSMatrix.cpp | |
index b5baf25..b892140 100644 | |
--- a/dom/base/WebKitCSSMatrix.cpp | |
+++ b/dom/base/WebKitCSSMatrix.cpp | |
@@ -230,10 +230,14 @@ already_AddRefed<WebKitCSSMatrix> | |
WebKitCSSMatrix::RotateAxisAngle(double aX, | |
double aY, | |
double aZ, | |
- double aAngle) const | |
+ double aAngle, | |
+ ErrorResult& aRv) const | |
{ | |
+ nsAutoString transformListStr; | |
+ transformListStr.AppendPrintf("rotate3d(%g, %g, %g, %gdeg)", aX, aY, aZ, aAngle); | |
+ | |
RefPtr<WebKitCSSMatrix> retval = new WebKitCSSMatrix(mParent, *this); | |
- retval->RotateAxisAngleSelf(aX, aY, aZ, aAngle); | |
+ retval->SetMatrixValue(transformListStr, aRv); | |
return retval.forget(); | |
} | |
diff --git a/dom/base/WebKitCSSMatrix.h b/dom/base/WebKitCSSMatrix.h | |
index 4b2adf9..cad5790 100644 | |
--- a/dom/base/WebKitCSSMatrix.h | |
+++ b/dom/base/WebKitCSSMatrix.h | |
@@ -55,7 +55,8 @@ public: | |
already_AddRefed<WebKitCSSMatrix> RotateAxisAngle(double aX, | |
double aY, | |
double aZ, | |
- double aAngle) const; | |
+ double aAngle, | |
+ ErrorResult& aRv) const; | |
already_AddRefed<WebKitCSSMatrix> SkewX(double aSx) const; | |
already_AddRefed<WebKitCSSMatrix> SkewY(double aSy) const; | |
protected: | |
diff --git a/dom/webidl/WebKitCSSMatrix.webidl b/dom/webidl/WebKitCSSMatrix.webidl | |
index 8115711..e35fa78 100644 | |
--- a/dom/webidl/WebKitCSSMatrix.webidl | |
+++ b/dom/webidl/WebKitCSSMatrix.webidl | |
@@ -30,6 +30,7 @@ interface WebKitCSSMatrix : DOMMatrix { | |
WebKitCSSMatrix rotate(optional unrestricted double rotX = 0, | |
optional unrestricted double rotY, | |
optional unrestricted double rotZ); | |
+ [Throws] | |
WebKitCSSMatrix rotateAxisAngle(optional unrestricted double x = 0, | |
optional unrestricted double y = 0, | |
optional unrestricted double z = 0, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment