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

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

Issue 427673004: Oilpan: Move AnimationNode::EventDelegate to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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
« no previous file with comments | « Source/core/animation/css/CSSAnimations.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/css/CSSAnimations.cpp
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp
index d61e2ead83872b80edeb5887497b3dce4c2ab628..9ca8f54a893e7b92fa5ee6970c35128a69ac9430 100644
--- a/Source/core/animation/css/CSSAnimations.cpp
+++ b/Source/core/animation/css/CSSAnimations.cpp
@@ -325,7 +325,7 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element)
for (WillBeHeapVector<CSSAnimationUpdate::NewAnimation>::const_iterator iter = update->newAnimations().begin(); iter != update->newAnimations().end(); ++iter) {
const InertAnimation* inertAnimation = iter->animation.get();
- OwnPtr<AnimationEventDelegate> eventDelegate = adoptPtr(new AnimationEventDelegate(element, iter->name));
+ OwnPtrWillBeRawPtr<AnimationEventDelegate> eventDelegate = adoptPtrWillBeNoop(new AnimationEventDelegate(element, iter->name));
RefPtrWillBeRawPtr<Animation> animation = Animation::create(element, inertAnimation->effect(), inertAnimation->specifiedTiming(), Animation::DefaultPriority, eventDelegate.release());
RefPtrWillBeRawPtr<AnimationPlayer> player = element->document().timeline().createAnimationPlayer(animation.get());
element->document().compositorPendingAnimations().add(player.get());
@@ -362,7 +362,7 @@ void CSSAnimations::maybeApplyPendingUpdate(Element* element)
CSSPropertyID id = newTransition.id;
InertAnimation* inertAnimation = newTransition.animation.get();
- OwnPtr<TransitionEventDelegate> eventDelegate = adoptPtr(new TransitionEventDelegate(element, newTransition.eventId));
+ OwnPtrWillBeRawPtr<TransitionEventDelegate> eventDelegate = adoptPtrWillBeNoop(new TransitionEventDelegate(element, newTransition.eventId));
RefPtrWillBeRawPtr<AnimationEffect> effect = inertAnimation->effect();
@@ -629,6 +629,12 @@ void CSSAnimations::AnimationEventDelegate::onEventCondition(const AnimationNode
m_previousIteration = currentIteration;
}
+void CSSAnimations::AnimationEventDelegate::trace(Visitor* visitor)
+{
+ visitor->trace(m_target);
+ AnimationNode::EventDelegate::trace(visitor);
+}
+
void CSSAnimations::TransitionEventDelegate::onEventCondition(const AnimationNode* animationNode)
{
const AnimationNode::Phase currentPhase = animationNode->phase();
@@ -646,6 +652,12 @@ void CSSAnimations::TransitionEventDelegate::onEventCondition(const AnimationNod
m_previousPhase = currentPhase;
}
+void CSSAnimations::TransitionEventDelegate::trace(Visitor* visitor)
+{
+ visitor->trace(m_target);
+ AnimationNode::EventDelegate::trace(visitor);
+}
+
bool CSSAnimations::isAnimatableProperty(CSSPropertyID property)
{
switch (property) {
« no previous file with comments | « Source/core/animation/css/CSSAnimations.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698