Changeset 145455 in webkit

Timestamp:

Mar 11, 2013, 6:19:39 PM (14 years ago)

Author:

cevans@google.com

Message:

Merge 143859
BUG=177933
Review URL: ​https://codereview.chromium.org/12637021

Location:

branches/chromium/1410

Files:

• LayoutTests/svg/animations/animateTransform-list-crash-expected.txt (copied) (copied from trunk/LayoutTests/svg/animations/animateTransform-list-crash-expected.txt )
• LayoutTests/svg/animations/animateTransform-list-crash.html (copied) (copied from trunk/LayoutTests/svg/animations/animateTransform-list-crash.html )
• Source/WebCore/svg/SVGAnimatedTransformList.cpp (modified) (1 diff)

branches/chromium/1410/Source/WebCore/svg/SVGAnimatedTransformList.cpp

@@ -117 +117 @@
     unsigned fromTransformListSize = fromTransformList.size();
     const SVGTransform& toTransform = toTransformList[0];
-    SVGTransform effectiveFrom = fromTransformListSize ? fromTransformList[0] : SVGTransform(toTransform.type(), SVGTransform::ConstructZeroTransform);
+    const SVGTransform effectiveFrom = fromTransformListSize ? fromTransformList[0] : SVGTransform(toTransform.type(), SVGTransform::ConstructZeroTransform);
     SVGTransform currentTransform = SVGTransformDistance(effectiveFrom, toTransform).scaledDistance(percentage).addToSVGTransform(effectiveFrom);
-    if (m_animationElement->isAccumulated() && repeatCount)
-        animatedTransformList.append(SVGTransformDistance::addSVGTransforms(currentTransform, toAtEndOfDurationTransformList[0], repeatCount));
-    else
+    if (m_animationElement->isAccumulated() && repeatCount) {
+        const SVGTransform effectiveToAtEnd = toAtEndOfDurationTransformList.size() ? toAtEndOfDurationTransformList[0] : SVGTransform(toTransform.type(), SVGTransform::ConstructZeroTransform);
+        animatedTransformList.append(SVGTransformDistance::addSVGTransforms(currentTransform, effectiveToAtEnd, repeatCount));
+    } else
         animatedTransformList.append(currentTransform);
 }