Index: content/browser/gpu/gpu_data_manager_impl_private.cc |
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc |
index fec74a25fce39df4c84484480e90bfd0f9ccea02..f585fde92874105e9ba0da5fd73083952f2a86d5 100644 |
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc |
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc |
@@ -646,6 +646,9 @@ void GpuDataManagerImplPrivate::AppendRendererCommandLine( |
if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE) && |
!command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) |
command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
+ if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
+ !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) |
+ command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
xhwang
2013/11/26 18:08:28
Since the if statement spans multiple lines, we sh
Ami GONE FROM CHROMIUM
2013/11/26 19:11:59
I was using the "consistency" overriding style rul
xhwang
2013/11/26 19:19:26
The guide says:
... conditional or loop statement
|
if (use_software_compositor_ && |
!command_line->HasSwitch(switches::kEnableSoftwareCompositing)) |
@@ -713,6 +716,10 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( |
!command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode)) { |
command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
} |
+ if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
+ !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { |
+ command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
+ } |
#if defined(OS_WIN) |
// DisplayLink 7.1 and earlier can cause the GPU process to crash on startup. |