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

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

Issue 913133003: Move text track active list management to CueTimeline (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename to CueTimeline. 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
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 16 matching lines...) Expand all
27 #ifndef TextTrack_h 27 #ifndef TextTrack_h
28 #define TextTrack_h 28 #define TextTrack_h
29 29
30 #include "core/events/EventTarget.h" 30 #include "core/events/EventTarget.h"
31 #include "core/html/track/TrackBase.h" 31 #include "core/html/track/TrackBase.h"
32 #include "platform/heap/Handle.h" 32 #include "platform/heap/Handle.h"
33 #include "wtf/text/WTFString.h" 33 #include "wtf/text/WTFString.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class CueTimeline;
37 class ExceptionState; 38 class ExceptionState;
38 class HTMLMediaElement; 39 class HTMLMediaElement;
39 class TextTrack; 40 class TextTrack;
40 class TextTrackCue; 41 class TextTrackCue;
41 class TextTrackCueList; 42 class TextTrackCueList;
42 class TextTrackList; 43 class TextTrackList;
43 class VTTRegion; 44 class VTTRegion;
44 class VTTRegionList; 45 class VTTRegionList;
45 46
46 class TextTrack : public EventTargetWithInlineData, public TrackBase { 47 class TextTrack : public EventTargetWithInlineData, public TrackBase {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 virtual ExecutionContext* executionContext() const override; 118 virtual ExecutionContext* executionContext() const override;
118 119
119 virtual void trace(Visitor*) override; 120 virtual void trace(Visitor*) override;
120 121
121 protected: 122 protected:
122 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);
123 124
124 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); }
125 virtual AtomicString defaultKind() const override { return subtitlesKeyword( ); } 126 virtual AtomicString defaultKind() const override { return subtitlesKeyword( ); }
126 127
128 CueTimeline* cueTimeline() const;
129
127 RefPtrWillBeMember<TextTrackCueList> m_cues; 130 RefPtrWillBeMember<TextTrackCueList> m_cues;
128 131
129 private: 132 private:
130 VTTRegionList* ensureVTTRegionList(); 133 VTTRegionList* ensureVTTRegionList();
131 RefPtrWillBeMember<VTTRegionList> m_regions; 134 RefPtrWillBeMember<VTTRegionList> m_regions;
132 135
133 TextTrackCueList* ensureTextTrackCueList(); 136 TextTrackCueList* ensureTextTrackCueList();
134 137
135 RawPtrWillBeMember<TextTrackList> m_trackList; 138 RawPtrWillBeMember<TextTrackList> m_trackList;
136 AtomicString m_mode; 139 AtomicString m_mode;
137 TextTrackType m_trackType; 140 TextTrackType m_trackType;
138 ReadinessState m_readinessState; 141 ReadinessState m_readinessState;
139 int m_trackIndex; 142 int m_trackIndex;
140 int m_renderedTrackIndex; 143 int m_renderedTrackIndex;
141 bool m_hasBeenConfigured; 144 bool m_hasBeenConfigured;
142 }; 145 };
143 146
144 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack); 147 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack);
145 148
146 } // namespace blink 149 } // namespace blink
147 150
148 #endif // TextTrack_h 151 #endif // TextTrack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698