Move code that applies to audio and video tracks into TrackBase.

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 79 matching lines @@
     return closed;
 }
 
 const AtomicString& TextTrack::showingKeyword()
 {
     DEFINE_STATIC_LOCAL(const AtomicString, ended, ("showing", AtomicString::ConstructFromLiteral));
     return ended;
 }
 
 TextTrack::TextTrack(Document& document, TextTrackClient* client, const AtomicString& kind, const AtomicString& label, const AtomicString& language, const AtomicString& id, TextTrackType type)
-    : TrackBase(TrackBase::TextTrack)
+    : TrackBase(TrackBase::TextTrack, label, language, id)
     , m_cues(0)
     , m_regions(0)
     , m_document(&document)
-    , m_mediaElement(0)
-    , m_label(label)
-    , m_language(language)
-    , m_id(id)
+    , m_trackList(0)
     , m_mode(disabledKeyword())
     , m_client(client)
     , m_trackType(type)
     , m_readinessState(NotLoaded)
     , m_trackIndex(invalidTrackIndex)
     , m_renderedTrackIndex(invalidTrackIndex)
     , m_hasBeenConfigured(false)
 {
     ScriptWrappable::init(this);
     setKind(kind);
@@ skipping 25 matching lines @@
     if (value == descriptionsKeyword())
         return true;
     if (value == chaptersKeyword())
         return true;
     if (value == metadataKeyword())
         return true;
 
     return false;
 }
 
-void TextTrack::setKind(const AtomicString& kind)
+void TextTrack::setKind(const AtomicString& newKind)
 {
-    String oldKind = m_kind;
+    AtomicString oldKind = kind();
+    TrackBase::setKind(newKind);
 
-    if (isValidKindKeyword(kind))
-        m_kind = kind;
-    else
-        m_kind = subtitlesKeyword();
-
-    if (m_client && oldKind != m_kind)
+    if (m_client && oldKind != kind())
         m_client->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)
@@ skipping 197 matching lines @@
 
     // Make sure the TextTrackCueList order is up-to-date.
     ensureTextTrackCueList()->updateCueIndex(cue);
 
     // ... and add it back again.
     m_client->textTrackAddCue(this, cue);
 }
 
 int TextTrack::trackIndex()
 {
-    ASSERT(m_mediaElement);
+    ASSERT(m_trackList);
 
     if (m_trackIndex == invalidTrackIndex)
-        m_trackIndex = m_mediaElement->textTracks()->getTrackIndex(this);
+        m_trackList->getTrackIndex(this);

[acolwell GONE FROM CHROMIUM, 2013/12/06 01:35:54]

I think you are missing the 'm_trackIndex =' here.

 
     return m_trackIndex;
 }
 
 void TextTrack::invalidateTrackIndex()
 {
     m_trackIndex = invalidTrackIndex;
     m_renderedTrackIndex = invalidTrackIndex;
 }
 
 bool TextTrack::isRendered()
 {
-    if (m_kind != captionsKeyword() && m_kind != subtitlesKeyword())
+    if (kind() != captionsKeyword() && kind() != subtitlesKeyword())
         return false;
 
-    if (m_mode != showingKeyword())
+    if (kind() != showingKeyword())
         return false;
 
     return true;
 }
 
 TextTrackCueList* TextTrack::ensureTextTrackCueList()
 {
     if (!m_cues)
         m_cues = TextTrackCueList::create();
 
     return m_cues.get();
 }
 
 int TextTrack::trackIndexRelativeToRenderedTracks()
 {
-    ASSERT(m_mediaElement);
+    ASSERT(m_trackList);
 
     if (m_renderedTrackIndex == invalidTrackIndex)
-        m_renderedTrackIndex = m_mediaElement->textTracks()->getTrackIndexRelativeToRenderedTracks(this);
+        m_renderedTrackIndex = m_trackList->getTrackIndexRelativeToRenderedTracks(this);
 
     return m_renderedTrackIndex;
 }
 
 const AtomicString& TextTrack::interfaceName() const
 {
     return EventTargetNames::TextTrack;
 }
 
 ExecutionContext* TextTrack::executionContext() const
 {
     return m_document;
 }
 
 } // namespace WebCore