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 724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
735 if (gpu_preferences) { | 735 if (gpu_preferences) { |
736 gpu_preferences->disable_accelerated_video_decode = true; | 736 gpu_preferences->disable_accelerated_video_decode = true; |
737 } else { | 737 } else { |
738 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); | 738 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
739 } | 739 } |
740 } | 740 } |
741 | 741 |
742 #if defined(OS_WIN) | 742 #if defined(OS_WIN) |
743 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && | 743 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && |
744 gpu_preferences) { | 744 gpu_preferences) { |
745 gpu_preferences->enable_accelerated_vpx_decode = false; | 745 gpu_preferences->enable_accelerated_vpx_decode = |
| 746 gpu::GpuPreferences::VPX_VENDOR_NONE; |
746 } | 747 } |
747 #endif | 748 #endif |
748 | 749 |
749 #if defined(ENABLE_WEBRTC) | 750 #if defined(ENABLE_WEBRTC) |
750 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && | 751 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
751 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { | 752 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { |
752 if (gpu_preferences) { | 753 if (gpu_preferences) { |
753 gpu_preferences->disable_web_rtc_hw_encoding = true; | 754 gpu_preferences->disable_web_rtc_hw_encoding = true; |
754 } else { | 755 } else { |
755 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); | 756 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1297 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1298 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
1298 #if defined(OS_WIN) | 1299 #if defined(OS_WIN) |
1299 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1300 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
1300 #endif | 1301 #endif |
1301 complete_gpu_info_already_requested_ = true; | 1302 complete_gpu_info_already_requested_ = true; |
1302 // Some observers might be waiting. | 1303 // Some observers might be waiting. |
1303 NotifyGpuInfoUpdate(); | 1304 NotifyGpuInfoUpdate(); |
1304 } | 1305 } |
1305 | 1306 |
1306 } // namespace content | 1307 } // namespace content |
OLD | NEW |