remove 'unsafe' from ES3 apis in gpu process

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 681 matching lines @@
     base::CommandLine* command_line,
     gpu::GpuPreferences* gpu_preferences) const {
   DCHECK(command_line);
 
   std::string use_gl =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kUseGL);
   if (gpu_driver_bugs_.find(gpu::DISABLE_D3D11) != gpu_driver_bugs_.end())
     command_line->AppendSwitch(switches::kDisableD3D11);
   if (gpu_driver_bugs_.find(gpu::DISABLE_ES3_GL_CONTEXT) !=
-      gpu_driver_bugs_.end()) {
-    command_line->AppendSwitch(switches::kDisableES3GLContext);
+      gpu_driver_bugs_.end() && gpu_preferences) {
+    gpu_preferences->enable_unsafe_es3_apis = false;

[Zhenyao Mo, 2016/11/02 21:46:28]

Sorry I might mislead you. This switch is handling underlying GL context,
whereas GpuPreferences is handling command buffer context type. The former
enforces the latter, but not vice versa, so I think we still need to pass down
the kDisableES3GLContext.

   }
   if (gpu_driver_bugs_.find(gpu::DISABLE_DIRECT_COMPOSITION) !=
       gpu_driver_bugs_.end()) {
     command_line->AppendSwitch(switches::kDisableDirectComposition);
   }
   if (use_swiftshader_) {
     command_line->AppendSwitchASCII(switches::kUseGL, "swiftshader");
   } else if ((IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL) ||
               IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_GPU_COMPOSITING) ||
               IsFeatureBlacklisted(
@@ skipping 44 matching lines @@
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
       !command_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
     if (gpu_preferences) {
       gpu_preferences->disable_web_rtc_hw_encoding = true;
     } else {
       command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
     }
   }
 #endif
 
-  if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2) &&
-      !command_line->HasSwitch(switches::kDisableES3APIs)) {
-    command_line->AppendSwitch(switches::kDisableES3APIs);
+  if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2) && gpu_preferences) {
+    gpu_preferences->enable_unsafe_es3_apis = false;
   }
 
   // Pass GPU and driver information to GPU process. We try to avoid full GPU
   // info collection at GPU process startup, but we need gpu vendor_id,
   // device_id, driver_vendor, driver_version for deciding whether we need to
   // collect full info (on Linux) and for crash reporting purpose.
   command_line->AppendSwitchASCII(switches::kGpuVendorID,
       base::StringPrintf("0x%04x", gpu_info_.gpu.vendor_id));
   command_line->AppendSwitchASCII(switches::kGpuDeviceID,
       base::StringPrintf("0x%04x", gpu_info_.gpu.device_id));
@@ skipping 518 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content