Index: trunk/Source/core/animation/css/CSSAnimations.cpp |
=================================================================== |
--- trunk/Source/core/animation/css/CSSAnimations.cpp (revision 170003) |
+++ trunk/Source/core/animation/css/CSSAnimations.cpp (working copy) |
@@ -319,9 +319,9 @@ |
return 0; |
} |
-PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(Element* element, const Element& parentElement, const RenderStyle& style, RenderStyle* parentStyle, StyleResolver* resolver) |
+PassOwnPtr<CSSAnimationUpdate> CSSAnimations::calculateUpdate(Element* element, const Element& parentElement, const RenderStyle& style, RenderStyle* parentStyle, StyleResolver* resolver) |
{ |
- OwnPtrWillBeRawPtr<CSSAnimationUpdate> update = adoptPtrWillBeNoop(new CSSAnimationUpdate()); |
+ OwnPtr<CSSAnimationUpdate> update = adoptPtr(new CSSAnimationUpdate()); |
calculateAnimationUpdate(update.get(), element, parentElement, style, parentStyle, resolver); |
calculateAnimationActiveInterpolations(update.get(), element); |
calculateTransitionUpdate(update.get(), element, style); |
@@ -411,7 +411,7 @@ |
return; |
} |
- OwnPtrWillBeRawPtr<CSSAnimationUpdate> update = m_pendingUpdate.release(); |
+ OwnPtr<CSSAnimationUpdate> update = m_pendingUpdate.release(); |
m_previousActiveInterpolationsForAnimations.swap(update->activeInterpolationsForAnimations()); |
@@ -895,18 +895,4 @@ |
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 |