Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: content/renderer/render_thread_impl.cc

Issue 1308913003: Re-land: Enable GpuMemoryBuffers video frames on MacOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 585d5f1a1679a994fe95f5db6d2784d997ce4da8..0e96880995d1520d3dd26ff410cf20e86043bae9 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1354,7 +1354,11 @@ RenderThreadImpl::GetGpuFactories() {
const bool enable_video_accelerator =
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
const bool enable_gpu_memory_buffer_video_frames =
+#if defined(OS_MACOSX)
+ !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
+#else
cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
+#endif
std::string image_texture_target_string =
cmd_line->GetSwitchValueASCII(switches::kVideoImageTextureTarget);
unsigned image_texture_target = 0;
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698