Title: [199606] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 199606
- Author
- [email protected]
- Date
- 2016-04-15 12:55:27 -0700 (Fri, 15 Apr 2016)
Log Message
Merged r199598. rdar://problem/25641321
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (199605 => 199606)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-04-15 19:49:58 UTC (rev 199605)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-04-15 19:55:27 UTC (rev 199606)
@@ -1,3 +1,20 @@
+2016-04-15 Babak Shafiei <[email protected]>
+
+ Merge r199598.
+
+ 2016-04-15 Said Abou-Hallawa <[email protected]>
+
+ Calling SVGAnimatedPropertyTearOff::animationEnded() will crash if the SVG property is not animating
+ https://bugs.webkit.org/show_bug.cgi?id=156549
+
+ Reviewed by Darin Adler.
+
+ A speculative fix for a crash which may happen when calling animationEnded()
+ of any SVGAnimatedProperty while it is not animating.
+
+ * svg/SVGAnimatedTypeAnimator.h:
+ (WebCore::SVGAnimatedTypeAnimator::executeAction):
+
2016-04-08 Babak Shafiei <[email protected]>
Merge r199253.
Modified: branches/safari-601.1.46-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h (199605 => 199606)
--- branches/safari-601.1.46-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2016-04-15 19:49:58 UTC (rev 199605)
+++ branches/safari-601.1.46-branch/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2016-04-15 19:55:27 UTC (rev 199606)
@@ -203,7 +203,8 @@
break;
case StopAnimationAction:
ASSERT(!type);
- property->animationEnded();
+ if (property->isAnimating())
+ property->animationEnded();
break;
case AnimValWillChangeAction:
ASSERT(!type);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
