remove 'unsafe' from ES3 apis in gpu process

content/browser/gpu/gpu_data_manager_impl_private.cc

Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index ee5ca2594a7ff2af75a81208b61fbe91e78fba8f..29d8ad421210bd18177a30982d8c41e86619bf06 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -699,8 +699,8 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
   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()) {
@@ -765,9 +765,8 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine(
   }
 #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