Oilpan: add transition types to track interface objects.

Source/core/html/track/TextTrackList.cpp

Index: Source/core/html/track/TextTrackList.cpp
diff --git a/Source/core/html/track/TextTrackList.cpp b/Source/core/html/track/TextTrackList.cpp
index 348d4abcb79586c940ff92d0e3427342c149845a..0cea9aaf3cc771ef6329326061c44a22df65b004 100644
--- a/Source/core/html/track/TextTrackList.cpp
+++ b/Source/core/html/track/TextTrackList.cpp
@@ -45,13 +45,7 @@ TextTrackList::TextTrackList(HTMLMediaElement* owner)
 
 TextTrackList::~TextTrackList()
 {
-    ASSERT(!m_owner);
-
     m_asyncEventQueue->close();
-
-    for (unsigned i = 0; i < length(); ++i) {

[Mads Ager (chromium), 2014/04/22 13:07:15]

#if !ENABLE(OILPAN)

[sof, 2014/04/22 14:02:48]

It isn't needed here either in the non-Oilpan case, unless I've overlooked some
dependency.

[Hmm, how hard to try to avoid using "#if ENABLE(OILPAN)"?]

[Mads Ager (chromium), 2014/04/22 14:17:59]

When it comes to clearing of pointers, please do not try too hard to avoid #if
!ENABLE(OILPAN). Getting this wrong is a serious security issue and we need to
be very careful.

-        item(i)->setTrackList(0);
-    }
 }
 
 unsigned TextTrackList::length() const
@@ -153,7 +147,7 @@ TextTrack* TextTrackList::getTrackById(const AtomicString& id)
 
 void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
 {
-    Vector<RefPtr<TextTrack> >* tracks = 0;
+    WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
 
     if (track->trackType() == TextTrack::TrackElement) {
         tracks = &m_elementTracks;
@@ -178,9 +172,9 @@ void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
         tracks->at(index)->invalidateTrackIndex();
 }
 
-void TextTrackList::append(PassRefPtr<TextTrack> prpTrack)
+void TextTrackList::append(PassRefPtrWillBeRawPtr<TextTrack> prpTrack)
 {
-    RefPtr<TextTrack> track = prpTrack;
+    RefPtrWillBeRawPtr<TextTrack> track = prpTrack;
 
     if (track->trackType() == TextTrack::AddTrack)
         m_addTrackTracks.append(track);
@@ -205,7 +199,7 @@ void TextTrackList::append(PassRefPtr<TextTrack> prpTrack)
 
 void TextTrackList::remove(TextTrack* track)
 {
-    Vector<RefPtr<TextTrack> >* tracks = 0;
+    WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
 
     if (track->trackType() == TextTrack::TrackElement) {
         tracks = &m_elementTracks;
@@ -241,7 +235,7 @@ void TextTrackList::removeAllInbandTracks()
 
 bool TextTrackList::contains(TextTrack* track) const
 {
-    const Vector<RefPtr<TextTrack> >* tracks = 0;
+    const WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
 
     if (track->trackType() == TextTrack::TrackElement)
         tracks = &m_elementTracks;
@@ -266,12 +260,7 @@ ExecutionContext* TextTrackList::executionContext() const
     return m_owner->executionContext();
 }
 
-void TextTrackList::clearOwner()
-{
-    m_owner = 0;
-}
-
-void TextTrackList::scheduleTrackEvent(const AtomicString& eventName, PassRefPtr<TextTrack> track)
+void TextTrackList::scheduleTrackEvent(const AtomicString& eventName, PassRefPtrWillBeRawPtr<TextTrack> track)
 {
     TrackEventInit initializer;
     initializer.track = track;
@@ -281,7 +270,7 @@ void TextTrackList::scheduleTrackEvent(const AtomicString& eventName, PassRefPtr
     m_asyncEventQueue->enqueueEvent(TrackEvent::create(eventName, initializer));
 }
 
-void TextTrackList::scheduleAddTrackEvent(PassRefPtr<TextTrack> track)
+void TextTrackList::scheduleAddTrackEvent(PassRefPtrWillBeRawPtr<TextTrack> track)
 {
     // 4.8.10.12.3 Sourcing out-of-band text tracks
     // 4.8.10.12.4 Text track API
@@ -309,7 +298,7 @@ void TextTrackList::scheduleChangeEvent()
     m_asyncEventQueue->enqueueEvent(Event::create(EventTypeNames::change, initializer));
 }
 
-void TextTrackList::scheduleRemoveTrackEvent(PassRefPtr<TextTrack> track)
+void TextTrackList::scheduleRemoveTrackEvent(PassRefPtrWillBeRawPtr<TextTrack> track)
 {
     // 4.8.10.12.3 Sourcing out-of-band text tracks
     // When a track element's parent element changes and the old parent was a
@@ -327,3 +316,11 @@ HTMLMediaElement* TextTrackList::owner() const
 {
     return m_owner;
 }
+
+void TextTrackList::trace(Visitor* visitor)
+{
+    visitor->trace(m_owner);
+    visitor->trace(m_addTrackTracks);
+    visitor->trace(m_elementTracks);
+    visitor->trace(m_inbandTracks);
+}