content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc - Issue 2250473005: content: Fix Context creation logic in ContextProviderFactoryImpl.

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 2250473005: content: Fix Context creation logic in ContextProviderFactoryImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: run the callback once, fix comments. Created 4 years, 4 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

« content/browser/renderer_host/context_provider_factory_impl_android.cc ('K') | « content/browser/renderer_host/context_provider_factory_impl_android.cc ('k') | ui/android/context_provider_factory.h » ('j') | ui/android/context_provider_factory.h » ('J')
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 ec2da9421027402e975acc7343e727ae020b7532..4a6209187841fd1cad1bd24f067cca8fefa63bca 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

@@ -199,7 +199,12 @@ void VideoCaptureGpuJpegDecoder::EstablishGpuChannelOnUIThread(

const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,

base::WeakPtr<VideoCaptureGpuJpegDecoder> weak_this) {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

- DCHECK(BrowserGpuChannelHostFactory::instance());

+ // If the factory is unavailable, this means we are shutting down.

+ if (!BrowserGpuChannelHostFactory::instance()) {

+ GpuChannelEstablishedOnUIThread(task_runner, weak_this, nullptr);

+ return;

+ }

BrowserGpuChannelHostFactory::instance()->EstablishGpuChannel(

base::Bind(&VideoCaptureGpuJpegDecoder::GpuChannelEstablishedOnUIThread,