| Index: Source/core/animation/AnimationTimeline.h
|
| diff --git a/Source/core/animation/AnimationTimeline.h b/Source/core/animation/AnimationTimeline.h
|
| index cbf51d271fb09ad5ecea7c64063b98e818aa0d80..3d576ededd2bc33255779ff09c352ea3809c33c6 100644
|
| --- a/Source/core/animation/AnimationTimeline.h
|
| +++ b/Source/core/animation/AnimationTimeline.h
|
| @@ -49,10 +49,10 @@ class Document;
|
| class AnimationNode;
|
|
|
| // AnimationTimeline is constructed and owned by Document, and tied to its lifecycle.
|
| -class CORE_EXPORT AnimationTimeline : public RefCountedWillBeGarbageCollectedFinalized<AnimationTimeline>, public ScriptWrappable {
|
| +class CORE_EXPORT AnimationTimeline : public GarbageCollectedFinalized<AnimationTimeline>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - class PlatformTiming : public NoBaseWillBeGarbageCollectedFinalized<PlatformTiming> {
|
| + class PlatformTiming : public GarbageCollectedFinalized<PlatformTiming> {
|
|
|
| public:
|
| // Calls AnimationTimeline's wake() method after duration seconds.
|
| @@ -63,7 +63,7 @@ public:
|
| DEFINE_INLINE_VIRTUAL_TRACE() { }
|
| };
|
|
|
| - static PassRefPtrWillBeRawPtr<AnimationTimeline> create(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming> = nullptr);
|
| + static AnimationTimeline* create(Document*, PlatformTiming* = nullptr);
|
| ~AnimationTimeline();
|
|
|
| void serviceAnimations(TimingUpdateReason);
|
| @@ -73,13 +73,6 @@ public:
|
| WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer>> getAnimationPlayers();
|
|
|
| void playerAttached(AnimationPlayer&);
|
| -#if !ENABLE(OILPAN)
|
| - void playerDestroyed(AnimationPlayer* player)
|
| - {
|
| - ASSERT(m_players.contains(player));
|
| - m_players.remove(player);
|
| - }
|
| -#endif
|
|
|
| bool hasPendingUpdates() const { return !m_playersNeedingUpdate.isEmpty(); }
|
| double zeroTime();
|
| @@ -102,15 +95,12 @@ public:
|
| WebCompositorAnimationTimeline* compositorTimeline() const { return m_compositorTimeline.get(); }
|
|
|
| Document* document() { return m_document.get(); }
|
| -#if !ENABLE(OILPAN)
|
| - void detachFromDocument();
|
| -#endif
|
| void wake();
|
|
|
| DECLARE_TRACE();
|
|
|
| protected:
|
| - AnimationTimeline(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming>);
|
| + AnimationTimeline(Document*, PlatformTiming*);
|
|
|
| private:
|
| RawPtrWillBeMember<Document> m_document;
|
| @@ -126,7 +116,7 @@ private:
|
| friend class SMILTimeContainer;
|
| static const double s_minimumDelay;
|
|
|
| - OwnPtrWillBeMember<PlatformTiming> m_timing;
|
| + Member<PlatformTiming> m_timing;
|
| double m_lastCurrentTimeInternal;
|
|
|
| OwnPtr<WebCompositorAnimationTimeline> m_compositorTimeline;
|
| @@ -149,7 +139,7 @@ private:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - RawPtrWillBeMember<AnimationTimeline> m_timeline;
|
| + Member<AnimationTimeline> m_timeline;
|
| Timer<AnimationTimelineTiming> m_timer;
|
| };
|
|
|
|
|