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

Side by Side Diff: third_party/WebKit/Source/core/html/track/AudioTrack.h

Issue 1973343002: Clean up HTMLTrackElement.kind invalid/missing value default handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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
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 #ifndef AudioTrack_h 5 #ifndef AudioTrack_h
6 #define AudioTrack_h 6 #define AudioTrack_h
7 7
8 #include "bindings/core/v8/ScriptWrappable.h" 8 #include "bindings/core/v8/ScriptWrappable.h"
9 #include "core/CoreExport.h" 9 #include "core/CoreExport.h"
10 #include "core/html/track/TrackBase.h" 10 #include "core/html/track/TrackBase.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 class CORE_EXPORT AudioTrack final : public GarbageCollectedFinalized<AudioTrack >, public TrackBase, public ScriptWrappable { 14 class CORE_EXPORT AudioTrack final : public GarbageCollectedFinalized<AudioTrack >, public TrackBase, public ScriptWrappable {
15 DEFINE_WRAPPERTYPEINFO(); 15 DEFINE_WRAPPERTYPEINFO();
16 USING_GARBAGE_COLLECTED_MIXIN(AudioTrack); 16 USING_GARBAGE_COLLECTED_MIXIN(AudioTrack);
17 public: 17 public:
18 static AudioTrack* create(const String& id, const AtomicString& kind, const AtomicString& label, const AtomicString& language, bool enabled) 18 static AudioTrack* create(const String& id, const AtomicString& kind, const AtomicString& label, const AtomicString& language, bool enabled)
19 { 19 {
20 return new AudioTrack(id, kind, label, language, enabled); 20 return new AudioTrack(id, isValidKindKeyword(kind) ? kind : emptyAtom, l abel, language, enabled);
21 } 21 }
22 22
23 ~AudioTrack() override; 23 ~AudioTrack() override;
24 DECLARE_VIRTUAL_TRACE(); 24 DECLARE_VIRTUAL_TRACE();
25 25
26 bool enabled() const { return m_enabled; } 26 bool enabled() const { return m_enabled; }
27 void setEnabled(bool); 27 void setEnabled(bool);
28 28
29 // Valid kind keywords. 29 // Valid kind keywords.
30 static const AtomicString& alternativeKeyword(); 30 static const AtomicString& alternativeKeyword();
31 static const AtomicString& descriptionsKeyword(); 31 static const AtomicString& descriptionsKeyword();
32 static const AtomicString& mainKeyword(); 32 static const AtomicString& mainKeyword();
33 static const AtomicString& mainDescriptionsKeyword(); 33 static const AtomicString& mainDescriptionsKeyword();
34 static const AtomicString& translationKeyword(); 34 static const AtomicString& translationKeyword();
35 static const AtomicString& commentaryKeyword(); 35 static const AtomicString& commentaryKeyword();
36 36
37 static bool isValidKindKeyword(const String&); 37 static bool isValidKindKeyword(const String&);
38 38
39 private: 39 private:
40 AudioTrack(const String& id, const AtomicString& kind, const AtomicString& l abel, const AtomicString& language, bool enabled); 40 AudioTrack(const String& id, const AtomicString& kind, const AtomicString& l abel, const AtomicString& language, bool enabled);
41 41
42 // TrackBase
43 bool isValidKind(const AtomicString& kind) const override { return isValidKi ndKeyword(kind); }
44 AtomicString invalidValueDefaultKind() const override;
45
46 bool m_enabled; 42 bool m_enabled;
47 }; 43 };
48 44
49 DEFINE_TRACK_TYPE_CASTS(AudioTrack, WebMediaPlayer::AudioTrack); 45 DEFINE_TRACK_TYPE_CASTS(AudioTrack, WebMediaPlayer::AudioTrack);
50 46
51 } // namespace blink 47 } // namespace blink
52 48
53 #endif // AudioTrack_h 49 #endif // AudioTrack_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLTrackElement.cpp ('k') | third_party/WebKit/Source/core/html/track/AudioTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698