| 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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 } | 734 } |
| 735 | 735 |
| 736 if (ShouldDisableAcceleratedVideoDecode(command_line)) { | 736 if (ShouldDisableAcceleratedVideoDecode(command_line)) { |
| 737 if (gpu_preferences) { | 737 if (gpu_preferences) { |
| 738 gpu_preferences->disable_accelerated_video_decode = true; | 738 gpu_preferences->disable_accelerated_video_decode = true; |
| 739 } else { | 739 } else { |
| 740 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); | 740 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); |
| 741 } | 741 } |
| 742 } | 742 } |
| 743 | 743 |
| 744 if (gpu_driver_bugs_.find(gpu::CREATE_DEFAULT_GL_CONTEXT) != |
| 745 gpu_driver_bugs_.end()) { |
| 746 command_line->AppendSwitch(switches::kCreateDefaultGLContext); |
| 747 } |
| 748 |
| 744 #if defined(OS_WIN) | 749 #if defined(OS_WIN) |
| 745 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && | 750 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) && |
| 746 gpu_preferences) { | 751 gpu_preferences) { |
| 747 gpu_preferences->enable_accelerated_vpx_decode = | 752 gpu_preferences->enable_accelerated_vpx_decode = |
| 748 gpu::GpuPreferences::VPX_VENDOR_NONE; | 753 gpu::GpuPreferences::VPX_VENDOR_NONE; |
| 749 } | 754 } |
| 750 #endif | 755 #endif |
| 751 | 756 |
| 752 #if defined(ENABLE_WEBRTC) | 757 #if defined(ENABLE_WEBRTC) |
| 753 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && | 758 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && |
| (...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; | 1294 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; |
| 1290 #if defined(OS_WIN) | 1295 #if defined(OS_WIN) |
| 1291 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; | 1296 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; |
| 1292 #endif | 1297 #endif |
| 1293 complete_gpu_info_already_requested_ = true; | 1298 complete_gpu_info_already_requested_ = true; |
| 1294 // Some observers might be waiting. | 1299 // Some observers might be waiting. |
| 1295 NotifyGpuInfoUpdate(); | 1300 NotifyGpuInfoUpdate(); |
| 1296 } | 1301 } |
| 1297 | 1302 |
| 1298 } // namespace content | 1303 } // namespace content |
| OLD | NEW |