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

Side by Side Diff: Source/core/html/track/TextTrack.h

Issue 941973005: Push cue timeline management out of LoadableTextTrack (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/track/LoadableTextTrack.cpp ('k') | Source/core/html/track/TextTrack.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 virtual ExecutionContext* executionContext() const override; 118 virtual ExecutionContext* executionContext() const override;
119 119
120 DECLARE_VIRTUAL_TRACE(); 120 DECLARE_VIRTUAL_TRACE();
121 121
122 protected: 122 protected:
123 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType); 123 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType);
124 124
125 virtual bool isValidKind(const AtomicString& kind) const override { return i sValidKindKeyword(kind); } 125 virtual bool isValidKind(const AtomicString& kind) const override { return i sValidKindKeyword(kind); }
126 virtual AtomicString defaultKind() const override { return subtitlesKeyword( ); } 126 virtual AtomicString defaultKind() const override { return subtitlesKeyword( ); }
127 127
128 void addListOfCues(WillBeHeapVector<RefPtrWillBeMember<TextTrackCue>>&);
129
130 private:
128 CueTimeline* cueTimeline() const; 131 CueTimeline* cueTimeline() const;
129 132
133 TextTrackCueList* ensureTextTrackCueList();
130 RefPtrWillBeMember<TextTrackCueList> m_cues; 134 RefPtrWillBeMember<TextTrackCueList> m_cues;
131 135
132 private:
133 VTTRegionList* ensureVTTRegionList(); 136 VTTRegionList* ensureVTTRegionList();
134 RefPtrWillBeMember<VTTRegionList> m_regions; 137 RefPtrWillBeMember<VTTRegionList> m_regions;
135 138
136 TextTrackCueList* ensureTextTrackCueList();
137
138 RawPtrWillBeMember<TextTrackList> m_trackList; 139 RawPtrWillBeMember<TextTrackList> m_trackList;
139 AtomicString m_mode; 140 AtomicString m_mode;
140 TextTrackType m_trackType; 141 TextTrackType m_trackType;
141 ReadinessState m_readinessState; 142 ReadinessState m_readinessState;
142 int m_trackIndex; 143 int m_trackIndex;
143 int m_renderedTrackIndex; 144 int m_renderedTrackIndex;
144 bool m_hasBeenConfigured; 145 bool m_hasBeenConfigured;
145 }; 146 };
146 147
147 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack); 148 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack);
148 149
149 } // namespace blink 150 } // namespace blink
150 151
151 #endif // TextTrack_h 152 #endif // TextTrack_h
OLDNEW
« no previous file with comments | « Source/core/html/track/LoadableTextTrack.cpp ('k') | Source/core/html/track/TextTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698