| Index: third_party/WebKit/Source/core/html/track/TextTrack.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/track/TextTrack.cpp b/third_party/WebKit/Source/core/html/track/TextTrack.cpp
|
| index 097a1f29b8fb11754118f371cab53c6a636e3a8c..9221e793f698210623851867d346b7511aa2f29a 100644
|
| --- a/third_party/WebKit/Source/core/html/track/TextTrack.cpp
|
| +++ b/third_party/WebKit/Source/core/html/track/TextTrack.cpp
|
| @@ -78,24 +78,24 @@ const AtomicString& TextTrack::metadataKeyword()
|
|
|
| const AtomicString& TextTrack::disabledKeyword()
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, open, ("disabled"));
|
| - return open;
|
| + DEFINE_STATIC_LOCAL(const AtomicString, disabled, ("disabled"));
|
| + return disabled;
|
| }
|
|
|
| const AtomicString& TextTrack::hiddenKeyword()
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, closed, ("hidden"));
|
| - return closed;
|
| + DEFINE_STATIC_LOCAL(const AtomicString, hidden, ("hidden"));
|
| + return hidden;
|
| }
|
|
|
| const AtomicString& TextTrack::showingKeyword()
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, ended, ("showing"));
|
| - return ended;
|
| + DEFINE_STATIC_LOCAL(const AtomicString, showing, ("showing"));
|
| + return showing;
|
| }
|
|
|
| TextTrack::TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicString& language, const AtomicString& id, TextTrackType type)
|
| - : TrackBase(WebMediaPlayer::TextTrack, label, language, id)
|
| + : TrackBase(WebMediaPlayer::TextTrack, kind, label, language, id)
|
| , m_cues(nullptr)
|
| , m_regions(nullptr)
|
| , m_trackList(nullptr)
|
| @@ -106,7 +106,6 @@ TextTrack::TextTrack(const AtomicString& kind, const AtomicString& label, const
|
| , m_renderedTrackIndex(invalidTrackIndex)
|
| , m_hasBeenConfigured(false)
|
| {
|
| - setKind(kind);
|
| }
|
|
|
| TextTrack::~TextTrack()
|
|
|