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

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

Issue 2003433005: Reland "media/track: Replace wtf/Assertions.h macros in favor of base/logging.h macros" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 7 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
Index: third_party/WebKit/Source/core/html/track/TextTrackList.cpp
diff --git a/third_party/WebKit/Source/core/html/track/TextTrackList.cpp b/third_party/WebKit/Source/core/html/track/TextTrackList.cpp
index 2063d4e3410e13beffdd4b39231507aba569536f..c7ac3c10ff58da7f241ba9dd00a51a1019c07943 100644
--- a/third_party/WebKit/Source/core/html/track/TextTrackList.cpp
+++ b/third_party/WebKit/Source/core/html/track/TextTrackList.cpp
@@ -61,7 +61,7 @@ int TextTrackList::getTrackIndex(TextTrack *textTrack)
if (textTrack->trackType() == TextTrack::InBand)
return m_elementTracks.size() + m_addTrackTracks.size() + m_inbandTracks.find(textTrack);
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return -1;
}
@@ -98,7 +98,7 @@ int TextTrackList::getTrackIndexRelativeToRenderedTracks(TextTrack *textTrack)
++trackIndex;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return -1;
}
@@ -159,7 +159,7 @@ void TextTrackList::invalidateTrackIndexesAfterTrack(TextTrack* track)
} else if (track->trackType() == TextTrack::InBand) {
tracks = &m_inbandTracks;
} else {
- ASSERT_NOT_REACHED();
+ NOTREACHED();
}
size_t index = tracks->find(track);
@@ -181,12 +181,12 @@ void TextTrackList::append(TextTrack* track)
} else if (track->trackType() == TextTrack::InBand) {
m_inbandTracks.append(track);
} else {
- ASSERT_NOT_REACHED();
+ NOTREACHED();
}
invalidateTrackIndexesAfterTrack(track);
- ASSERT(!track->trackList());
+ DCHECK(!track->trackList());
track->setTrackList(this);
scheduleAddTrackEvent(track);
@@ -203,7 +203,7 @@ void TextTrackList::remove(TextTrack* track)
} else if (track->trackType() == TextTrack::InBand) {
tracks = &m_inbandTracks;
} else {
- ASSERT_NOT_REACHED();
+ NOTREACHED();
}
size_t index = tracks->find(track);
@@ -212,7 +212,7 @@ void TextTrackList::remove(TextTrack* track)
invalidateTrackIndexesAfterTrack(track);
- ASSERT(track->trackList() == this);
+ DCHECK_EQ(track->trackList(), this);
track->setTrackList(0);
tracks->remove(index);
@@ -239,7 +239,7 @@ bool TextTrackList::contains(TextTrack* track) const
else if (track->trackType() == TextTrack::InBand)
tracks = &m_inbandTracks;
else
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return tracks->find(track) != kNotFound;
}

Powered by Google App Engine
This is Rietveld 408576698