Index: content/renderer/render_view_impl.cc |
=================================================================== |
--- content/renderer/render_view_impl.cc (revision 150949) |
+++ content/renderer/render_view_impl.cc (working copy) |
@@ -2407,11 +2407,14 @@ |
// Accelerated video decode is not enabled by default on Linux. |
// crbug.com/137247 |
bool use_accelerated_video_decode = false; |
-#if defined(OS_CHROMEOS) || defined(OS_WIN) |
+#if defined(OS_CHROMEOS) |
use_accelerated_video_decode = true; |
-#endif |
+#elif defined(OS_WIN) |
Ami GONE FROM CHROMIUM
2012/08/13 19:38:28
This isn't necessary (false is the default value a
ananta
2012/08/13 19:43:59
I added the #else to prevent the CommandLine switc
Ami GONE FROM CHROMIUM
2012/08/13 19:51:47
Did you miss that there's an &= in there?
ananta
2012/08/13 19:52:12
Removed the #elif OS_WIN check here. The &= expres
|
+ use_accelerated_video_decode = false; |
+#else |
use_accelerated_video_decode &= !CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableAcceleratedVideoDecode); |
+#endif |
base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> context3d = |
use_accelerated_video_decode ? |
RenderThreadImpl::current()->GetGpuVDAContext3D() : |