third_party/WebKit/Source/core/html/HTMLVideoElement.cpp - Issue 2001013003: media: 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/HTMLVideoElement.cpp

Issue 2001013003: media: 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 nit 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/HTMLTrackElement.cpp ('k') | third_party/WebKit/Source/core/html/shadow/MediaControlElementTypes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLVideoElement.cpp

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

index ac1257dcc1a0f35381e1aa31b798d7fd08374099..d0fc1db2fb32f93dcf96079b55d90f74aa5dd0d7 100644

--- a/third_party/WebKit/Source/core/html/HTMLVideoElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLVideoElement.cpp

@@ -211,7 +211,7 @@ bool HTMLVideoElement::copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interf

if (!webMediaPlayer())

return false;

- ASSERT(Extensions3DUtil::canUseCopyTextureCHROMIUM(GL_TEXTURE_2D, internalFormat, type, 0));

+ DCHECK(Extensions3DUtil::canUseCopyTextureCHROMIUM(GL_TEXTURE_2D, internalFormat, type, 0));

return webMediaPlayer()->copyVideoTextureToPlatformTexture(gl, texture, internalFormat, type, premultiplyAlpha, flipY);

}

@@ -327,7 +327,7 @@ IntSize HTMLVideoElement::bitmapSourceSize() const

ScriptPromise HTMLVideoElement::createImageBitmap(ScriptState* scriptState, EventTarget& eventTarget, int sx, int sy, int sw, int sh, const ImageBitmapOptions& options, ExceptionState& exceptionState)

{

- ASSERT(eventTarget.toLocalDOMWindow());

+ DCHECK(eventTarget.toLocalDOMWindow());

if (getNetworkState() == HTMLMediaElement::NETWORK_EMPTY) {

exceptionState.throwDOMException(InvalidStateError, "The provided element has not retrieved data.");

return ScriptPromise();