third_party/WebKit/Source/core/html/track/TextTrackCueList.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/TextTrackCueList.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/TextTrackCue.cpp ('k') | third_party/WebKit/Source/core/html/track/TextTrackList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp

diff --git a/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp b/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp

index fd3eaef9e2112741ca629b94ab126838e7ae5bad..5ee268e923a880e4161985b7e8866177a2a751bd 100644

--- a/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp

+++ b/third_party/WebKit/Source/core/html/track/TextTrackCueList.cpp

@@ -67,8 +67,8 @@ void TextTrackCueList::collectActiveCues(TextTrackCueList& activeCues) const

bool TextTrackCueList::add(TextTrackCue* cue)

{

- ASSERT(cue->startTime() >= 0);

- ASSERT(cue->endTime() >= 0);

+ DCHECK_GE(cue->startTime(), 0);

+ DCHECK_GE(cue->endTime(), 0);

// Maintain text track cue order:

// https://html.spec.whatwg.org/#text-track-cue-order

@@ -95,7 +95,7 @@ size_t TextTrackCueList::findInsertionIndex(const TextTrackCue* cueToInsert) con

{

auto it = std::upper_bound(m_list.begin(), m_list.end(), cueToInsert, cueIsBefore);

size_t index = safeCast<size_t>(it - m_list.begin());

- ASSERT_WITH_SECURITY_IMPLICATION(index <= m_list.size());

+ SECURITY_DCHECK(index <= m_list.size());

return index;

}