| Index: Source/core/animation/css/CSSAnimations.cpp
|
| diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
|
| index d90ebc6d18fce6ff34f4f412a0329d600c281a99..727ece9e6a5c37c1d4508ebf00036e8c300eb6c8 100644
|
| --- a/Source/core/animation/css/CSSAnimations.cpp
|
| +++ b/Source/core/animation/css/CSSAnimations.cpp
|
| @@ -319,9 +319,9 @@ const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver*
|
| return 0;
|
| }
|
|
|
| -PassOwnPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(Element* element, const Element& parentElement, const RenderStyle& style, RenderStyle* parentStyle, StyleResolver* resolver)
|
| +PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(Element* element, const Element& parentElement, const RenderStyle& style, RenderStyle* parentStyle, StyleResolver* resolver)
|
| {
|
| - OwnPtr<CSSAnimationUpdate> update = adoptPtr(new CSSAnimationUpdate());
|
| + OwnPtrWillBeRawPtr<CSSAnimationUpdate> update = adoptPtrWillBeNoop(new CSSAnimationUpdate());
|
| calculateAnimationUpdate(update.get(), element, parentElement, style, parentStyle, resolver);
|
| calculateAnimationActiveInterpolations(update.get(), element);
|
| calculateTransitionUpdate(update.get(), element, style);
|
| @@ -411,7 +411,7 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element)
|
| return;
|
| }
|
|
|
| - OwnPtr<CSSAnimationUpdate> update = m_pendingUpdate.release();
|
| + OwnPtrWillBeRawPtr<CSSAnimationUpdate> update = m_pendingUpdate.release();
|
|
|
| m_previousActiveInterpolationsForAnimations.swap(update->activeInterpolationsForAnimations());
|
|
|
| @@ -895,4 +895,18 @@ const StylePropertyShorthand& CSSAnimations::animatableProperties()
|
| return propertyShorthand;
|
| }
|
|
|
| +void CSSAnimations::trace(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_transitions);
|
| + visitor->trace(m_pendingUpdate);
|
| + visitor->trace(m_previousActiveInterpolationsForAnimations);
|
| +}
|
| +
|
| +void CSSAnimationUpdate::trace(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_newTransitions);
|
| + visitor->trace(m_activeInterpolationsForAnimations);
|
| + visitor->trace(m_activeInterpolationsForTransitions);
|
| +}
|
| +
|
| } // namespace WebCore
|
|
|