Chromium Code Reviews| Index: Source/core/html/track/LoadableTextTrack.cpp |
| diff --git a/Source/core/html/track/LoadableTextTrack.cpp b/Source/core/html/track/LoadableTextTrack.cpp |
| index 66e6b8dcb9778bc87526cfdd89fb5cbc753c020b..f89aeddf07704eb7195dee5a1a97b736c68e44bb 100644 |
| --- a/Source/core/html/track/LoadableTextTrack.cpp |
| +++ b/Source/core/html/track/LoadableTextTrack.cpp |
| @@ -46,12 +46,6 @@ LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track) |
| 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) |
| @@ -111,7 +105,7 @@ 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) |
| @@ -119,7 +113,7 @@ void LoadableTextTrack::newCuesAvailable(TextTrackLoader* loader) |
| 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()) |
| @@ -140,7 +134,7 @@ 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) { |
| @@ -167,4 +161,10 @@ size_t LoadableTextTrack::trackElementIndex() |
| return 0; |
| } |
| +void LoadableTextTrack::trace(Visitor* visitor) |
| +{ |
| + visitor->trace(m_loader); |
| + TextTrack::trace(visitor); |
| +} |
| + |
| } // namespace WebCore |