| 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..d88b7c2ac8689311554e5f85994f6cbd7545d29b 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -1423,7 +1423,9 @@ 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) &&
|
| + !gpu_channel_host->gpu_info().software_rendering;
|
| #else
|
| cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
|
| #endif
|
|
|