Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: Source/core/html/track/LoadableTextTrack.h

Issue 244493002: Oilpan: add transition types to track interface objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add crbug.com/365260 crashing test + expectation Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/track/InbandTextTrack.cpp ('k') | Source/core/html/track/LoadableTextTrack.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c99f4f1b3c65a5295cf70b018ddc69e16a5b2ed7 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;
@@ -65,9 +70,11 @@ private:
void loadTimerFired(Timer<LoadableTextTrack>*);
- HTMLTrackElement* m_trackElement;
+ // FIXME: Oilpan: This should be a strong pointer once Member pointers
+ // into the Node hierarchy can be used.
+ RawPtrWillBeWeakMember<HTMLTrackElement> m_trackElement;
Timer<LoadableTextTrack> m_loadTimer;
- OwnPtr<TextTrackLoader> m_loader;
+ OwnPtrWillBeMember<TextTrackLoader> m_loader;
KURL m_url;
bool m_isDefault;
};
« no previous file with comments | « Source/core/html/track/InbandTextTrack.cpp ('k') | Source/core/html/track/LoadableTextTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698