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

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

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/LoadableTextTrack.h ('k') | Source/core/html/track/TextTrack.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..288ec204df8965c69c646213a41ca5c832ca6557 100644
--- a/Source/core/html/track/LoadableTextTrack.cpp
+++ b/Source/core/html/track/LoadableTextTrack.cpp
@@ -46,13 +46,17 @@ LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track)
LoadableTextTrack::~LoadableTextTrack()
{
+#if !ENABLE(OILPAN)
ASSERT(!m_trackElement);
+#endif
}
+#if !ENABLE(OILPAN)
void LoadableTextTrack::clearTrackElement()
{
- m_trackElement = 0;
+ m_trackElement = nullptr;
}
+#endif
void LoadableTextTrack::setMode(const AtomicString& mode)
{
@@ -111,7 +115,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 +123,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 +144,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 +171,11 @@ size_t LoadableTextTrack::trackElementIndex()
return 0;
}
+void LoadableTextTrack::trace(Visitor* visitor)
+{
+ visitor->trace(m_trackElement);
+ visitor->trace(m_loader);
+ TextTrack::trace(visitor);
+}
+
} // namespace WebCore
« no previous file with comments | « Source/core/html/track/LoadableTextTrack.h ('k') | Source/core/html/track/TextTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698