Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/html/track/TextTrack.cpp b/src/third_party/WebKit/Source/core/html/track/TextTrack.cpp
index 3adc269..b95a35d 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/track/TextTrack.cpp
+++ b/src/third_party/WebKit/Source/core/html/track/TextTrack.cpp
@@ -32,18 +32,17 @@
 #include "config.h"
 #include "core/html/track/TextTrack.h"
 
-#include "RuntimeEnabledFeatures.h"
-#include "bindings/v8/ExceptionState.h"
-#include "bindings/v8/ExceptionStatePlaceholder.h"
-#include "core/dom/Document.h"
+#include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/track/TextTrackCueList.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/html/track/vtt/VTTRegion.h"
 #include "core/html/track/vtt/VTTRegionList.h"
+#include "platform/RuntimeEnabledFeatures.h"
 
-namespace WebCore {
+namespace blink {
 
 static const int invalidTrackIndex = -1;
 
@@ -95,7 +94,7 @@ const AtomicString& TextTrack::showingKeyword()
     return ended;
 }
 
-TextTrack::TextTrack(Document& document, const AtomicString& kind, const AtomicString& label, const AtomicString& language, const AtomicString& id, TextTrackType type)
+TextTrack::TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicString& language, const AtomicString& id, TextTrackType type)
     : TrackBase(TrackBase::TextTrack, label, language, id)
     , m_cues(nullptr)
     , m_regions(nullptr)
@@ -107,7 +106,6 @@ TextTrack::TextTrack(Document& document, const AtomicString& kind, const AtomicS
     , m_renderedTrackIndex(invalidTrackIndex)
     , m_hasBeenConfigured(false)
 {
-    ScriptWrappable::init(this);
     setKind(kind);
 }
 
@@ -194,7 +192,7 @@ TextTrackCueList* TextTrack::cues()
     // http://www.whatwg.org/specs/web-apps/current-work/#dom-texttrack-cues
     if (m_mode != disabledKeyword())
         return ensureTextTrackCueList();
-    return 0;
+    return nullptr;
 }
 
 void TextTrack::removeAllCues()
@@ -221,7 +219,7 @@ TextTrackCueList* TextTrack::activeCues() const
     // http://www.whatwg.org/specs/web-apps/current-work/#dom-texttrack-activecues
     if (m_cues && m_mode != disabledKeyword())
         return m_cues->activeCues();
-    return 0;
+    return nullptr;
 }
 
 void TextTrack::addCue(PassRefPtrWillBeRawPtr<TextTrackCue> prpCue)
@@ -298,7 +296,7 @@ VTTRegionList* TextTrack::regions()
     // each time.
     if (RuntimeEnabledFeatures::webVTTRegionsEnabled() && m_mode != disabledKeyword())
         return ensureVTTRegionList();
-    return 0;
+    return nullptr;
 }
 
 void TextTrack::addRegion(PassRefPtrWillBeRawPtr<VTTRegion> prpRegion)
@@ -445,6 +443,7 @@ void TextTrack::trace(Visitor* visitor)
     visitor->trace(m_regions);
     visitor->trace(m_trackList);
     TrackBase::trace(visitor);
+    EventTargetWithInlineData::trace(visitor);
 }
 
-} // namespace WebCore
+} // namespace blink