Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/html/track/TextTrackList.cpp b/src/third_party/WebKit/Source/core/html/track/TextTrackList.cpp
index a1ad443..d0bf01c 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/track/TextTrackList.cpp
+++ b/src/third_party/WebKit/Source/core/html/track/TextTrackList.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "core/html/track/TextTrackList.h"
 
-#include "bindings/v8/ExceptionStatePlaceholder.h"
+#include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/events/GenericEventQueue.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/track/InbandTextTrack.h"
@@ -34,22 +34,24 @@
 #include "core/html/track/TextTrack.h"
 #include "core/html/track/TrackEvent.h"
 
-using namespace WebCore;
+using namespace blink;
 
 TextTrackList::TextTrackList(HTMLMediaElement* owner)
     : m_owner(owner)
     , m_asyncEventQueue(GenericEventQueue::create(this))
 {
-    ScriptWrappable::init(this);
 }
 
 TextTrackList::~TextTrackList()
 {
 #if !ENABLE(OILPAN)
     ASSERT(!m_owner);
-#endif
+
+    // TextTrackList and m_asyncEventQueue always become unreachable
+    // together. So TextTrackList and m_asyncEventQueue are destructed in the
+    // same GC. We don't need to close it explicitly in Oilpan.
     m_asyncEventQueue->close();
-#if !ENABLE(OILPAN)
+
     for (unsigned i = 0; i < length(); ++i) {
         item(i)->setTrackList(0);
     }
@@ -155,7 +157,7 @@ TextTrack* TextTrackList::getTrackById(const AtomicString& id)
 
 void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
 {
-    WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
+    WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
 
     if (track->trackType() == TextTrack::TrackElement) {
         tracks = &m_elementTracks;
@@ -167,10 +169,11 @@ void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
         tracks = &m_addTrackTracks;
         for (size_t i = 0; i < m_inbandTracks.size(); ++i)
             m_inbandTracks[i]->invalidateTrackIndex();
-    } else if (track->trackType() == TextTrack::InBand)
+    } else if (track->trackType() == TextTrack::InBand) {
         tracks = &m_inbandTracks;
-    else
+    } else {
         ASSERT_NOT_REACHED();
+    }
 
     size_t index = tracks->find(track);
     if (index == kNotFound)
@@ -184,9 +187,9 @@ void TextTrackList::append(PassRefPtrWillBeRawPtr<TextTrack> prpTrack)
 {
     RefPtrWillBeRawPtr<TextTrack> track = prpTrack;
 
-    if (track->trackType() == TextTrack::AddTrack)
+    if (track->trackType() == TextTrack::AddTrack) {
         m_addTrackTracks.append(track);
-    else if (track->trackType() == TextTrack::TrackElement) {
+    } else if (track->trackType() == TextTrack::TrackElement) {
         // Insert tracks added for <track> element in tree order.
         size_t index = static_cast<LoadableTextTrack*>(track.get())->trackElementIndex();
         m_elementTracks.insert(index, track);
@@ -194,8 +197,9 @@ void TextTrackList::append(PassRefPtrWillBeRawPtr<TextTrack> prpTrack)
         // Insert tracks added for in-band in the media file order.
         size_t index = static_cast<InbandTextTrack*>(track.get())->inbandTrackIndex();
         m_inbandTracks.insert(index, track);
-    } else
+    } else {
         ASSERT_NOT_REACHED();
+    }
 
     invalidateTrackIndexesAfterTrack(track.get());
 
@@ -207,7 +211,7 @@ void TextTrackList::append(PassRefPtrWillBeRawPtr<TextTrack> prpTrack)
 
 void TextTrackList::remove(TextTrack* track)
 {
-    WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
+    WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
 
     if (track->trackType() == TextTrack::TrackElement) {
         tracks = &m_elementTracks;
@@ -243,7 +247,7 @@ void TextTrackList::removeAllInbandTracks()
 
 bool TextTrackList::contains(TextTrack* track) const
 {
-    const WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
+    const WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
 
     if (track->trackType() == TextTrack::TrackElement)
         tracks = &m_elementTracks;
@@ -305,11 +309,7 @@ void TextTrackList::scheduleChangeEvent()
     // Fire a simple event named change at the media element's textTracks
     // attribute's TextTrackList object.
 
-    EventInit initializer;
-    initializer.bubbles = false;
-    initializer.cancelable = false;
-
-    m_asyncEventQueue->enqueueEvent(Event::create(EventTypeNames::change, initializer));
+    m_asyncEventQueue->enqueueEvent(Event::create(EventTypeNames::change));
 }
 
 void TextTrackList::scheduleRemoveTrackEvent(PassRefPtrWillBeRawPtr<TextTrack> track)
@@ -334,7 +334,9 @@ HTMLMediaElement* TextTrackList::owner() const
 void TextTrackList::trace(Visitor* visitor)
 {
     visitor->trace(m_owner);
+    visitor->trace(m_asyncEventQueue);
     visitor->trace(m_addTrackTracks);
     visitor->trace(m_elementTracks);
     visitor->trace(m_inbandTracks);
+    EventTargetWithInlineData::trace(visitor);
 }