| 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 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 disabled_extensions_); | 736 disabled_extensions_); |
| 737 } | 737 } |
| 738 | 738 |
| 739 if (ShouldDisableAcceleratedVideoDecode(command_line)) { | 739 if (ShouldDisableAcceleratedVideoDecode(command_line)) { |
| 740 if (gpu_preferences) { | 740 if (gpu_preferences) { |
| 741 gpu_preferences->disable_accelerated_video_decode = true; | 741 gpu_preferences->disable_accelerated_video_decode = true; |
| 742 } else { | 742 } else { |
| 743 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); | 743 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
| 744 } | 744 } |
| 745 } | 745 } |
| 746 |
| 747 #if defined(OS_WIN) |
| 748 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && |
| 749 gpu_preferences) { |
| 750 gpu_preferences->enable_accelerated_vpx_decode = false; |
| 751 } |
| 752 #endif |
| 753 |
| 746 #if defined(ENABLE_WEBRTC) | 754 #if defined(ENABLE_WEBRTC) |
| 747 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && | 755 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
| 748 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { | 756 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { |
| 749 if (gpu_preferences) { | 757 if (gpu_preferences) { |
| 750 gpu_preferences->disable_web_rtc_hw_encoding = true; | 758 gpu_preferences->disable_web_rtc_hw_encoding = true; |
| 751 } else { | 759 } else { |
| 752 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); | 760 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
| 753 } | 761 } |
| 754 } | 762 } |
| 755 #endif | 763 #endif |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1297 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1290 #if defined(OS_WIN) | 1298 #if defined(OS_WIN) |
| 1291 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1299 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1292 #endif | 1300 #endif |
| 1293 complete_gpu_info_already_requested_ = true; | 1301 complete_gpu_info_already_requested_ = true; |
| 1294 // Some observers might be waiting. | 1302 // Some observers might be waiting. |
| 1295 NotifyGpuInfoUpdate(); | 1303 NotifyGpuInfoUpdate(); |
| 1296 } | 1304 } |
| 1297 | 1305 |
| 1298 } // namespace content | 1306 } // namespace content |
| OLD | NEW |