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

Side by Side Diff: third_party/WebKit/Source/core/html/track/TextTrack.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 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const AtomicString& interfaceName() const override; 117 const AtomicString& interfaceName() const override;
118 ExecutionContext* getExecutionContext() const override; 118 ExecutionContext* getExecutionContext() const override;
119 119
120 DECLARE_VIRTUAL_TRACE(); 120 DECLARE_VIRTUAL_TRACE();
121 121
122 DECLARE_VIRTUAL_TRACE_WRAPPERS(); 122 DECLARE_VIRTUAL_TRACE_WRAPPERS();
123 123
124 protected: 124 protected:
125 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType); 125 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType);
126 126
127 bool isValidKind(const AtomicString& kind) const override { return isValidKi ndKeyword(kind); }
128 AtomicString invalidValueDefaultKind() const override { return metadataKeywo rd(); }
129
130 void addListOfCues(HeapVector<Member<TextTrackCue>>&); 127 void addListOfCues(HeapVector<Member<TextTrackCue>>&);
131 128
132 private: 129 private:
133 CueTimeline* cueTimeline() const; 130 CueTimeline* cueTimeline() const;
134 131
135 TextTrackCueList* ensureTextTrackCueList(); 132 TextTrackCueList* ensureTextTrackCueList();
136 Member<TextTrackCueList> m_cues; 133 Member<TextTrackCueList> m_cues;
137 Member<TextTrackCueList> m_activeCues; 134 Member<TextTrackCueList> m_activeCues;
138 135
139 VTTRegionList* ensureVTTRegionList(); 136 VTTRegionList* ensureVTTRegionList();
140 Member<VTTRegionList> m_regions; 137 Member<VTTRegionList> m_regions;
141 138
142 Member<TextTrackList> m_trackList; 139 Member<TextTrackList> m_trackList;
143 AtomicString m_mode; 140 AtomicString m_mode;
144 TextTrackType m_trackType; 141 TextTrackType m_trackType;
145 ReadinessState m_readinessState; 142 ReadinessState m_readinessState;
146 int m_trackIndex; 143 int m_trackIndex;
147 int m_renderedTrackIndex; 144 int m_renderedTrackIndex;
148 bool m_hasBeenConfigured; 145 bool m_hasBeenConfigured;
149 }; 146 };
150 147
151 DEFINE_TRACK_TYPE_CASTS(TextTrack, WebMediaPlayer::TextTrack); 148 DEFINE_TRACK_TYPE_CASTS(TextTrack, WebMediaPlayer::TextTrack);
152 149
153 } // namespace blink 150 } // namespace blink
154 151
155 #endif // TextTrack_h 152 #endif // TextTrack_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/InbandTextTrack.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698