| Index: third_party/WebKit/Source/core/html/track/CueTimeline.h
|
| diff --git a/third_party/WebKit/Source/core/html/track/CueTimeline.h b/third_party/WebKit/Source/core/html/track/CueTimeline.h
|
| index 9fd9c4133a0b42e9cbccdc18a603f6fd522f856a..512e7eb5d35046de99d2fcba4a0c2315f1c24618 100644
|
| --- a/third_party/WebKit/Source/core/html/track/CueTimeline.h
|
| +++ b/third_party/WebKit/Source/core/html/track/CueTimeline.h
|
| @@ -28,15 +28,14 @@ typedef Vector<CueInterval> CueList;
|
|
|
| // This class manages the timeline and rendering updates of cues associated
|
| // with TextTracks. Owned by a HTMLMediaElement.
|
| -class CueTimeline final : public NoBaseWillBeGarbageCollectedFinalized<CueTimeline> {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(CueTimeline);
|
| +class CueTimeline final : public GarbageCollectedFinalized<CueTimeline> {
|
| public:
|
| CueTimeline(HTMLMediaElement&);
|
|
|
| void addCues(TextTrack*, const TextTrackCueList*);
|
| - void addCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>);
|
| + void addCue(TextTrack*, RawPtr<TextTrackCue>);
|
| void removeCues(TextTrack*, const TextTrackCueList*);
|
| - void removeCue(TextTrack*, PassRefPtrWillBeRawPtr<TextTrackCue>);
|
| + void removeCue(TextTrack*, RawPtr<TextTrackCue>);
|
|
|
| void hideCues(TextTrack*, const TextTrackCueList*);
|
|
|
| @@ -53,10 +52,10 @@ public:
|
| private:
|
| HTMLMediaElement& mediaElement() const { return *m_mediaElement; }
|
|
|
| - void addCueInternal(PassRefPtrWillBeRawPtr<TextTrackCue>);
|
| - void removeCueInternal(PassRefPtrWillBeRawPtr<TextTrackCue>);
|
| + void addCueInternal(RawPtr<TextTrackCue>);
|
| + void removeCueInternal(RawPtr<TextTrackCue>);
|
|
|
| - RawPtrWillBeMember<HTMLMediaElement> m_mediaElement;
|
| + Member<HTMLMediaElement> m_mediaElement;
|
|
|
| CueIntervalTree m_cueTree;
|
|
|
| @@ -81,7 +80,7 @@ public:
|
| }
|
|
|
| private:
|
| - RawPtrWillBeMember<CueTimeline> m_cueTimeline;
|
| + Member<CueTimeline> m_cueTimeline;
|
| };
|
|
|
| #ifndef NDEBUG
|
|
|