Index: Source/core/animation/css/CSSAnimations.cpp |
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp |
index a3aca2165a34afc61ed30190ad3326e62f5c4bba..48f3121c230a3827095bf91f6adbbe0b5d05f284 100644 |
--- a/Source/core/animation/css/CSSAnimations.cpp |
+++ b/Source/core/animation/css/CSSAnimations.cpp |
@@ -320,9 +320,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); |
@@ -412,7 +412,7 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element) |
return; |
} |
- OwnPtr<CSSAnimationUpdate> update = m_pendingUpdate.release(); |
+ OwnPtrWillBeRawPtr<CSSAnimationUpdate> update = m_pendingUpdate.release(); |
m_previousActiveInterpolationsForAnimations.swap(update->activeInterpolationsForAnimations()); |
@@ -896,4 +896,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 |