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 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 | 746 |
747 #if defined(OS_WIN) | 747 #if defined(OS_WIN) |
748 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && | 748 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && |
749 gpu_preferences) { | 749 gpu_preferences) { |
750 gpu_preferences->enable_accelerated_vpx_decode = false; | 750 gpu_preferences->enable_accelerated_vpx_decode = |
| 751 gpu::GpuPreferences::VPX_VENDOR_NONE; |
751 } | 752 } |
752 #endif | 753 #endif |
753 | 754 |
754 #if defined(ENABLE_WEBRTC) | 755 #if defined(ENABLE_WEBRTC) |
755 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && | 756 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
756 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { | 757 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { |
757 if (gpu_preferences) { | 758 if (gpu_preferences) { |
758 gpu_preferences->disable_web_rtc_hw_encoding = true; | 759 gpu_preferences->disable_web_rtc_hw_encoding = true; |
759 } else { | 760 } else { |
760 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); | 761 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1302 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1303 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1303 #if defined(OS_WIN) | 1304 #if defined(OS_WIN) |
1304 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1305 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1305 #endif | 1306 #endif |
1306 complete_gpu_info_already_requested_ = true; | 1307 complete_gpu_info_already_requested_ = true; |
1307 // Some observers might be waiting. | 1308 // Some observers might be waiting. |
1308 NotifyGpuInfoUpdate(); | 1309 NotifyGpuInfoUpdate(); |
1309 } | 1310 } |
1310 | 1311 |
1311 } // namespace content | 1312 } // namespace content |
OLD | NEW |