Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" | 5 #include "content/browser/gpu/gpu_data_manager_impl_private.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 676 DCHECK(command_line); | 676 DCHECK(command_line); |
| 677 | 677 |
| 678 if (ShouldDisableAcceleratedVideoDecode(command_line)) | 678 if (ShouldDisableAcceleratedVideoDecode(command_line)) |
| 679 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); | 679 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
| 680 #if defined(ENABLE_WEBRTC) | 680 #if defined(ENABLE_WEBRTC) |
| 681 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && | 681 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
| 682 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) | 682 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) |
| 683 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); | 683 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
| 684 #endif | 684 #endif |
| 685 | 685 |
| 686 // Disable HW encoding by default on Android. | |
| 687 #if defined(ENABLE_WEBRTC) && defined(OS_ANDROID) | |
| 688 if (!command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { | |
| 689 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); | |
| 690 } | |
|
Ken Russell (switch to Gerrit)
2016/10/06 23:23:09
Is there a reason to not just handle this with a n
braveyao
2016/10/06 23:31:05
There was one in software_rendering_list_json.cc w
Ken Russell (switch to Gerrit)
2016/10/07 00:46:51
Yes, please just add the entry back in software_re
braveyao
2016/10/07 00:59:23
Done.
| |
| 691 #endif | |
| 692 | |
| 686 #if defined(USE_AURA) | 693 #if defined(USE_AURA) |
| 687 if (!CanUseGpuBrowserCompositor()) | 694 if (!CanUseGpuBrowserCompositor()) |
| 688 command_line->AppendSwitch(switches::kDisableGpuCompositing); | 695 command_line->AppendSwitch(switches::kDisableGpuCompositing); |
| 689 #endif | 696 #endif |
| 690 } | 697 } |
| 691 | 698 |
| 692 void GpuDataManagerImplPrivate::AppendGpuCommandLine( | 699 void GpuDataManagerImplPrivate::AppendGpuCommandLine( |
| 693 base::CommandLine* command_line, | 700 base::CommandLine* command_line, |
| 694 gpu::GpuPreferences* gpu_preferences) const { | 701 gpu::GpuPreferences* gpu_preferences) const { |
| 695 DCHECK(command_line); | 702 DCHECK(command_line); |
| (...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1290 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1297 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1291 #if defined(OS_WIN) | 1298 #if defined(OS_WIN) |
| 1292 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1299 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1293 #endif | 1300 #endif |
| 1294 complete_gpu_info_already_requested_ = true; | 1301 complete_gpu_info_already_requested_ = true; |
| 1295 // Some observers might be waiting. | 1302 // Some observers might be waiting. |
| 1296 NotifyGpuInfoUpdate(); | 1303 NotifyGpuInfoUpdate(); |
| 1297 } | 1304 } |
| 1298 | 1305 |
| 1299 } // namespace content | 1306 } // namespace content |
| OLD | NEW |