third_party/WebKit/Source/core/html/track/CueTimeline.cpp - Issue 2003433005: Reland "media/track: Replace wtf/Assertions.h macros in favor of base/logging.h macros"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/track/CueTimeline.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

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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());