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

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

Issue 2471853002: remove 'unsafe' from ES3 apis in gpu process (Closed)
Patch Set: forgot to save file Created 4 years, 1 month 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/command_buffer/service/context_group.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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) && 758 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
759 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) { 759 !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
760 if (gpu_preferences) { 760 if (gpu_preferences) {
761 gpu_preferences->disable_web_rtc_hw_encoding = true; 761 gpu_preferences->disable_web_rtc_hw_encoding = true;
762 } else { 762 } else {
763 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding); 763 command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
764 } 764 }
765 } 765 }
766 #endif 766 #endif
767 767
768 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2) && 768 if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2) && gpu_preferences) {
769 !command_line->HasSwitch(switches::kDisableES3APIs)) { 769 gpu_preferences->enable_unsafe_es3_apis = false;
770 command_line->AppendSwitch(switches::kDisableES3APIs);
771 } 770 }
772 771
773 // Pass GPU and driver information to GPU process. We try to avoid full GPU 772 // Pass GPU and driver information to GPU process. We try to avoid full GPU
774 // info collection at GPU process startup, but we need gpu vendor_id, 773 // info collection at GPU process startup, but we need gpu vendor_id,
775 // device_id, driver_vendor, driver_version for deciding whether we need to 774 // device_id, driver_vendor, driver_version for deciding whether we need to
776 // collect full info (on Linux) and for crash reporting purpose. 775 // collect full info (on Linux) and for crash reporting purpose.
777 command_line->AppendSwitchASCII(switches::kGpuVendorID, 776 command_line->AppendSwitchASCII(switches::kGpuVendorID,
778 base::StringPrintf("0x%04x", gpu_info_.gpu.vendor_id)); 777 base::StringPrintf("0x%04x", gpu_info_.gpu.vendor_id));
779 command_line->AppendSwitchASCII(switches::kGpuDeviceID, 778 command_line->AppendSwitchASCII(switches::kGpuDeviceID,
780 base::StringPrintf("0x%04x", gpu_info_.gpu.device_id)); 779 base::StringPrintf("0x%04x", gpu_info_.gpu.device_id));
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure; 1298 gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
1300 #if defined(OS_WIN) 1299 #if defined(OS_WIN)
1301 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure; 1300 gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
1302 #endif 1301 #endif
1303 complete_gpu_info_already_requested_ = true; 1302 complete_gpu_info_already_requested_ = true;
1304 // Some observers might be waiting. 1303 // Some observers might be waiting.
1305 NotifyGpuInfoUpdate(); 1304 NotifyGpuInfoUpdate();
1306 } 1305 }
1307 1306
1308 } // namespace content 1307 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer/service/context_group.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698