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

Source/core/html/track/TextTrack.h

 /*
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 17 matching lines @@
 #define TextTrack_h
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/html/track/TrackBase.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class Document;
 class ExceptionState;
-class HTMLMediaElement;
 class TextTrack;
 class TextTrackCue;
 class TextTrackCueList;
+class TextTrackList;
 class VTTRegion;
 class VTTRegionList;
 
 class TextTrackClient {
 public:
     virtual ~TextTrackClient() { }
     virtual void textTrackKindChanged(TextTrack*) = 0;
     virtual void textTrackModeChanged(TextTrack*) = 0;
     virtual void textTrackAddCues(TextTrack*, const TextTrackCueList*) = 0;
     virtual void textTrackRemoveCues(TextTrack*, const TextTrackCueList*) = 0;
     virtual void textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue>) = 0;
     virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) = 0;
 };
 
-class TextTrack : public TrackBase, public ScriptWrappable {
+class TextTrack : public TrackBase, public ScriptWrappable, public EventTargetWithInlineData {
+    REFCOUNTED_EVENT_TARGET(TrackBase);
 public:
     static PassRefPtr<TextTrack> create(Document& document, TextTrackClient* client, const AtomicString& kind, const AtomicString& label, const AtomicString& language)
     {
         return adoptRef(new TextTrack(document, client, kind, label, language, emptyAtom, AddTrack));
     }
     virtual ~TextTrack();
 
-    void setMediaElement(HTMLMediaElement* element) { m_mediaElement = element; }
-    HTMLMediaElement* mediaElement() { return m_mediaElement; }
+    void setTrackList(TextTrackList* trackList) { m_trackList = trackList; }
+    TextTrackList* trackList() { return m_trackList; }
 
-    AtomicString kind() const { return m_kind; }
-    void setKind(const AtomicString&);
+    virtual void setKind(const AtomicString&) OVERRIDE;
 
     static const AtomicString& subtitlesKeyword();
     static const AtomicString& captionsKeyword();
     static const AtomicString& descriptionsKeyword();
     static const AtomicString& chaptersKeyword();
     static const AtomicString& metadataKeyword();
     static bool isValidKindKeyword(const AtomicString&);
 
-    AtomicString label() const { return m_label; }
-    void setLabel(const AtomicString& label) { m_label = label; }
-
-    AtomicString language() const { return m_language; }
-    void setLanguage(const AtomicString& language) { m_language = language; }
-
-    AtomicString id() const { return m_id; }
-    void setId(const AtomicString& id) { m_id = id; }
-
     static const AtomicString& disabledKeyword();
     static const AtomicString& hiddenKeyword();
     static const AtomicString& showingKeyword();
 
     AtomicString mode() const { return m_mode; }
     void setMode(const AtomicString&);
 
     enum ReadinessState { NotLoaded = 0, Loading = 1, Loaded = 2, FailedToLoad = 3 };
     ReadinessState readinessState() const { return m_readinessState; }
     void setReadinessState(ReadinessState state) { m_readinessState = state; }
@@ skipping 35 matching lines @@
 
     Document& document() const { return *m_document; }
 
     // EventTarget methods
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
 protected:
     TextTrack(Document&, TextTrackClient*, const AtomicString& kind, const AtomicString& label, const AtomicString& language, const AtomicString& id, TextTrackType);
 
+    virtual bool isValidKind(const AtomicString& kind) const OVERRIDE { return isValidKindKeyword(kind); }

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

nit: isValidKindKeyword() doesn't appear to be used by anyting else. How about
just renaming it to isValidKind() and drop this inline?

+    virtual AtomicString defaultKind() const OVERRIDE { return subtitlesKeyword(); }
+
     RefPtr<TextTrackCueList> m_cues;
 
 private:
     VTTRegionList* ensureVTTRegionList();
     RefPtr<VTTRegionList> m_regions;
 
     TextTrackCueList* ensureTextTrackCueList();
 
     // FIXME: Remove this pointer and get the Document from m_client
     Document* m_document;
 
-    HTMLMediaElement* m_mediaElement;
-    AtomicString m_kind;
-    AtomicString m_label;
-    AtomicString m_language;
-    AtomicString m_id;
+    TextTrackList* m_trackList;
     AtomicString m_mode;
     TextTrackClient* m_client;
     TextTrackType m_trackType;
     ReadinessState m_readinessState;
     int m_trackIndex;
     int m_renderedTrackIndex;
     bool m_hasBeenConfigured;
 };
 
 } // namespace WebCore
 
 #endif