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

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

Issue 2003543002: 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/CueTimeline.cpp
diff --git a/third_party/WebKit/Source/core/html/track/CueTimeline.cpp b/third_party/WebKit/Source/core/html/track/CueTimeline.cpp
index b3659154eef9e3ae1e6872076110871e17be8834..5fff2f514e232f3b4dfc4099112e64fe3f14a025 100644
--- a/third_party/WebKit/Source/core/html/track/CueTimeline.cpp
+++ b/third_party/WebKit/Source/core/html/track/CueTimeline.cpp
@@ -24,7 +24,7 @@ CueTimeline::CueTimeline(HTMLMediaElement& mediaElement)
void CueTimeline::addCues(TextTrack* track, const TextTrackCueList* cues)
{
- ASSERT(track->mode() != TextTrack::disabledKeyword());
+ DCHECK_NE(track->mode(), TextTrack::disabledKeyword());
for (size_t i = 0; i < cues->length(); ++i)
addCueInternal(cues->anonymousIndexedGetter(i));
updateActiveCues(mediaElement().currentTime());
@@ -32,7 +32,7 @@ void CueTimeline::addCues(TextTrack* track, const TextTrackCueList* cues)
void CueTimeline::addCue(TextTrack* track, TextTrackCue* cue)
{
- ASSERT(track->mode() != TextTrack::disabledKeyword());
+ DCHECK_NE(track->mode(), TextTrack::disabledKeyword());
addCueInternal(cue);
updateActiveCues(mediaElement().currentTime());
}
@@ -72,7 +72,7 @@ void CueTimeline::removeCueInternal(TextTrackCue* cue)
size_t index = m_currentlyActiveCues.find(interval);
if (index != kNotFound) {
- ASSERT(cue->isActive());
+ DCHECK(cue->isActive());
m_currentlyActiveCues.remove(index);
cue->setIsActive(false);
// Since the cue will be removed from the media element and likely the
@@ -320,7 +320,7 @@ void CueTimeline::updateActiveCues(double movieTime)
// simple event named cuechange at the track element as well.
if (affectedTracks[i]->trackType() == TextTrack::TrackElement) {
HTMLTrackElement* trackElement = static_cast<LoadableTextTrack*>(affectedTracks[i].get())->trackElement();
- ASSERT(trackElement);
+ DCHECK(trackElement);
mediaElement.scheduleEvent(createEventWithTarget(EventTypeNames::cuechange, trackElement));
}
}
@@ -351,7 +351,7 @@ void CueTimeline::beginIgnoringUpdateRequests()
void CueTimeline::endIgnoringUpdateRequests()
{
- ASSERT(m_ignoreUpdate);
+ DCHECK(m_ignoreUpdate);
--m_ignoreUpdate;
if (!m_ignoreUpdate)
updateActiveCues(mediaElement().currentTime());
« no previous file with comments | « third_party/WebKit/Source/core/html/track/CueTimeline.h ('k') | third_party/WebKit/Source/core/html/track/InbandTextTrack.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698