Chromium Code Reviews| Index: Source/core/animation/AnimationTimeline.cpp |
| diff --git a/Source/core/animation/AnimationTimeline.cpp b/Source/core/animation/AnimationTimeline.cpp |
| index 657ab55053dfb11ac5005d78cf0c32fa6a75494e..9ba0d68e2937a9700ceed90ef73ed6384f6650c7 100644 |
| --- a/Source/core/animation/AnimationTimeline.cpp |
| +++ b/Source/core/animation/AnimationTimeline.cpp |
| @@ -59,12 +59,12 @@ bool compareAnimationPlayers(const RefPtrWillBeMember<AnimationPlayer>& left, co |
| 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; |
| @@ -84,10 +84,6 @@ AnimationTimeline::AnimationTimeline(Document* document, PassOwnPtrWillBeRawPtr< |
| AnimationTimeline::~AnimationTimeline() |
| { |
| -#if !ENABLE(OILPAN) |
| - for (const auto& player : m_players) |
| - player->detachFromTimeline(); |
| -#endif |
| } |
| void AnimationTimeline::playerAttached(AnimationPlayer& player) |
| @@ -307,19 +303,11 @@ double AnimationTimeline::playbackRate() const |
| return m_playbackRate; |
| } |
| -#if !ENABLE(OILPAN) |
| -void AnimationTimeline::detachFromDocument() |
|
haraken
2015/05/08 00:13:06
Since Document is not yet moved to oilpan by defau
peria
2015/05/08 02:21:20
Acknowledged.
|
| -{ |
| - // FIXME: AnimationTimeline should keep Document alive. |
| - m_document = nullptr; |
| -} |
| -#endif |
| - |
| DEFINE_TRACE(AnimationTimeline) |
| { |
| + visitor->trace(m_timing); |
| #if ENABLE(OILPAN) |
| visitor->trace(m_document); |
| - visitor->trace(m_timing); |
| visitor->trace(m_playersNeedingUpdate); |
| visitor->trace(m_players); |
| #endif |