Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: Source/core/html/track/VideoTrack.cpp

Issue 691313002: MSE: Implement TrackDefault object (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased and addressed PS9 comments Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/html/track/VideoTrack.h ('k') | Source/modules/mediasource/TrackDefault.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/html/track/VideoTrack.h" 6 #include "core/html/track/VideoTrack.h"
7 7
8 #include "core/html/HTMLMediaElement.h" 8 #include "core/html/HTMLMediaElement.h"
9 9
10 namespace blink { 10 namespace blink {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 DEFINE_STATIC_LOCAL(const AtomicString, keyword, ("subtitles", AtomicString: :ConstructFromLiteral)); 62 DEFINE_STATIC_LOCAL(const AtomicString, keyword, ("subtitles", AtomicString: :ConstructFromLiteral));
63 return keyword; 63 return keyword;
64 } 64 }
65 65
66 const AtomicString& VideoTrack::commentaryKeyword() 66 const AtomicString& VideoTrack::commentaryKeyword()
67 { 67 {
68 DEFINE_STATIC_LOCAL(const AtomicString, keyword, ("commentary", AtomicString ::ConstructFromLiteral)); 68 DEFINE_STATIC_LOCAL(const AtomicString, keyword, ("commentary", AtomicString ::ConstructFromLiteral));
69 return keyword; 69 return keyword;
70 } 70 }
71 71
72 bool VideoTrack::isValidKind(const AtomicString& kind) const 72 bool VideoTrack::isValidKindKeyword(const String& kind)
73 { 73 {
74 return (kind == alternativeKeyword()) 74 return (kind == alternativeKeyword())
75 || (kind == captionsKeyword()) 75 || (kind == captionsKeyword())
76 || (kind == mainKeyword()) 76 || (kind == mainKeyword())
77 || (kind == signKeyword()) 77 || (kind == signKeyword())
78 || (kind == subtitlesKeyword()) 78 || (kind == subtitlesKeyword())
79 || (kind == commentaryKeyword()); 79 || (kind == commentaryKeyword())
80 || (kind == emptyAtom);
80 } 81 }
81 82
82 AtomicString VideoTrack::defaultKind() const 83 AtomicString VideoTrack::defaultKind() const
83 { 84 {
84 return emptyAtom; 85 return emptyAtom;
85 } 86 }
86 87
87 } 88 }
OLDNEW
« no previous file with comments | « Source/core/html/track/VideoTrack.h ('k') | Source/modules/mediasource/TrackDefault.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698