Remove unsafe mode to enable es3 api by default for WebGL2 and ES3 context

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/feature_info.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
@@ skipping 181 matching lines @@
 void FeatureInfo::InitializeBasicState(const base::CommandLine* command_line) {
   if (!command_line)
     return;
 
   feature_flags_.enable_shader_name_hashing =
       !command_line->HasSwitch(switches::kDisableShaderNameHashing);
 
   feature_flags_.is_swiftshader =
       (command_line->GetSwitchValueASCII(switches::kUseGL) == "swiftshader");
 
-  enable_unsafe_es3_apis_switch_ =
-      command_line->HasSwitch(switches::kEnableUnsafeES3APIs);
+  enable_es3_apis_switch_ = true;
+
+  // enable_unsafe_es3_apis_switch_ =
+  //    command_line->HasSwitch(switches::kEnableUnsafeES3APIs);
 
   // The shader translator is needed to translate from WebGL-conformant GLES SL
   // to normal GLES SL, enforce WebGL conformance, translate from GLES SL 1.0 to
   // target context GLSL, implement emulation of OpenGL ES features on OpenGL,
   // etc.
   // The flag here is for testing only.
   disable_shader_translator_ =
       command_line->HasSwitch(switches::kDisableGLSLTranslator);
 
-  unsafe_es3_apis_enabled_ = false;
+  es3_apis_enabled_ = false;
 
   // Default context_type_ to a GLES2 Context.
   context_type_ = CONTEXT_TYPE_OPENGLES2;
 
   chromium_color_buffer_float_rgba_available_ = false;
   chromium_color_buffer_float_rgb_available_ = false;
   ext_color_buffer_float_available_ = false;
   oes_texture_float_linear_available_ = false;
   oes_texture_half_float_linear_available_ = false;
 }
@@ skipping 1173 matching lines @@
 
   if (gl_version_info_->IsLowerThanGL(4, 3)) {
     // crbug.com/481184.
     // GL_PRIMITIVE_RESTART_FIXED_INDEX is only available on Desktop GL 4.3+,
     // but we emulate ES 3.0 on top of Desktop GL 4.2+.
     feature_flags_.emulate_primitive_restart_fixed_index = true;
   }
 }
 
 bool FeatureInfo::IsES3Capable() const {
-  if (!enable_unsafe_es3_apis_switch_)
+  // if (!enable_unsafe_es3_apis_switch_)
+  //  return false;
+  if (!enable_es3_apis_switch_)
     return false;
+  if (context_type_ != CONTEXT_TYPE_WEBGL2 &&
+      context_type_ != CONTEXT_TYPE_OPENGLES3)
+    return false;
+
   if (workarounds_.disable_texture_storage)
     return false;
   if (gl_version_info_)
     return gl_version_info_->is_es3_capable;
   return false;
 }
 
 void FeatureInfo::EnableES3Validators() {
   DCHECK(IsES3Capable());
   validators_.UpdateValuesES3();
@@ skipping 51 matching lines @@
     GL_DRAW_BUFFER13,
     GL_DRAW_BUFFER14,
     GL_DRAW_BUFFER15,
   };
   if (max_draw_buffers < kTotalDrawBufferEnums) {
     validators_.g_l_state.RemoveValues(
         kDrawBuffers + max_draw_buffers,
         kTotalDrawBufferEnums - max_draw_buffers);
   }
 
-  unsafe_es3_apis_enabled_ = true;
+  es3_apis_enabled_ = true;
 }
 
 bool FeatureInfo::IsWebGLContext() const {
   // Switch statement to cause a compile-time error if we miss a case.
   switch (context_type_) {
     case CONTEXT_TYPE_WEBGL1:
     case CONTEXT_TYPE_WEBGL2:
       return true;
     case CONTEXT_TYPE_OPENGLES2:
     case CONTEXT_TYPE_OPENGLES3:
@@ skipping 46 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu