Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Side by Side Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 1129693004: Disabled extensions in bug list now automatically removes the extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added InitializeWithContext() call to unit test Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 if (!swiftshader_path.empty()) { 652 if (!swiftshader_path.empty()) {
653 command_line->AppendSwitchPath(switches::kSwiftShaderPath, 653 command_line->AppendSwitchPath(switches::kSwiftShaderPath,
654 swiftshader_path); 654 swiftshader_path);
655 } 655 }
656 656
657 if (!gpu_driver_bugs_.empty()) { 657 if (!gpu_driver_bugs_.empty()) {
658 command_line->AppendSwitchASCII(switches::kGpuDriverBugWorkarounds, 658 command_line->AppendSwitchASCII(switches::kGpuDriverBugWorkarounds,
659 IntSetToString(gpu_driver_bugs_)); 659 IntSetToString(gpu_driver_bugs_));
660 } 660 }
661 661
662 if (!disabled_extensions_.empty()) {
663 command_line->AppendSwitchASCII(switches::kDisableGLExtensions,
664 disabled_extensions_);
665 }
666
662 if (ShouldDisableAcceleratedVideoDecode(command_line)) { 667 if (ShouldDisableAcceleratedVideoDecode(command_line)) {
663 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode); 668 command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
664 } 669 }
665 #if defined(ENABLE_WEBRTC) 670 #if defined(ENABLE_WEBRTC)
666 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && 671 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
667 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { 672 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
668 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); 673 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
669 } 674 }
670 #endif 675 #endif
671 676
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
1186 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; 1191 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
1187 #if defined(OS_WIN) 1192 #if defined(OS_WIN)
1188 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; 1193 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
1189 #endif 1194 #endif
1190 complete_gpu_info_already_requested_ = true; 1195 complete_gpu_info_already_requested_ = true;
1191 // Some observers might be waiting. 1196 // Some observers might be waiting.
1192 NotifyGpuInfoUpdate(); 1197 NotifyGpuInfoUpdate();
1193 } 1198 }
1194 1199
1195 } // namespace content 1200 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698