WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/svg/SVGAnimateMotionElement.cpp

 /*
     Copyright (C) 2007 Eric Seidel <eric@webkit.org>
               (C) 2007 Rob Buis <buis@kde.org>
     Copyright (C) 2008 Apple Inc. All Rights Reserved.
 
     This file is part of the WebKit 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
@@ skipping 132 matching lines @@
 }
     
 void SVGAnimateMotionElement::resetToBaseValue(const String&)
 {
     if (!hasValidTarget())
         return;
     SVGElement* target = targetElement();
     TransformationMatrix* transform = target->supplementalTransform();
     if (!transform)
         return;
-    transform->reset();
+    transform->makeIdentity();
 }
 
 bool SVGAnimateMotionElement::calculateFromAndToValues(const String& fromString, const String& toString)
 {
     parsePoint(fromString, m_fromPoint);
     parsePoint(toString, m_toPoint);
     return true;
 }
     
 bool SVGAnimateMotionElement::calculateFromAndByValues(const String& fromString, const String& byString)
 {
     parsePoint(fromString, m_fromPoint);
     FloatPoint byPoint;
     parsePoint(byString, byPoint);
     m_toPoint = FloatPoint(m_fromPoint.x() + byPoint.x(), m_fromPoint.y() + byPoint.y());
     return true;
 }
 
 void SVGAnimateMotionElement::calculateAnimatedValue(float percentage, unsigned, SVGSMILElement*)
 {
     SVGElement* target = targetElement();
     if (!target)
         return;
     TransformationMatrix* transform = target->supplementalTransform();
     if (!transform)
         return;
     
     if (!isAdditive())
-        transform->reset();
+        transform->makeIdentity();
     
     // FIXME: Implement accumulate.
     
     if (animationMode() == PathAnimation) {
         ASSERT(!animationPath().isEmpty());
         Path path = animationPath();
         float positionOnPath = path.length() * percentage;
         bool ok;
         FloatPoint position = path.pointAtLength(positionOnPath, ok);
         if (ok) {
@@ skipping 44 matching lines @@
     FloatSize diff = to - from;
     return sqrtf(diff.width() * diff.width() + diff.height() * diff.height());
 }
 
 }
 
 #endif // ENABLE(SVG)
 
 // vim:ts=4:noet