Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / loader / TextTrackLoader.cpp

diff --git a/src/third_party/WebKit/Source/core/loader/TextTrackLoader.cpp b/src/third_party/WebKit/Source/core/loader/TextTrackLoader.cpp
index a5eb3ba..d6dde51 100644 (file)
--- a/src/third_party/WebKit/Source/core/loader/TextTrackLoader.cpp
+++ b/src/third_party/WebKit/Source/core/loader/TextTrackLoader.cpp
@@ -119,7 +119,7 @@ bool TextTrackLoader::load(const KURL& url, const AtomicString& crossOriginMode)
     }
 
     ResourceFetcher* fetcher = m_document.fetcher();
-    setResource(fetcher->fetchRawResource(cueRequest));
+    setResource(fetcher->fetchTextTrack(cueRequest));
     return resource();
 }
 
@@ -149,18 +149,23 @@ void TextTrackLoader::fileFailedToParse()
     cancelLoad();
 }
 
-void TextTrackLoader::getNewCues(Vector<RefPtr<VTTCue> >& outputCues)
+void TextTrackLoader::getNewCues(WillBeHeapVector<RefPtrWillBeMember<VTTCue> >& outputCues)
 {
     ASSERT(m_cueParser);
     if (m_cueParser)
         m_cueParser->getNewCues(outputCues);
 }
 
-void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions)
+void TextTrackLoader::getNewRegions(WillBeHeapVector<RefPtrWillBeMember<VTTRegion> >& outputRegions)
 {
     ASSERT(m_cueParser);
     if (m_cueParser)
         m_cueParser->getNewRegions(outputRegions);
 }
 
+void TextTrackLoader::trace(Visitor* visitor)
+{
+    visitor->trace(m_cueParser);
+}
+
 }