#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"
#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()
void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
{
- WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
+ WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
if (track->trackType() == TextTrack::TrackElement) {
tracks = &m_elementTracks;
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)
{
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);
// 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());
void TextTrackList::remove(TextTrack* track)
{
- WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0;
+ WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
if (track->trackType() == TextTrack::TrackElement) {
tracks = &m_elementTracks;
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;
// 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)