WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/svg/SVGTransform.cpp

 /*
     Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>
                   2004, 2005 Rob Buis <buis@kde.org>
 
     This file is part of the KDE project
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 78 matching lines @@
     m_angle = 0;
 
     m_matrix = matrix;
 }
 
 void SVGTransform::setTranslate(float tx, float ty)
 {
     m_type = SVG_TRANSFORM_TRANSLATE;
     m_angle = 0;
 
-    m_matrix.reset();
+    m_matrix.makeIdentity();
     m_matrix.translate(tx, ty);
 }
 
 FloatPoint SVGTransform::translate() const
 {
     return FloatPoint::narrowPrecision(m_matrix.e(), m_matrix.f());
 }
 
 void SVGTransform::setScale(float sx, float sy)
 {
     m_type = SVG_TRANSFORM_SCALE;
     m_angle = 0;
     m_center = FloatPoint();
 
-    m_matrix.reset();
-    m_matrix.scale(sx, sy);
+    m_matrix.makeIdentity();
+    m_matrix.scaleNonUniform(sx, sy);
 }
 
 FloatSize SVGTransform::scale() const
 {
     return FloatSize::narrowPrecision(m_matrix.a(), m_matrix.d());
 }
 
 void SVGTransform::setRotate(float angle, float cx, float cy)
 {
     m_type = SVG_TRANSFORM_ROTATE;
     m_angle = angle;
     m_center = FloatPoint(cx, cy);
 
     // TODO: toString() implementation, which can show cx, cy (need to be stored?)
-    m_matrix.reset();
+    m_matrix.makeIdentity();
     m_matrix.translate(cx, cy);
     m_matrix.rotate(angle);
     m_matrix.translate(-cx, -cy);
 }
 
 void SVGTransform::setSkewX(float angle)
 {
     m_type = SVG_TRANSFORM_SKEWX;
     m_angle = angle;
 
-    m_matrix.reset();
+    m_matrix.makeIdentity();
     m_matrix.skewX(angle);
 }
 
 void SVGTransform::setSkewY(float angle)
 {
     m_type = SVG_TRANSFORM_SKEWY;
     m_angle = angle;
 
-    m_matrix.reset();
+    m_matrix.makeIdentity();
     m_matrix.skewY(angle);
 }
 
 // vim:ts=4:noet
 #endif // ENABLE(SVG)