content/renderer/render_thread_impl.cc - Issue 1972783002: Disable GMB VideoFrames if GPU compositing is disabled.

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/renderer/render_thread_impl.cc

Issue 1972783002: Disable GMB VideoFrames if GPU compositing is disabled. (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

Index: content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc

index 6e70356bec8bcb95a2751500dd1281b0fbcfa79f..a13f459c67d3db5e1a0e62fbeb44462ad88a83ee 100644

--- a/content/renderer/render_thread_impl.cc

+++ b/content/renderer/render_thread_impl.cc

@@ -1423,7 +1423,8 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() {

!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);

const bool enable_gpu_memory_buffer_video_frames =

#if defined(OS_MACOSX) || defined(OS_LINUX)

- !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);

+ !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&

+ !cmd_line->HasSwitch(switches::kDisableGpuCompositing);

danakj 2016/05/12 01:00:08 We also don't use gpu compositing when the channel

#else

cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);

#endif

« no previous file with comments | « no previous file | no next file » | no next file with comments »