Chromium Code Reviews| Index: Source/core/html/track/LoadableTextTrack.h |
| diff --git a/Source/core/html/track/LoadableTextTrack.h b/Source/core/html/track/LoadableTextTrack.h |
| index 944722019f6c84bd96971a815127bfbc579fc8b7..ac34d32ce67cafb56a47465db144b42c250c882b 100644 |
| --- a/Source/core/html/track/LoadableTextTrack.h |
| +++ b/Source/core/html/track/LoadableTextTrack.h |
| @@ -28,6 +28,7 @@ |
| #include "core/html/track/TextTrack.h" |
| #include "core/loader/TextTrackLoader.h" |
| +#include "platform/heap/Handle.h" |
| #include "wtf/PassRefPtr.h" |
| namespace WebCore { |
| @@ -37,9 +38,9 @@ class LoadableTextTrack; |
| class LoadableTextTrack FINAL : public TextTrack, private TextTrackLoaderClient { |
| public: |
| - static PassRefPtr<LoadableTextTrack> create(HTMLTrackElement* track) |
| + static PassRefPtrWillBeRawPtr<LoadableTextTrack> create(HTMLTrackElement* track) |
| { |
| - return adoptRef(new LoadableTextTrack(track)); |
| + return adoptRefWillBeRefCountedGarbageCollected(new LoadableTextTrack(track)); |
| } |
| virtual ~LoadableTextTrack(); |
| @@ -55,6 +56,8 @@ public: |
| virtual bool isDefault() const OVERRIDE { return m_isDefault; } |
| virtual void setIsDefault(bool isDefault) OVERRIDE { m_isDefault = isDefault; } |
| + virtual void trace(Visitor*) OVERRIDE; |
| + |
| private: |
| // TextTrackLoaderClient |
| virtual void newCuesAvailable(TextTrackLoader*) OVERRIDE; |
| @@ -67,7 +70,7 @@ private: |
| HTMLTrackElement* m_trackElement; |
|
haraken
2014/04/22 02:37:47
This raw pointer looks safe because it's cleared i
|
| Timer<LoadableTextTrack> m_loadTimer; |
| - OwnPtr<TextTrackLoader> m_loader; |
| + OwnPtrWillBeMember<TextTrackLoader> m_loader; |
| KURL m_url; |
| bool m_isDefault; |
| }; |