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..88719b6b1492ab6eb88f91c4d0efbbc08e9cbf11 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(); |
@@ -50,11 +51,15 @@ public: |
size_t trackElementIndex(); |
HTMLTrackElement* trackElement() { return m_trackElement; } |
+#if !ENABLE(OILPAN) |
void clearTrackElement(); |
+#endif |
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 +72,7 @@ private: |
HTMLTrackElement* m_trackElement; |
haraken
2014/04/23 01:51:45
Can't this become a RawPtrWillBeWeakMember? (Proba
Mads Ager (chromium)
2014/04/23 05:59:38
This is slightly annoying. We have to use RefPtrs
Mads Ager (chromium)
2014/04/23 06:10:11
We should probably make this a WeakMember for now.
sof
2014/04/23 07:36:48
Did that just that & adopted haraken's RawPtrWillB
|
Timer<LoadableTextTrack> m_loadTimer; |
- OwnPtr<TextTrackLoader> m_loader; |
+ OwnPtrWillBeMember<TextTrackLoader> m_loader; |
KURL m_url; |
bool m_isDefault; |
}; |