| Index: Source/core/html/track/TrackBase.h
|
| diff --git a/Source/core/html/track/TrackBase.h b/Source/core/html/track/TrackBase.h
|
| index d3625f076e5d349e4e089b20a86f5ba9e4c8b9c5..73c3560974bb6e313f845e7ae42635b54dbb4cf1 100644
|
| --- a/Source/core/html/track/TrackBase.h
|
| +++ b/Source/core/html/track/TrackBase.h
|
| @@ -27,15 +27,20 @@
|
| #define TrackBase_h
|
|
|
| #include "platform/heap/Handle.h"
|
| +#include "public/platform/WebMediaPlayer.h"
|
| #include "wtf/RefCounted.h"
|
| #include "wtf/text/AtomicString.h"
|
|
|
| namespace WebCore {
|
|
|
| +class HTMLMediaElement;
|
| +
|
| class TrackBase : public RefCountedWillBeRefCountedGarbageCollected<TrackBase> {
|
| public:
|
| virtual ~TrackBase();
|
|
|
| + blink::WebTrackId webId() const { return m_webId; }
|
| +
|
| enum Type { TextTrack, AudioTrack, VideoTrack };
|
| Type type() const { return m_type; }
|
|
|
| @@ -48,23 +53,28 @@ public:
|
| 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; }
|
| + String id() const { return m_id; }
|
| + void setId(const String& id) { m_id = id; }
|
| +
|
| + void setMediaElement(HTMLMediaElement* mediaElement) { m_mediaElement = mediaElement; }
|
| + HTMLMediaElement* mediaElement() const { return m_mediaElement; }
|
|
|
| virtual void trace(Visitor*) { }
|
|
|
| protected:
|
| - TrackBase(Type, const AtomicString& label, const AtomicString& language, const AtomicString& id);
|
| + TrackBase(Type, const AtomicString& label, const AtomicString& language, const String& id);
|
|
|
| virtual bool isValidKind(const AtomicString&) const = 0;
|
| virtual AtomicString defaultKind() const = 0;
|
|
|
| private:
|
| + blink::WebTrackId m_webId;
|
| Type m_type;
|
| AtomicString m_kind;
|
| AtomicString m_label;
|
| AtomicString m_language;
|
| - AtomicString m_id;
|
| + String m_id;
|
| + HTMLMediaElement* m_mediaElement;
|
| };
|
|
|
| } // namespace WebCore
|
|
|