2006-05-30 Eric Seidel <eric@eseidel.com>

        Reviewed by andersca.

        Small amount of svg-related code cleanup.
        No test case possible.

        * ksvg2/svg/SVGColor.h:
        * ksvg2/svg/SVGLength.cpp:
        (SVGLength::SVGLength):
        (SVGLength::value):
        * ksvg2/svg/SVGMarkerElement.cpp:
        * ksvg2/svg/SVGMatrix.cpp:
        (SVGMatrix::SVGMatrix):
        (SVGMatrix::copy):
        (SVGMatrix::postMultiply):
        (SVGMatrix::inverse):
        (SVGMatrix::postTranslate):
        (SVGMatrix::postScale):
        (SVGMatrix::postScaleNonUniform):
        (SVGMatrix::postRotate):
        (SVGMatrix::postRotateFromVector):
        (SVGMatrix::postFlipX):
        (SVGMatrix::postFlipY):
        (SVGMatrix::postSkewX):
        (SVGMatrix::postSkewY):
        (SVGMatrix::multiply):
        (SVGMatrix::translate):
        (SVGMatrix::scale):
        (SVGMatrix::scaleNonUniform):
        (SVGMatrix::rotate):
        (SVGMatrix::rotateFromVector):
        (SVGMatrix::flipX):
        (SVGMatrix::flipY):
        (SVGMatrix::skewX):
        (SVGMatrix::skewY):
        (SVGMatrix::setMatrix):
        (SVGMatrix::qmatrix):
        (SVGMatrix::removeScale):
        * ksvg2/svg/SVGMatrix.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 334226f1a8015545847db8c288182d5c35e62600..f66fd83e9360bc8a6cc29c9145f9927275a80567 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,7 +2,48 @@
 
         Reviewed by andersca.
 
-        Small ammount of bindings-related code cleanup.
+        Small amount of svg-related code cleanup.
+        No test case possible.
+
+        * ksvg2/svg/SVGColor.h:
+        * ksvg2/svg/SVGLength.cpp:
+        (SVGLength::SVGLength):
+        (SVGLength::value):
+        * ksvg2/svg/SVGMarkerElement.cpp:
+        * ksvg2/svg/SVGMatrix.cpp:
+        (SVGMatrix::SVGMatrix):
+        (SVGMatrix::copy):
+        (SVGMatrix::postMultiply):
+        (SVGMatrix::inverse):
+        (SVGMatrix::postTranslate):
+        (SVGMatrix::postScale):
+        (SVGMatrix::postScaleNonUniform):
+        (SVGMatrix::postRotate):
+        (SVGMatrix::postRotateFromVector):
+        (SVGMatrix::postFlipX):
+        (SVGMatrix::postFlipY):
+        (SVGMatrix::postSkewX):
+        (SVGMatrix::postSkewY):
+        (SVGMatrix::multiply):
+        (SVGMatrix::translate):
+        (SVGMatrix::scale):
+        (SVGMatrix::scaleNonUniform):
+        (SVGMatrix::rotate):
+        (SVGMatrix::rotateFromVector):
+        (SVGMatrix::flipX):
+        (SVGMatrix::flipY):
+        (SVGMatrix::skewX):
+        (SVGMatrix::skewY):
+        (SVGMatrix::setMatrix):
+        (SVGMatrix::qmatrix):
+        (SVGMatrix::removeScale):
+        * ksvg2/svg/SVGMatrix.h:
+
+2006-05-30  Eric Seidel  <eric@eseidel.com>
+
+        Reviewed by andersca.
+
+        Small amount of bindings-related code cleanup.
         No test case possible.
 
         * bindings/js/JSHTMLFormElementCustom.cpp:

diff --git a/WebCore/ksvg2/svg/SVGColor.h b/WebCore/ksvg2/svg/SVGColor.h
index ee6afda5bdd0e6b08dcd05d22db2dd2fa3a5be00..c955a806f5dbad524fcd1f8b45e5baa7ff601cca 100644 (file)
--- a/WebCore/ksvg2/svg/SVGColor.h
+++ b/WebCore/ksvg2/svg/SVGColor.h
@@ -53,9 +53,9 @@ namespace WebCore
         virtual String cssText() const;
 
         // Helpers
-        const Color &color() const;
+        const Color& color() const;
 
-    private:    
+    private:
         Color m_qColor;
         unsigned short m_colorType;
         String m_rgbColor;

diff --git a/WebCore/ksvg2/svg/SVGLength.cpp b/WebCore/ksvg2/svg/SVGLength.cpp
index 9512b9f265aecd6bc1b4d3cc2831507ad9dfac1a..a0cc987554d393da74c0faca0b382d3b3624f9b4 100644 (file)
--- a/WebCore/ksvg2/svg/SVGLength.cpp
+++ b/WebCore/ksvg2/svg/SVGLength.cpp
@@ -51,19 +51,17 @@ static const char* UnitText[] =
     "pc"
 };
 
-SVGLength::SVGLength(const SVGStyledElement *context, LengthMode mode, const SVGElement *viewport) : Shared<SVGLength>()
+SVGLength::SVGLength(const SVGStyledElement *context, LengthMode mode, const SVGElement *viewport)
+    : Shared<SVGLength>()
+    , m_value(0)
+    , m_valueInSpecifiedUnits(0)
+    , m_mode(mode)
+    , m_bboxRelative(false)
+    , m_unitType(SVG_LENGTHTYPE_UNKNOWN)
+    , m_requiresLayout(false)
+    , m_context(context)
+    , m_viewportElement(viewport)
 {
-    m_mode = mode;
-    m_context = context;
-    m_viewportElement = viewport;
-
-    m_value = 0;
-    m_valueInSpecifiedUnits = 0;
-
-    m_bboxRelative = false;
-    m_unitType = SVG_LENGTHTYPE_UNKNOWN;
-    
-    m_requiresLayout = false;
 }
 
 SVGLength::~SVGLength()
@@ -86,11 +84,11 @@ float SVGLength::value() const
     if (m_requiresLayout)
         const_cast<SVGLength*>(this)->updateValue(false);
 
-    if(m_unitType != SVG_LENGTHTYPE_PERCENTAGE)
+    if (m_unitType != SVG_LENGTHTYPE_PERCENTAGE)
         return m_value;
 
     float value = m_valueInSpecifiedUnits / 100.0;
-    if(m_bboxRelative)
+    if (m_bboxRelative)
         return value;
 
     // Use the manual override "m_viewportElement" when there is no context element off of which to establish the viewport.

diff --git a/WebCore/ksvg2/svg/SVGMarkerElement.cpp b/WebCore/ksvg2/svg/SVGMarkerElement.cpp
index 9836c7503a379a519b0848868644c8d22997ce70..15366b0066abd4abd53a83d15bf7dfdb5ef62c16 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMarkerElement.cpp
+++ b/WebCore/ksvg2/svg/SVGMarkerElement.cpp
@@ -32,7 +32,6 @@
 #include "SVGAnimatedLength.h"
 #include "SVGFitToViewBox.h"
 #include "SVGHelper.h"
-#include "SVGLength.h"
 #include "SVGMatrix.h"
 #include "SVGNames.h"
 #include "SVGSVGElement.h"

diff --git a/WebCore/ksvg2/svg/SVGMatrix.cpp b/WebCore/ksvg2/svg/SVGMatrix.cpp
index a9ac61bac363cdfe7cecd0cca569317f1a06efa5..f4a49b2989e2bc726f5b40974e36643db89673d2 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMatrix.cpp
+++ b/WebCore/ksvg2/svg/SVGMatrix.cpp
@@ -35,9 +35,10 @@ SVGMatrix::SVGMatrix() : Shared<SVGMatrix>()
 {
 }
 
-SVGMatrix::SVGMatrix(QMatrix mat) : Shared<SVGMatrix>()
+SVGMatrix::SVGMatrix(const QMatrix& mat)
+    : Shared<SVGMatrix>()
+    , m_mat(mat)
 {
-    m_mat = mat;
 }
 
 SVGMatrix::SVGMatrix(double a, double b, double c, double d, double e, double f) : Shared<SVGMatrix>()
@@ -109,25 +110,25 @@ double SVGMatrix::f() const
     return m_mat.dy();
 }
 
-void SVGMatrix::copy(const SVGMatrix *other)
+void SVGMatrix::copy(const SVGMatrix* other)
 {
     m_mat.setMatrix(other->m_mat.m11(), other->m_mat.m12(), other->m_mat.m21(), other->m_mat.m22(), other->m_mat.dx(), other->m_mat.dy());
 }
 
-SVGMatrix *SVGMatrix::postMultiply(const SVGMatrix *secondMatrix)
+SVGMatrix* SVGMatrix::postMultiply(const SVGMatrix* secondMatrix)
 {
     QMatrix temp(secondMatrix->a(), secondMatrix->b(), secondMatrix->c(), secondMatrix->d(), secondMatrix->e(), secondMatrix->f());
     m_mat *= temp;
     return this;
 }
 
-SVGMatrix *SVGMatrix::inverse()
+SVGMatrix* SVGMatrix::inverse()
 {
     m_mat = m_mat.invert();
     return this;
 }
 
-SVGMatrix *SVGMatrix::postTranslate(double x,  double y)
+SVGMatrix* SVGMatrix::postTranslate(double x,  double y)
 {
     // Could optimise these.
     QMatrix temp;
@@ -136,7 +137,7 @@ SVGMatrix *SVGMatrix::postTranslate(double x,  double y)
     return this;
 }
 
-SVGMatrix *SVGMatrix::postScale(double scaleFactor)
+SVGMatrix* SVGMatrix::postScale(double scaleFactor)
 {
     QMatrix temp;
     temp.scale(scaleFactor, scaleFactor);
@@ -144,7 +145,7 @@ SVGMatrix *SVGMatrix::postScale(double scaleFactor)
     return this;
 }
 
-SVGMatrix *SVGMatrix::postScaleNonUniform(double scaleFactorX, double scaleFactorY)
+SVGMatrix* SVGMatrix::postScaleNonUniform(double scaleFactorX, double scaleFactorY)
 {
     QMatrix temp;
     temp.scale(scaleFactorX, scaleFactorY);
@@ -152,7 +153,7 @@ SVGMatrix *SVGMatrix::postScaleNonUniform(double scaleFactorX, double scaleFacto
     return this;
 }
 
-SVGMatrix *SVGMatrix::postRotate(double angle)
+SVGMatrix* SVGMatrix::postRotate(double angle)
 {
     QMatrix temp;
     temp.rotate(angle);
@@ -160,7 +161,7 @@ SVGMatrix *SVGMatrix::postRotate(double angle)
     return this;
 }
 
-SVGMatrix *SVGMatrix::postRotateFromVector(double x, double y)
+SVGMatrix* SVGMatrix::postRotateFromVector(double x, double y)
 {
     QMatrix temp;
     temp.rotate(SVGAngle::todeg(atan2(y, x)));
@@ -168,21 +169,21 @@ SVGMatrix *SVGMatrix::postRotateFromVector(double x, double y)
     return this;
 }
 
-SVGMatrix *SVGMatrix::postFlipX()
+SVGMatrix* SVGMatrix::postFlipX()
 {
     QMatrix temp(-1.0F, 0.0F, 0.0F, 1.0F, 0.0F, 0.0F);
     m_mat *= temp;
     return this;
 }
 
-SVGMatrix *SVGMatrix::postFlipY()
+SVGMatrix* SVGMatrix::postFlipY()
 {
     QMatrix temp(1.0F, 0.0F, 0.0F, -1.0F, 0.0F, 0.0F);
     m_mat *= temp;
     return this;
 }
 
-SVGMatrix *SVGMatrix::postSkewX(double angle)
+SVGMatrix* SVGMatrix::postSkewX(double angle)
 {
     QMatrix temp;
     temp.shear(tan(SVGAngle::torad(angle)), 0.0F);
@@ -190,7 +191,7 @@ SVGMatrix *SVGMatrix::postSkewX(double angle)
     return this;
 }
 
-SVGMatrix *SVGMatrix::postSkewY(double angle)
+SVGMatrix* SVGMatrix::postSkewY(double angle)
 {
     QMatrix temp;
     temp.shear(0.0F, tan(SVGAngle::torad(angle)));
@@ -198,7 +199,7 @@ SVGMatrix *SVGMatrix::postSkewY(double angle)
     return this;
 }
 
-SVGMatrix *SVGMatrix::multiply(const SVGMatrix *secondMatrix)
+SVGMatrix* SVGMatrix::multiply(const SVGMatrix* secondMatrix)
 {
     QMatrix temp(secondMatrix->a(), secondMatrix->b(), secondMatrix->c(), secondMatrix->d(), secondMatrix->e(), secondMatrix->f());
     temp *= m_mat;
@@ -206,71 +207,71 @@ SVGMatrix *SVGMatrix::multiply(const SVGMatrix *secondMatrix)
     return this;
 }
 
-SVGMatrix *SVGMatrix::translate(double x,  double y)
+SVGMatrix* SVGMatrix::translate(double x,  double y)
 {
     m_mat.translate(x, y);
     return this;
 }
 
-SVGMatrix *SVGMatrix::scale(double scaleFactor)
+SVGMatrix* SVGMatrix::scale(double scaleFactor)
 {
     m_mat.scale(scaleFactor, scaleFactor);
     return this;
 }
 
-SVGMatrix *SVGMatrix::scaleNonUniform(double scaleFactorX, double scaleFactorY)
+SVGMatrix* SVGMatrix::scaleNonUniform(double scaleFactorX, double scaleFactorY)
 {
     m_mat.scale(scaleFactorX, scaleFactorY);
     return this;
 }
 
-SVGMatrix *SVGMatrix::rotate(double angle)
+SVGMatrix* SVGMatrix::rotate(double angle)
 {
     m_mat.rotate(angle);
     return this;
 }
 
-SVGMatrix *SVGMatrix::rotateFromVector(double x, double y)
+SVGMatrix* SVGMatrix::rotateFromVector(double x, double y)
 {
     m_mat.rotate(SVGAngle::todeg(atan2(y, x)));
     return this;
 }
 
-SVGMatrix *SVGMatrix::flipX()
+SVGMatrix* SVGMatrix::flipX()
 {
     m_mat.scale(-1.0f, 1.0f);
     return this;
 }
 
-SVGMatrix *SVGMatrix::flipY()
+SVGMatrix* SVGMatrix::flipY()
 {
     m_mat.scale(1.0f, -1.0f);
     return this;
 }
 
-SVGMatrix *SVGMatrix::skewX(double angle)
+SVGMatrix* SVGMatrix::skewX(double angle)
 {
     m_mat.shear(tan(SVGAngle::torad(angle)), 0.0F);
     return this;
 }
 
-SVGMatrix *SVGMatrix::skewY(double angle)
+SVGMatrix* SVGMatrix::skewY(double angle)
 {
     m_mat.shear(0.0F, tan(SVGAngle::torad(angle)));
     return this;
 }
 
-void SVGMatrix::setMatrix(QMatrix mat)
+void SVGMatrix::setMatrix(const QMatrix& mat)
 {
     m_mat = mat;
 }
 
-QMatrix &SVGMatrix::qmatrix()
+QMatrix& SVGMatrix::qmatrix()
 {
     return m_mat;
 }
 
-const QMatrix &SVGMatrix::qmatrix() const
+const QMatrix& SVGMatrix::qmatrix() const
 {
     return m_mat;
 }
@@ -280,7 +281,7 @@ void SVGMatrix::reset()
     m_mat.reset();
 }
 
-void SVGMatrix::removeScale(double *xScale, double *yScale)
+void SVGMatrix::removeScale(double* xScale, double* yScale)
 {
     double sx = sqrt(a() * a() + b() * b());
     double sy = sqrt(c() * c() + d() * d());

diff --git a/WebCore/ksvg2/svg/SVGMatrix.h b/WebCore/ksvg2/svg/SVGMatrix.h
index 0a7a18e603a07dd375d14a04558f1751e42f065e..c17867fa0d4bce035752ebd75e037ebe3518d18f 100644 (file)
--- a/WebCore/ksvg2/svg/SVGMatrix.h
+++ b/WebCore/ksvg2/svg/SVGMatrix.h
@@ -35,67 +35,67 @@ namespace WebCore
     public:
         SVGMatrix();
         SVGMatrix(double a, double b, double c, double d, double e, double f);
-        SVGMatrix(QMatrix mat);
+        SVGMatrix(const QMatrix& mat);
         virtual ~SVGMatrix();
 
-        void setA(double a);
+        void setA(double);
         double a() const;
 
-        void setB(double b);
+        void setB(double);
         double b() const;
 
-        void setC(double c);
+        void setC(double);
         double c() const;
 
-        void setD(double d);
+        void setD(double);
         double d() const;
 
-        void setE(double e);
+        void setE(double);
         double e() const;
 
-        void setF(double f);
+        void setF(double);
         double f() const;
 
-        void copy(const SVGMatrix *other);
+        void copy(const SVGMatrix*);
 
-        SVGMatrix *inverse();
+        SVGMatrix* inverse();
 
         // Pre-multiplied operations, as per the specs.
-        SVGMatrix *multiply(const SVGMatrix *secondMatrix);
-        SVGMatrix *translate(double x, double y);
-        SVGMatrix *scale(double scaleFactor);
-        SVGMatrix *scaleNonUniform(double scaleFactorX, double scaleFactorY);
-        SVGMatrix *rotate(double angle);
-        SVGMatrix *rotateFromVector(double x, double y);
-        SVGMatrix *flipX();
-        SVGMatrix *flipY();
-        SVGMatrix *skewX(double angle);
-        SVGMatrix *skewY(double angle);
+        SVGMatrix* multiply(const SVGMatrix*);
+        SVGMatrix* translate(double x, double y);
+        SVGMatrix* scale(double scaleFactor);
+        SVGMatrix* scaleNonUniform(double scaleFactorX, double scaleFactorY);
+        SVGMatrix* rotate(double angle);
+        SVGMatrix* rotateFromVector(double x, double y);
+        SVGMatrix* flipX();
+        SVGMatrix* flipY();
+        SVGMatrix* skewX(double angle);
+        SVGMatrix* skewY(double angle);
 
         // Post-multiplied operations
-        SVGMatrix *postMultiply(const SVGMatrix *secondMatrix);
-        SVGMatrix *postTranslate(double x, double y);
-        SVGMatrix *postScale(double scaleFactor);
-        SVGMatrix *postScaleNonUniform(double scaleFactorX, double scaleFactorY);
-        SVGMatrix *postRotate(double angle);
-        SVGMatrix *postRotateFromVector(double x, double y);
-        SVGMatrix *postFlipX();
-        SVGMatrix *postFlipY();
-        SVGMatrix *postSkewX(double angle);
-        SVGMatrix *postSkewY(double angle);
+        SVGMatrix* postMultiply(const SVGMatrix*);
+        SVGMatrix* postTranslate(double x, double y);
+        SVGMatrix* postScale(double scaleFactor);
+        SVGMatrix* postScaleNonUniform(double scaleFactorX, double scaleFactorY);
+        SVGMatrix* postRotate(double angle);
+        SVGMatrix* postRotateFromVector(double x, double y);
+        SVGMatrix* postFlipX();
+        SVGMatrix* postFlipY();
+        SVGMatrix* postSkewX(double angle);
+        SVGMatrix* postSkewY(double angle);
 
         void reset();
 
         // KSVG helper method
-        QMatrix &qmatrix();
-        const QMatrix &qmatrix() const;
+        QMatrix& qmatrix();
+        const QMatrix& qmatrix() const;
 
         // Determine the scaling component of the matrix and factor it out. After
         // this operation, the matrix has x and y scale of one.
-        void removeScale(double *xScale, double *yScale);
+        void removeScale(double* xScale, double* yScale);
 
     private:
-        void setMatrix(QMatrix mat);
+        void setMatrix(const QMatrix&);
         QMatrix m_mat;
     };
 };