content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc - Issue 1312843012: Use DCHECK_CURRENTLY_ON in content/

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: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

Issue 1312843012: Use DCHECK_CURRENTLY_ON in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: revert bad search/replace Created 5 years, 3 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 | « content/browser/media/capture/web_contents_video_capture_device_unittest.cc ('k') | content/browser/tracing/tracing_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

diff --git a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

index 434846de5852d45122889efe88c90bb46c08c33e..12ead3c6a7136dcd3e13c3a97bbd28111bebcb70 100644

--- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

+++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc

@@ -154,7 +154,7 @@ void VideoCaptureGpuJpegDecoder::DecodeCapturedData(

}

void VideoCaptureGpuJpegDecoder::VideoFrameReady(int32_t bitstream_buffer_id) {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

+ DCHECK_CURRENTLY_ON(BrowserThread::IO);

TRACE_EVENT0("jpeg", "VideoCaptureGpuJpegDecoder::VideoFrameReady");

base::AutoLock lock(lock_);

@@ -180,7 +180,7 @@ void VideoCaptureGpuJpegDecoder::VideoFrameReady(int32_t bitstream_buffer_id) {

void VideoCaptureGpuJpegDecoder::NotifyError(

int32_t bitstream_buffer_id,

media::JpegDecodeAccelerator::Error error) {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

+ DCHECK_CURRENTLY_ON(BrowserThread::IO);

LOG(ERROR) << "Decode error, bitstream_buffer_id=" << bitstream_buffer_id

<< ", error=" << error;

@@ -193,7 +193,7 @@ void VideoCaptureGpuJpegDecoder::NotifyError(

void VideoCaptureGpuJpegDecoder::EstablishGpuChannelOnUIThread(

const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,

base::WeakPtr<VideoCaptureGpuJpegDecoder> weak_this) {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

DCHECK(BrowserGpuChannelHostFactory::instance());

BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(

@@ -206,7 +206,7 @@ void VideoCaptureGpuJpegDecoder::EstablishGpuChannelOnUIThread(

void VideoCaptureGpuJpegDecoder::GpuChannelEstablishedOnUIThread(

const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,

base::WeakPtr<VideoCaptureGpuJpegDecoder> weak_this) {

- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

+ DCHECK_CURRENTLY_ON(BrowserThread::UI);

scoped_refptr<GpuChannelHost> gpu_channel_host(

BrowserGpuChannelHostFactory::instance()->GetGpuChannel());