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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2685943004: Remove TextTrack.regions and VTTRegionList (Closed)
Patch Set: Rebase Created 3 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
« no previous file with comments | « third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrack.cpp » ('j') | third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp » ('J')
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 25 matching lines...) Expand all
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class CueTimeline; 39 class CueTimeline;
40 class ExceptionState; 40 class ExceptionState;
41 class HTMLMediaElement; 41 class HTMLMediaElement;
42 class TextTrack; 42 class TextTrack;
43 class TextTrackCue; 43 class TextTrackCue;
44 class TextTrackCueList; 44 class TextTrackCueList;
45 class TextTrackList; 45 class TextTrackList;
46 class VTTRegionList;
47 46
48 class CORE_EXPORT TextTrack : public EventTargetWithInlineData, 47 class CORE_EXPORT TextTrack : public EventTargetWithInlineData,
49 public TrackBase { 48 public TrackBase {
50 DEFINE_WRAPPERTYPEINFO(); 49 DEFINE_WRAPPERTYPEINFO();
51 USING_GARBAGE_COLLECTED_MIXIN(TextTrack); 50 USING_GARBAGE_COLLECTED_MIXIN(TextTrack);
52 51
53 public: 52 public:
54 static TextTrack* create(const AtomicString& kind, 53 static TextTrack* create(const AtomicString& kind,
55 const AtomicString& label, 54 const AtomicString& label,
56 const AtomicString& language) { 55 const AtomicString& language) {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 92
94 TextTrackCueList* cues(); 93 TextTrackCueList* cues();
95 TextTrackCueList* activeCues(); 94 TextTrackCueList* activeCues();
96 95
97 HTMLMediaElement* mediaElement() const; 96 HTMLMediaElement* mediaElement() const;
98 Node* owner() const; 97 Node* owner() const;
99 98
100 void addCue(TextTrackCue*); 99 void addCue(TextTrackCue*);
101 void removeCue(TextTrackCue*, ExceptionState&); 100 void removeCue(TextTrackCue*, ExceptionState&);
102 101
103 VTTRegionList* regions();
104
105 void cueWillChange(TextTrackCue*); 102 void cueWillChange(TextTrackCue*);
106 void cueDidChange(TextTrackCue*); 103 void cueDidChange(TextTrackCue*);
107 104
108 DEFINE_ATTRIBUTE_EVENT_LISTENER(cuechange); 105 DEFINE_ATTRIBUTE_EVENT_LISTENER(cuechange);
109 106
110 enum TextTrackType { TrackElement, AddTrack, InBand }; 107 enum TextTrackType { TrackElement, AddTrack, InBand };
111 TextTrackType trackType() const { return m_trackType; } 108 TextTrackType trackType() const { return m_trackType; }
112 109
113 int trackIndex(); 110 int trackIndex();
114 void invalidateTrackIndex(); 111 void invalidateTrackIndex();
(...skipping 26 matching lines...) Expand all
141 138
142 void addListOfCues(HeapVector<Member<TextTrackCue>>&); 139 void addListOfCues(HeapVector<Member<TextTrackCue>>&);
143 140
144 private: 141 private:
145 CueTimeline* cueTimeline() const; 142 CueTimeline* cueTimeline() const;
146 143
147 TextTrackCueList* ensureTextTrackCueList(); 144 TextTrackCueList* ensureTextTrackCueList();
148 TraceWrapperMember<TextTrackCueList> m_cues; 145 TraceWrapperMember<TextTrackCueList> m_cues;
149 Member<TextTrackCueList> m_activeCues; 146 Member<TextTrackCueList> m_activeCues;
150 147
151 VTTRegionList* ensureVTTRegionList();
152 Member<VTTRegionList> m_regions;
153
154 Member<TextTrackList> m_trackList; 148 Member<TextTrackList> m_trackList;
155 AtomicString m_mode; 149 AtomicString m_mode;
156 TextTrackType m_trackType; 150 TextTrackType m_trackType;
157 ReadinessState m_readinessState; 151 ReadinessState m_readinessState;
158 int m_trackIndex; 152 int m_trackIndex;
159 int m_renderedTrackIndex; 153 int m_renderedTrackIndex;
160 bool m_hasBeenConfigured; 154 bool m_hasBeenConfigured;
161 }; 155 };
162 156
163 DEFINE_TRACK_TYPE_CASTS(TextTrack, WebMediaPlayer::TextTrack); 157 DEFINE_TRACK_TYPE_CASTS(TextTrack, WebMediaPlayer::TextTrack);
164 158
165 } // namespace blink 159 } // namespace blink
166 160
167 #endif // TextTrack_h 161 #endif // TextTrack_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/track/LoadableTextTrack.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrack.cpp » ('j') | third_party/WebKit/Source/core/html/track/vtt/VTTParser.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698