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

Unified Diff: Source/core/html/track/TextTrackList.cpp

Issue 606703002: Comply (more) with check-webkit-style in and around HTMLMediaElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | Source/core/html/track/vtt/VTTElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/track/TextTrackList.cpp
diff --git a/Source/core/html/track/TextTrackList.cpp b/Source/core/html/track/TextTrackList.cpp
index 9bb7d839e676ff158def7e21dafc31391c477a3c..2db68ff0c1833724167bd15b320d3b0c01c9a5c6 100644
--- a/Source/core/html/track/TextTrackList.cpp
+++ b/Source/core/html/track/TextTrackList.cpp
@@ -169,10 +169,11 @@ void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
tracks = &m_addTrackTracks;
for (size_t i = 0; i < m_inbandTracks.size(); ++i)
m_inbandTracks[i]->invalidateTrackIndex();
- } else if (track->trackType() == TextTrack::InBand)
+ } else if (track->trackType() == TextTrack::InBand) {
tracks = &m_inbandTracks;
- else
+ } else {
ASSERT_NOT_REACHED();
+ }
size_t index = tracks->find(track);
if (index == kNotFound)
@@ -186,9 +187,9 @@ void TextTrackList::append(PassRefPtrWillBeRawPtr<TextTrack> prpTrack)
{
RefPtrWillBeRawPtr<TextTrack> track = prpTrack;
- if (track->trackType() == TextTrack::AddTrack)
+ if (track->trackType() == TextTrack::AddTrack) {
m_addTrackTracks.append(track);
- else if (track->trackType() == TextTrack::TrackElement) {
+ } else if (track->trackType() == TextTrack::TrackElement) {
// Insert tracks added for <track> element in tree order.
size_t index = static_cast<LoadableTextTrack*>(track.get())->trackElementIndex();
m_elementTracks.insert(index, track);
@@ -196,8 +197,9 @@ void TextTrackList::append(PassRefPtrWillBeRawPtr<TextTrack> prpTrack)
// Insert tracks added for in-band in the media file order.
size_t index = static_cast<InbandTextTrack*>(track.get())->inbandTrackIndex();
m_inbandTracks.insert(index, track);
- } else
+ } else {
ASSERT_NOT_REACHED();
+ }
invalidateTrackIndexesAfterTrack(track.get());
« no previous file with comments | « Source/core/html/shadow/MediaControlElements.cpp ('k') | Source/core/html/track/vtt/VTTElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698