WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/svg/SVGTransform.cpp

Index: third_party/WebKit/WebCore/svg/SVGTransform.cpp
===================================================================
--- third_party/WebKit/WebCore/svg/SVGTransform.cpp	(revision 9391)
+++ third_party/WebKit/WebCore/svg/SVGTransform.cpp	(working copy)
@@ -96,7 +96,7 @@
     m_type = SVG_TRANSFORM_TRANSLATE;
     m_angle = 0;
 
-    m_matrix.reset();
+    m_matrix.makeIdentity();
     m_matrix.translate(tx, ty);
 }
 
@@ -111,8 +111,8 @@
     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
@@ -127,7 +127,7 @@
     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);
@@ -138,7 +138,7 @@
     m_type = SVG_TRANSFORM_SKEWX;
     m_angle = angle;
 
-    m_matrix.reset();
+    m_matrix.makeIdentity();
     m_matrix.skewX(angle);
 }
 
@@ -147,7 +147,7 @@
     m_type = SVG_TRANSFORM_SKEWY;
     m_angle = angle;
 
-    m_matrix.reset();
+    m_matrix.makeIdentity();
     m_matrix.skewY(angle);
 }