Move text track active list management to CueTimeline

Source/core/html/track/TextTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2011, 2012, 2013 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 18 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/track/TextTrack.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/CueTimeline.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 blink {
 
 static const int invalidTrackIndex = -1;
 
@@ skipping 87 matching lines @@
     if (value == chaptersKeyword())
         return true;
     if (value == metadataKeyword())
         return true;
 
     return false;
 }
 
 void TextTrack::setTrackList(TextTrackList* trackList)
 {
-    if (!trackList && mediaElement() && m_cues)
-        mediaElement()->textTrackRemoveCues(this, m_cues.get());
+    if (!trackList && cueTimeline() && m_cues)
+        cueTimeline()->removeCues(this, m_cues.get());
 
     m_trackList = trackList;
     invalidateTrackIndex();
 }
 
 void TextTrack::setKind(const AtomicString& newKind)
 {
     AtomicString oldKind = kind();
     TrackBase::setKind(newKind);
 
     if (mediaElement() && oldKind != kind())
         mediaElement()->textTrackKindChanged(this);
 }
 
 void TextTrack::setMode(const AtomicString& mode)
 {
     ASSERT(mode == disabledKeyword() || mode == hiddenKeyword() || mode == showingKeyword());
 
     // On setting, if the new value isn't equal to what the attribute would currently
     // return, the new value must be processed as follows ...
     if (m_mode == mode)
         return;
 
     // If mode changes to disabled, remove this track's cues from the client
     // because they will no longer be accessible from the cues() function.
-    if (mode == disabledKeyword() && mediaElement() && m_cues)
-        mediaElement()->textTrackRemoveCues(this, m_cues.get());
+    if (mode == disabledKeyword() && cueTimeline() && m_cues)
+        cueTimeline()->removeCues(this, m_cues.get());
 
     if (mode != showingKeyword() && m_cues)
         for (size_t i = 0; i < m_cues->length(); ++i)
             m_cues->item(i)->removeDisplayTree();
 
     m_mode = mode;
 
     if (mediaElement())
         mediaElement()->textTrackModeChanged(this);
 }
 
 TextTrackCueList* TextTrack::cues()
 {
     // 4.8.10.12.5 If the text track mode ... is not the text track disabled mode,
     // then the cues attribute must return a live TextTrackCueList object ...
     // Otherwise, it must return null. When an object is returned, the
     // same object must be returned each time.
     // http://www.whatwg.org/specs/web-apps/current-work/#dom-texttrack-cues
     if (m_mode != disabledKeyword())
         return ensureTextTrackCueList();
     return nullptr;
 }
 
 void TextTrack::removeAllCues()
 {
     if (!m_cues)
         return;
 
-    if (mediaElement())
-        mediaElement()->textTrackRemoveCues(this, m_cues.get());
+    if (cueTimeline())
+        cueTimeline()->removeCues(this, m_cues.get());
 
     for (size_t i = 0; i < m_cues->length(); ++i)
         m_cues->item(i)->setTrack(0);
 
     m_cues = nullptr;
 }
 
 TextTrackCueList* TextTrack::activeCues() const
 {
     // 4.8.10.12.5 If the text track mode ... is not the text track disabled mode,
@@ skipping 25 matching lines @@
     // 1. If the given cue is in a text track list of cues, then remove cue from that text track
     // list of cues.
     TextTrack* cueTrack = cue->track();
     if (cueTrack && cueTrack != this)
         cueTrack->removeCue(cue.get(), ASSERT_NO_EXCEPTION);
 
     // 2. Add cue to the method's TextTrack object's text track's text track list of cues.
     cue->setTrack(this);
     ensureTextTrackCueList()->add(cue);
 
-    if (mediaElement() && m_mode != disabledKeyword())
-        mediaElement()->textTrackAddCue(this, cue.get());
+    if (cueTimeline() && m_mode != disabledKeyword())
+        cueTimeline()->addCue(this, cue.get());
 }
 
 void TextTrack::removeCue(TextTrackCue* cue, ExceptionState& exceptionState)
 {
     if (!cue)
         return;
 
     // 4.8.10.12.5 Text track API
 
     // The removeCue(cue) method of TextTrack objects, when invoked, must run the following steps:
 
     // 1. If the given cue is not currently listed in the method's TextTrack
     // object's text track's text track list of cues, then throw a NotFoundError exception.
     if (cue->track() != this) {
         exceptionState.throwDOMException(NotFoundError, "The specified cue is not listed in the TextTrack's list of cues.");
         return;
     }
 
     // 2. Remove cue from the method's TextTrack object's text track's text track list of cues.
     if (!m_cues || !m_cues->remove(cue)) {
         exceptionState.throwDOMException(InvalidStateError, "Failed to remove the specified cue.");
         return;
     }
 
     cue->setTrack(0);
-    if (mediaElement())
-        mediaElement()->textTrackRemoveCue(this, cue);
+    if (cueTimeline())
+        cueTimeline()->removeCue(this, cue);
 }
 
 VTTRegionList* TextTrack::ensureVTTRegionList()
 {
     if (!m_regions)
         m_regions = VTTRegionList::create();
 
     return m_regions.get();
 }
 
@@ skipping 55 matching lines @@
     if (!m_regions || !m_regions->remove(region)) {
         exceptionState.throwDOMException(InvalidStateError, "Failed to remove the specified region.");
         return;
     }
 
     region->setTrack(0);
 }
 
 void TextTrack::cueWillChange(TextTrackCue* cue)
 {
-    if (!mediaElement())
+    if (!cueTimeline())
         return;
 
     // The cue may need to be repositioned in the media element's interval tree, may need to
     // be re-rendered, etc, so remove it before the modification...
-    mediaElement()->textTrackRemoveCue(this, cue);
+    cueTimeline()->removeCue(this, cue);
 }
 
 void TextTrack::cueDidChange(TextTrackCue* cue)
 {
-    if (!mediaElement())
+    if (!cueTimeline())
         return;
 
     // Make sure the TextTrackCueList order is up-to-date.
     ensureTextTrackCueList()->updateCueIndex(cue);
 
     // ... and add it back again if the track is enabled.
     if (m_mode == disabledKeyword())
         return;
 
-    mediaElement()->textTrackAddCue(this, cue);
+    cueTimeline()->addCue(this, cue);
 }
 
 int TextTrack::trackIndex()
 {
     ASSERT(m_trackList);
 
     if (m_trackIndex == invalidTrackIndex)
         m_trackIndex = m_trackList->getTrackIndex(this);
 
     return m_trackIndex;
@@ skipping 43 matching lines @@
 {
     HTMLMediaElement* owner = mediaElement();
     return owner ? owner->executionContext() : 0;
 }
 
 HTMLMediaElement* TextTrack::mediaElement() const
 {
     return m_trackList ? m_trackList->owner() : 0;
 }
 
+CueTimeline* TextTrack::cueTimeline() const
+{
+    return mediaElement() ? &mediaElement()->cueTimeline() : nullptr;
+}
+
 Node* TextTrack::owner() const
 {
     return mediaElement();
 }
 
 void TextTrack::trace(Visitor* visitor)
 {
     visitor->trace(m_cues);
     visitor->trace(m_regions);
     visitor->trace(m_trackList);
     TrackBase::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink