| Index: third_party/WebKit/Source/core/html/track/VideoTrack.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/track/VideoTrack.cpp b/third_party/WebKit/Source/core/html/track/VideoTrack.cpp
|
| index c2a08890c97243be06cf61fb2880c646ccf64bbe..9903e3a20d06cbdd29c58f52c59dc524ce59c112 100644
|
| --- a/third_party/WebKit/Source/core/html/track/VideoTrack.cpp
|
| +++ b/third_party/WebKit/Source/core/html/track/VideoTrack.cpp
|
| @@ -9,10 +9,9 @@
|
| namespace blink {
|
|
|
| VideoTrack::VideoTrack(const String& id, const AtomicString& kind, const AtomicString& label, const AtomicString& language, bool selected)
|
| - : TrackBase(WebMediaPlayer::VideoTrack, label, language, id)
|
| + : TrackBase(WebMediaPlayer::VideoTrack, kind, label, language, id)
|
| , m_selected(selected)
|
| {
|
| - setKind(kind);
|
| }
|
|
|
| VideoTrack::~VideoTrack()
|
| @@ -75,18 +74,13 @@ const AtomicString& VideoTrack::commentaryKeyword()
|
|
|
| bool VideoTrack::isValidKindKeyword(const String& kind)
|
| {
|
| - return (kind == alternativeKeyword())
|
| - || (kind == captionsKeyword())
|
| - || (kind == mainKeyword())
|
| - || (kind == signKeyword())
|
| - || (kind == subtitlesKeyword())
|
| - || (kind == commentaryKeyword())
|
| - || (kind == emptyAtom);
|
| -}
|
| -
|
| -AtomicString VideoTrack::invalidValueDefaultKind() const
|
| -{
|
| - return emptyAtom;
|
| + return kind == alternativeKeyword()
|
| + || kind == captionsKeyword()
|
| + || kind == mainKeyword()
|
| + || kind == signKeyword()
|
| + || kind == subtitlesKeyword()
|
| + || kind == commentaryKeyword()
|
| + || kind == emptyAtom;
|
| }
|
|
|
| } // namespace blink
|
|
|