Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: trunk/Source/core/animation/css/CSSAnimations.cpp

Issue 199663007: Revert 169949 "Oilpan: Move CSSAnimations and CSSAnimationUpdate..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « trunk/Source/core/animation/css/CSSAnimations.h ('k') | trunk/Source/core/css/resolver/StyleResolverState.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698