Title: [128845] trunk/Source/WebCore
- Revision
- 128845
- Author
- roger_f...@apple.com
- Date
- 2012-09-17 20:19:43 -0700 (Mon, 17 Sep 2012)
Log Message
[Win] Null check timing function received from CoreAnimation when calling CACFAnimationGetTimingFunction.
https://bugs.webkit.org/show_bug.cgi?id=96972
Timothy Horton
When paused, some CSS animations cause CoreAnimation to pass back a null timing function when calling CACFAnimationGetTimingFunction.
This patch fixes this simply by ensuring that if the output of this method is null, it does not get passed into CACFAnimationSetTimingFunction via the PlatformCAAnimation::copyTimingFunctionFrom method.
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimation::copyTimingFunctionFrom):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128844 => 128845)
--- trunk/Source/WebCore/ChangeLog 2012-09-18 03:04:10 UTC (rev 128844)
+++ trunk/Source/WebCore/ChangeLog 2012-09-18 03:19:43 UTC (rev 128845)
@@ -1,3 +1,17 @@
+2012-09-17 Roger Fong <roger_f...@apple.com>
+
+ [Win] Null check timing function received from CoreAnimation when calling CACFAnimationGetTimingFunction.
+ https://bugs.webkit.org/show_bug.cgi?id=96972
+
+ Timothy Horton
+
+ When paused, some CSS animations cause CoreAnimation to pass back a null timing function when calling CACFAnimationGetTimingFunction.
+ This patch fixes this simply by ensuring that if the output of this method is null, it does not get passed into CACFAnimationSetTimingFunction
+ via the PlatformCAAnimation::copyTimingFunctionFrom method.
+
+ * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+ (PlatformCAAnimation::copyTimingFunctionFrom):
+
2012-09-17 David Barton <dbar...@mathscribe.com>
Convert MathML to use flexboxes
Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp (128844 => 128845)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2012-09-18 03:04:10 UTC (rev 128844)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2012-09-18 03:19:43 UTC (rev 128845)
@@ -296,7 +296,9 @@
void PlatformCAAnimation::copyTimingFunctionFrom(const PlatformCAAnimation* value)
{
- CACFAnimationSetTimingFunction(m_animation.get(), CACFAnimationGetTimingFunction(value->m_animation.get()));
+ CACFTimingFunctionRef timingFunc = CACFAnimationGetTimingFunction(value->m_animation.get());
+ if (timingFunc)
+ CACFAnimationSetTimingFunction(m_animation.get(), timingFunc);
}
bool PlatformCAAnimation::isRemovedOnCompletion() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
