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

Side by Side Diff: Source/core/html/track/TextTrackList.cpp

Issue 656723005: Use C++11 features in core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: mike's comments Created 6 years, 1 month 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 | « Source/core/html/track/TextTrackList.h ('k') | Source/core/html/track/TrackListBase.h » ('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, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 if (track->id() == id) 150 if (track->id() == id)
151 return track; 151 return track;
152 } 152 }
153 153
154 // When no tracks match the given argument, the method must return null. 154 // When no tracks match the given argument, the method must return null.
155 return 0; 155 return 0;
156 } 156 }
157 157
158 void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track) 158 void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
159 { 159 {
160 WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0; 160 WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
161 161
162 if (track->trackType() == TextTrack::TrackElement) { 162 if (track->trackType() == TextTrack::TrackElement) {
163 tracks = &m_elementTracks; 163 tracks = &m_elementTracks;
164 for (size_t i = 0; i < m_addTrackTracks.size(); ++i) 164 for (size_t i = 0; i < m_addTrackTracks.size(); ++i)
165 m_addTrackTracks[i]->invalidateTrackIndex(); 165 m_addTrackTracks[i]->invalidateTrackIndex();
166 for (size_t i = 0; i < m_inbandTracks.size(); ++i) 166 for (size_t i = 0; i < m_inbandTracks.size(); ++i)
167 m_inbandTracks[i]->invalidateTrackIndex(); 167 m_inbandTracks[i]->invalidateTrackIndex();
168 } else if (track->trackType() == TextTrack::AddTrack) { 168 } else if (track->trackType() == TextTrack::AddTrack) {
169 tracks = &m_addTrackTracks; 169 tracks = &m_addTrackTracks;
170 for (size_t i = 0; i < m_inbandTracks.size(); ++i) 170 for (size_t i = 0; i < m_inbandTracks.size(); ++i)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 invalidateTrackIndexesAfterTrack(track.get()); 204 invalidateTrackIndexesAfterTrack(track.get());
205 205
206 ASSERT(!track->trackList()); 206 ASSERT(!track->trackList());
207 track->setTrackList(this); 207 track->setTrackList(this);
208 208
209 scheduleAddTrackEvent(track.release()); 209 scheduleAddTrackEvent(track.release());
210 } 210 }
211 211
212 void TextTrackList::remove(TextTrack* track) 212 void TextTrackList::remove(TextTrack* track)
213 { 213 {
214 WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0; 214 WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
215 215
216 if (track->trackType() == TextTrack::TrackElement) { 216 if (track->trackType() == TextTrack::TrackElement) {
217 tracks = &m_elementTracks; 217 tracks = &m_elementTracks;
218 } else if (track->trackType() == TextTrack::AddTrack) { 218 } else if (track->trackType() == TextTrack::AddTrack) {
219 tracks = &m_addTrackTracks; 219 tracks = &m_addTrackTracks;
220 } else if (track->trackType() == TextTrack::InBand) { 220 } else if (track->trackType() == TextTrack::InBand) {
221 tracks = &m_inbandTracks; 221 tracks = &m_inbandTracks;
222 } else { 222 } else {
223 ASSERT_NOT_REACHED(); 223 ASSERT_NOT_REACHED();
224 } 224 }
(...skipping 15 matching lines...) Expand all
240 void TextTrackList::removeAllInbandTracks() 240 void TextTrackList::removeAllInbandTracks()
241 { 241 {
242 for (unsigned i = 0; i < m_inbandTracks.size(); ++i) { 242 for (unsigned i = 0; i < m_inbandTracks.size(); ++i) {
243 m_inbandTracks[i]->setTrackList(0); 243 m_inbandTracks[i]->setTrackList(0);
244 } 244 }
245 m_inbandTracks.clear(); 245 m_inbandTracks.clear();
246 } 246 }
247 247
248 bool TextTrackList::contains(TextTrack* track) const 248 bool TextTrackList::contains(TextTrack* track) const
249 { 249 {
250 const WillBeHeapVector<RefPtrWillBeMember<TextTrack> >* tracks = 0; 250 const WillBeHeapVector<RefPtrWillBeMember<TextTrack>>* tracks = 0;
251 251
252 if (track->trackType() == TextTrack::TrackElement) 252 if (track->trackType() == TextTrack::TrackElement)
253 tracks = &m_elementTracks; 253 tracks = &m_elementTracks;
254 else if (track->trackType() == TextTrack::AddTrack) 254 else if (track->trackType() == TextTrack::AddTrack)
255 tracks = &m_addTrackTracks; 255 tracks = &m_addTrackTracks;
256 else if (track->trackType() == TextTrack::InBand) 256 else if (track->trackType() == TextTrack::InBand)
257 tracks = &m_inbandTracks; 257 tracks = &m_inbandTracks;
258 else 258 else
259 ASSERT_NOT_REACHED(); 259 ASSERT_NOT_REACHED();
260 260
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 333
334 void TextTrackList::trace(Visitor* visitor) 334 void TextTrackList::trace(Visitor* visitor)
335 { 335 {
336 visitor->trace(m_owner); 336 visitor->trace(m_owner);
337 visitor->trace(m_asyncEventQueue); 337 visitor->trace(m_asyncEventQueue);
338 visitor->trace(m_addTrackTracks); 338 visitor->trace(m_addTrackTracks);
339 visitor->trace(m_elementTracks); 339 visitor->trace(m_elementTracks);
340 visitor->trace(m_inbandTracks); 340 visitor->trace(m_inbandTracks);
341 EventTargetWithInlineData::trace(visitor); 341 EventTargetWithInlineData::trace(visitor);
342 } 342 }
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrackList.h ('k') | Source/core/html/track/TrackListBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698