Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / track / LoadableTextTrack.cpp

diff --git a/src/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp b/src/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp
index 288ec20..9dce330 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp
+++ b/src/third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp
@@ -32,12 +32,12 @@
 #include "core/html/track/TextTrackCueList.h"
 #include "core/html/track/vtt/VTTRegionList.h"
 
-namespace WebCore {
+namespace blink {
 
 using namespace HTMLNames;
 
 LoadableTextTrack::LoadableTextTrack(HTMLTrackElement* track)
-    : TextTrack(track->document(), emptyAtom, emptyAtom, emptyAtom, emptyAtom, TrackElement)
+    : TextTrack(emptyAtom, emptyAtom, emptyAtom, emptyAtom, TrackElement)
     , m_trackElement(track)
     , m_loadTimer(this, &LoadableTextTrack::loadTimerFired)
     , m_isDefault(false)
@@ -61,8 +61,10 @@ void LoadableTextTrack::clearTrackElement()
 void LoadableTextTrack::setMode(const AtomicString& mode)
 {
     TextTrack::setMode(mode);
+#if !ENABLE(OILPAN)
     if (!m_trackElement)
         return;
+#endif
 
     if (m_trackElement->readyState() == HTMLTrackElement::NONE)
         m_trackElement->scheduleLoad();
@@ -98,8 +100,10 @@ void LoadableTextTrack::loadTimerFired(Timer<LoadableTextTrack>*)
     if (m_loader)
         m_loader->cancelLoad();
 
+#if !ENABLE(OILPAN)
     if (!m_trackElement)
         return;
+#endif
 
     // 4.8.10.12.3 Sourcing out-of-band text tracks (continued)
 
@@ -134,8 +138,10 @@ void LoadableTextTrack::cueLoadingCompleted(TextTrackLoader* loader, bool loadin
 {
     ASSERT_UNUSED(loader, m_loader == loader);
 
+#if !ENABLE(OILPAN)
     if (!m_trackElement)
         return;
+#endif
 
     m_trackElement->didCompleteLoad(loadingFailed ? HTMLTrackElement::Failure : HTMLTrackElement::Success);
 }
@@ -178,4 +184,4 @@ void LoadableTextTrack::trace(Visitor* visitor)
     TextTrack::trace(visitor);
 }
 
-} // namespace WebCore
+} // namespace blink