Oilpan: add transition types to track interface objects.

Source/core/html/track/LoadableTextTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 28 matching lines @@
 LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track)
     : TextTrack(track->document(), emptyAtom, emptyAtom, emptyAtom, emptyAtom, TrackElement)
     , m_trackElement(track)
     , m_loadTimer(this, &LoadableTextTrack::loadTimerFired)
     , m_isDefault(false)
 {
 }
 
 LoadableTextTrack::~LoadableTextTrack()
 {
-    ASSERT(!m_trackElement);
-}
-
-void LoadableTextTrack::clearTrackElement()

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

Probably still needed for non-oilpan?

-{
-    m_trackElement = 0;
 }
 
 void LoadableTextTrack::setMode(const AtomicString& mode)
 {
     TextTrack::setMode(mode);
     if (!m_trackElement)
         return;
 
     if (m_trackElement->readyState() == HTMLTrackElement::NONE)
         m_trackElement->scheduleLoad();
@@ skipping 39 matching lines @@
     // origin of the media element's Document, and the default origin behaviour set to fail.
     m_loader = TextTrackLoader::create(*this, m_trackElement->document());
     if (!m_loader->load(m_url, m_trackElement->mediaElementCrossOriginAttribute()))
         m_trackElement->didCompleteLoad(HTMLTrackElement::Failure);
 }
 
 void LoadableTextTrack::newCuesAvailable(TextTrackLoader* loader)
 {
     ASSERT_UNUSED(loader, m_loader == loader);
 
-    Vector<RefPtr<VTTCue> > newCues;
+    WillBeHeapVector<RefPtrWillBeMember<VTTCue> > newCues;
     m_loader->getNewCues(newCues);
 
     if (!m_cues)
         m_cues = TextTrackCueList::create();
 
     for (size_t i = 0; i < newCues.size(); ++i) {
         newCues[i]->setTrack(this);
-        m_cues->add(newCues[i]);
+        m_cues->add(newCues[i].release());
     }
 
     if (mediaElement())
         mediaElement()->textTrackAddCues(this, m_cues.get());
 }
 
 void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool loadingFailed)
 {
     ASSERT_UNUSED(loader, m_loader == loader);
 
     if (!m_trackElement)
         return;
 
     m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
 }
 
 void LoadableTextTrack::newRegionsAvailable(TextTrackLoader* loader)
 {
     ASSERT_UNUSED(loader, m_loader == loader);
 
-    Vector<RefPtr<VTTRegion> > newRegions;
+    WillBeHeapVector<RefPtrWillBeMember<VTTRegion> > newRegions;
     m_loader->getNewRegions(newRegions);
 
     for (size_t i = 0; i < newRegions.size(); ++i) {
         newRegions[i]->setTrack(this);
         regions()->add(newRegions[i]);
     }
 }
 
 size_t LoadableTextTrack::trackElementIndex()
 {
     ASSERT(m_trackElement);
     ASSERT(m_trackElement->parentNode());
 
     size_t index = 0;
     for (HTMLTrackElement* track = Traversal<HTMLTrackElement>::firstChild(*m_trackElement->parentNode()); track; track = Traversal<HTMLTrackElement>::nextSibling(*track)) {
         if (!track->parentNode())
             continue;
         if (track == m_trackElement)
             return index;
         ++index;
     }
     ASSERT_NOT_REACHED();
 
     return 0;
 }
 
+void LoadableTextTrack::trace(Visitor* visitor)
+{
+    visitor->trace(m_loader);
+    TextTrack::trace(visitor);
+}
+
 } // namespace WebCore