third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp - Issue 1999813002: Revert of 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/vtt/VTTRegion.cpp

Issue 1999813002: Revert of 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: 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/vtt/VTTParser.cpp ('k') | third_party/WebKit/Source/core/html/track/vtt/VTTScanner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp

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

index 40562097aba09e9ac8de07f4bc523e8af170a8d7..9bd6ee829579e93eb09f172a8fd137f95ddcface 100644

--- a/third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp

+++ b/third_party/WebKit/Source/core/html/track/vtt/VTTRegion.cpp

@@ -333,7 +333,7 @@

void VTTRegion::willRemoveVTTCueBox(VTTCueBox* box)

{

DVLOG(VTT_LOG_LEVEL) << "willRemoveVTTCueBox";

- DCHECK(m_cueContainer->contains(box));

+ ASSERT(m_cueContainer->contains(box));

double boxHeight = box->getBoundingClientRect()->bottom() - box->getBoundingClientRect()->top();

@@ -345,7 +345,7 @@

void VTTRegion::appendVTTCueBox(VTTCueBox* displayBox)

{

- DCHECK(m_cueContainer);

+ ASSERT(m_cueContainer);

if (m_cueContainer->contains(displayBox))

return;

@@ -357,7 +357,7 @@

void VTTRegion::displayLastVTTCueBox()

{

DVLOG(VTT_LOG_LEVEL) << "displayLastVTTCueBox";

- DCHECK(m_cueContainer);

+ ASSERT(m_cueContainer);

// FIXME: This should not be causing recalc styles in a loop to set the "top" css

// property to move elements. We should just scroll the text track cues on the

@@ -392,7 +392,7 @@

void VTTRegion::prepareRegionDisplayTree()

{

- DCHECK(m_regionDisplayTree);

+ ASSERT(m_regionDisplayTree);

// 7.2 Prepare region CSS boxes