Index: Source/core/animation/AnimationTimeline.cpp |
diff --git a/Source/core/animation/AnimationTimeline.cpp b/Source/core/animation/AnimationTimeline.cpp |
index 82af9a72ebc204cedf0ef3100ce996c89446b864..f2271e5823f0e6ae7411da4a782529572524c9a4 100644 |
--- a/Source/core/animation/AnimationTimeline.cpp |
+++ b/Source/core/animation/AnimationTimeline.cpp |
@@ -59,12 +59,12 @@ bool compareAnimations(const RefPtrWillBeMember<Animation>& left, const RefPtrWi |
const double AnimationTimeline::s_minimumDelay = 0.04; |
-PassRefPtrWillBeRawPtr<AnimationTimeline> AnimationTimeline::create(Document* document, PassOwnPtrWillBeRawPtr<PlatformTiming> timing) |
+AnimationTimeline* AnimationTimeline::create(Document* document, PlatformTiming* timing) |
{ |
- return adoptRefWillBeNoop(new AnimationTimeline(document, timing)); |
+ return new AnimationTimeline(document, timing); |
} |
-AnimationTimeline::AnimationTimeline(Document* document, PassOwnPtrWillBeRawPtr<PlatformTiming> timing) |
+AnimationTimeline::AnimationTimeline(Document* document, PlatformTiming* timing) |
: m_document(document) |
, m_zeroTime(0) // 0 is used by unit tests which cannot initialize from the loader |
, m_zeroTimeInitialized(false) |
@@ -72,7 +72,7 @@ AnimationTimeline::AnimationTimeline(Document* document, PassOwnPtrWillBeRawPtr< |
, m_lastCurrentTimeInternal(0) |
{ |
if (!timing) |
- m_timing = adoptPtrWillBeNoop(new AnimationTimelineTiming(this)); |
+ m_timing = new AnimationTimelineTiming(this); |
else |
m_timing = timing; |
@@ -317,9 +317,9 @@ void AnimationTimeline::detachFromDocument() |
DEFINE_TRACE(AnimationTimeline) |
{ |
+ visitor->trace(m_timing); |
#if ENABLE(OILPAN) |
visitor->trace(m_document); |
- visitor->trace(m_timing); |
visitor->trace(m_animationsNeedingUpdate); |
visitor->trace(m_animations); |
#endif |