diff options
Diffstat (limited to 'WebCore/css/WebKitCSSMatrix.h')
| -rw-r--r-- | WebCore/css/WebKitCSSMatrix.h | 105 |
1 files changed, 83 insertions, 22 deletions
diff --git a/WebCore/css/WebKitCSSMatrix.h b/WebCore/css/WebKitCSSMatrix.h index 1c660bf..67ba113 100644 --- a/WebCore/css/WebKitCSSMatrix.h +++ b/WebCore/css/WebKitCSSMatrix.h @@ -26,8 +26,9 @@ #ifndef WebKitCSSMatrix_h #define WebKitCSSMatrix_h -#include "StyleBase.h" +#include "ExceptionCode.h" #include "PlatformString.h" +#include "StyleBase.h" #include "TransformationMatrix.h" #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> @@ -55,34 +56,94 @@ public: virtual ~WebKitCSSMatrix(); - float a() const { return static_cast<float>(m_matrix.a()); } - float b() const { return static_cast<float>(m_matrix.b()); } - float c() const { return static_cast<float>(m_matrix.c()); } - float d() const { return static_cast<float>(m_matrix.d()); } - float e() const { return static_cast<float>(m_matrix.e()); } - float f() const { return static_cast<float>(m_matrix.f()); } + 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(float f) { m_matrix.setA(f); } - void setB(float f) { m_matrix.setB(f); } - void setC(float f) { m_matrix.setC(f); } - void setD(float f) { m_matrix.setD(f); } - void setE(float f) { m_matrix.setE(f); } - void setF(float f) { m_matrix.setF(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); } void setMatrixValue(const String& string, ExceptionCode&); - // this = this * secondMatrix - PassRefPtr<WebKitCSSMatrix> multiply(WebKitCSSMatrix* secondMatrix); + // 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) + PassRefPtr<WebKitCSSMatrix> multiply(WebKitCSSMatrix* secondMatrix) const; + + // Return the inverse of this matrix. Throw an exception if the matrix is not invertible + PassRefPtr<WebKitCSSMatrix> inverse(ExceptionCode&) 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) + PassRefPtr<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) + PassRefPtr<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) + PassRefPtr<WebKitCSSMatrix> rotate(double rotX, double rotY, double rotZ) const; - // FIXME: we really should have an exception here, for when matrix is not invertible - PassRefPtr<WebKitCSSMatrix> inverse(ExceptionCode&); - PassRefPtr<WebKitCSSMatrix> translate(float x, float y); - PassRefPtr<WebKitCSSMatrix> scale(float scaleX, float scaleY); - PassRefPtr<WebKitCSSMatrix> rotate(float rot); + // 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) + PassRefPtr<WebKitCSSMatrix> rotateAxisAngle(double x, double y, double z, double angle) const; - const TransformationMatrix& transform() { return m_matrix; } + const TransformationMatrix& transform() const { return m_matrix; } - String toString(); + String toString() const; protected: WebKitCSSMatrix(); |