Chromium Code Reviews| Index: Source/core/animation/AnimationTimeline.h |
| diff --git a/Source/core/animation/AnimationTimeline.h b/Source/core/animation/AnimationTimeline.h |
| index 5e24cd2530a266e05944084241f51e71fd389e0c..e9444cc588416c3d33b1c6dbe61839bfd42d015e 100644 |
| --- a/Source/core/animation/AnimationTimeline.h |
| +++ b/Source/core/animation/AnimationTimeline.h |
| @@ -49,11 +49,10 @@ class Document; |
| class AnimationEffect; |
| // 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> { |
|
sof
2015/05/30 11:34:04
Unusual abstract interface, it also deriving from
|
| public: |
| // Calls AnimationTimeline's wake() method after duration seconds. |
| virtual void wakeAfter(double duration) = 0; |
| @@ -63,14 +62,14 @@ public: |
| DEFINE_INLINE_VIRTUAL_TRACE() { } |
| }; |
| - static PassRefPtrWillBeRawPtr<AnimationTimeline> create(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming> = nullptr); |
| + static AnimationTimeline* create(Document*, PlatformTiming* = nullptr); |
| ~AnimationTimeline(); |
| void serviceAnimations(TimingUpdateReason); |
| void scheduleNextService(); |
| Animation* play(AnimationEffect*); |
| - WillBeHeapVector<RefPtrWillBeMember<Animation>> getAnimations(); |
| + HeapVector<Member<Animation>> getAnimations(); |
| void animationAttached(Animation&); |
| #if !ENABLE(OILPAN) |
| @@ -110,7 +109,7 @@ public: |
| DECLARE_TRACE(); |
| protected: |
| - AnimationTimeline(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming>); |
| + AnimationTimeline(Document*, PlatformTiming*); |
| private: |
| RawPtrWillBeMember<Document> m_document; |
| @@ -118,15 +117,15 @@ private: |
| bool m_zeroTimeInitialized; |
| // Animations which will be updated on the next frame |
| // i.e. current, in effect, or had timing changed |
| - WillBeHeapHashSet<RefPtrWillBeMember<Animation>> m_animationsNeedingUpdate; |
| - WillBeHeapHashSet<RawPtrWillBeWeakMember<Animation>> m_animations; |
| + HeapHashSet<Member<Animation>> m_animationsNeedingUpdate; |
| + HeapHashSet<WeakMember<Animation>> m_animations; |
| double m_playbackRate; |
| 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 +148,7 @@ private: |
| DECLARE_VIRTUAL_TRACE(); |
| private: |
| - RawPtrWillBeMember<AnimationTimeline> m_timeline; |
| + Member<AnimationTimeline> m_timeline; |
| Timer<AnimationTimelineTiming> m_timer; |
| }; |