Title: [128938] branches/safari-536.27-branch/Source/WebCore
Diff
Modified: branches/safari-536.27-branch/Source/WebCore/ChangeLog (128937 => 128938)
--- branches/safari-536.27-branch/Source/WebCore/ChangeLog 2012-09-18 22:26:41 UTC (rev 128937)
+++ branches/safari-536.27-branch/Source/WebCore/ChangeLog 2012-09-18 22:26:59 UTC (rev 128938)
@@ -1,5 +1,23 @@
2012-09-18 Lucas Forschler <[email protected]>
+ Merge r128845.
+
+ 2012-09-17 Roger Fong <[email protected]>
+
+ [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-18 Lucas Forschler <[email protected]>
+
Merge r126666.
2012-08-24 Roger Fong <[email protected]>
@@ -205323,3 +205341,4 @@
.
.
.
+.
Modified: branches/safari-536.27-branch/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp (128937 => 128938)
--- branches/safari-536.27-branch/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2012-09-18 22:26:41 UTC (rev 128937)
+++ branches/safari-536.27-branch/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2012-09-18 22:26:59 UTC (rev 128938)
@@ -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
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
