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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kUseGL); | 658 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kUseGL); |
659 base::FilePath swiftshader_path = | 659 base::FilePath swiftshader_path = |
660 CommandLine::ForCurrentProcess()->GetSwitchValuePath( | 660 CommandLine::ForCurrentProcess()->GetSwitchValuePath( |
661 switches::kSwiftShaderPath); | 661 switches::kSwiftShaderPath); |
662 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_MULTISAMPLING) && | 662 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_MULTISAMPLING) && |
663 !command_line->HasSwitch(switches::kDisableGLMultisampling)) { | 663 !command_line->HasSwitch(switches::kDisableGLMultisampling)) { |
664 command_line->AppendSwitch(switches::kDisableGLMultisampling); | 664 command_line->AppendSwitch(switches::kDisableGLMultisampling); |
665 } | 665 } |
666 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_TEXTURE_SHARING)) { | 666 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_TEXTURE_SHARING)) { |
667 command_line->AppendSwitch(switches::kDisableImageTransportSurface); | 667 command_line->AppendSwitch(switches::kDisableImageTransportSurface); |
668 reduce_sandbox = true; | |
669 } | 668 } |
670 if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end()) | 669 if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end()) |
671 command_line->AppendSwitch(switches::kDisableD3D11); | 670 command_line->AppendSwitch(switches::kDisableD3D11); |
672 if (use_swiftshader_) { | 671 if (use_swiftshader_) { |
673 command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader"); | 672 command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader"); |
674 if (swiftshader_path.empty()) | 673 if (swiftshader_path.empty()) |
675 swiftshader_path = swiftshader_path_; | 674 swiftshader_path = swiftshader_path_; |
676 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) || | 675 } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) || |
677 IsFeatureBlacklisted( | 676 IsFeatureBlacklisted( |
678 gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) || | 677 gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) || |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1226 | 1225 |
1227 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { | 1226 void GpuDataManagerImplPrivate::OnGpuProcessInitFailure() { |
1228 gpu_process_accessible_ = false; | 1227 gpu_process_accessible_ = false; |
1229 gpu_info_.finalized = true; | 1228 gpu_info_.finalized = true; |
1230 complete_gpu_info_already_requested_ = true; | 1229 complete_gpu_info_already_requested_ = true; |
1231 // Some observers might be waiting. | 1230 // Some observers might be waiting. |
1232 NotifyGpuInfoUpdate(); | 1231 NotifyGpuInfoUpdate(); |
1233 } | 1232 } |
1234 | 1233 |
1235 } // namespace content | 1234 } // namespace content |
OLD | NEW |