Title: [200006] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 200006
- Author
- [email protected]
- Date
- 2016-04-25 06:30:59 -0700 (Mon, 25 Apr 2016)
Log Message
Merge r199598 - Calling SVGAnimatedPropertyTearOff::animationEnded() will crash if the SVG property is not animating
https://bugs.webkit.org/show_bug.cgi?id=156549
Patch by Said Abou-Hallawa <[email protected]> on 2016-04-15
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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200005 => 200006)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 13:27:22 UTC (rev 200005)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 13:30:59 UTC (rev 200006)
@@ -1,3 +1,16 @@
+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-15 Carlos Garcia Campos <[email protected]>
Selection.deleteFromDocument should not leave a selection character
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGAnimatedTypeAnimator.h (200005 => 200006)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2016-04-25 13:27:22 UTC (rev 200005)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/svg/SVGAnimatedTypeAnimator.h 2016-04-25 13:30:59 UTC (rev 200006)
@@ -201,7 +201,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
