remove 'unsafe' from ES3 apis in gpu process

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 65 matching lines @@
     return string_set_;
   }
 
  private:
   std::set<std::string> string_set_;
 };
 
 class ScopedPixelUnpackBufferOverride {
  public:
   explicit ScopedPixelUnpackBufferOverride(
-      bool is_es3_capable,
-      ContextType context_type,
+      bool enable_es3,
       GLuint binding_override)
       : orig_binding_(-1) {
-    if (!(context_type == CONTEXT_TYPE_WEBGL1 ||
-          context_type == CONTEXT_TYPE_OPENGLES2) && is_es3_capable) {
+    if (enable_es3) {
       GLint orig_binding;
       glGetIntegerv(GL_PIXEL_UNPACK_BUFFER_BINDING, &orig_binding);
       if (static_cast<GLuint>(orig_binding) != binding_override) {
         glBindBuffer(GL_PIXEL_UNPACK_BUFFER, binding_override);
         orig_binding_ = orig_binding;
       }
     }
   }
 
   ~ScopedPixelUnpackBufferOverride() {
@@ skipping 90 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) &&

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

Per our offline discussion, we need to hook up GpuPreferences with ContextGroup
and decide if we allow ES3/WebGL2 context types there.

-      !command_line->HasSwitch(switches::kDisableES3APIs);
-
   // 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;
 
@@ skipping 127 matching lines @@
   StringSet extensions(gl::GetGLExtensionsFromCurrentContext());
 
   const char* version_str =
       reinterpret_cast<const char*>(glGetString(GL_VERSION));
   const char* renderer_str =
       reinterpret_cast<const char*>(glGetString(GL_RENDERER));
 
   gl_version_info_.reset(
       new gl::GLVersionInfo(version_str, renderer_str, extensions.GetImpl()));
 
-  // TODO(kainino): This call to IsES3Capable is sort of a hack to get some
-  // mocked tests working.
-  ScopedPixelUnpackBufferOverride scoped_pbo_override(
-      IsES3Capable(), context_type_, 0);
+  bool enable_es3 = IsWebGL2OrES3Context();
+
+  ScopedPixelUnpackBufferOverride scoped_pbo_override(enable_es3, 0);
 
   AddExtensionString("GL_ANGLE_translated_shader_source");
   AddExtensionString("GL_CHROMIUM_async_pixel_transfers");
   AddExtensionString("GL_CHROMIUM_bind_uniform_location");
   AddExtensionString("GL_CHROMIUM_command_buffer_query");
   AddExtensionString("GL_CHROMIUM_command_buffer_latency_query");
   AddExtensionString("GL_CHROMIUM_copy_texture");
   AddExtensionString("GL_CHROMIUM_deschedule");
   AddExtensionString("GL_CHROMIUM_get_error_query");
   AddExtensionString("GL_CHROMIUM_lose_context");
@@ skipping 482 matching lines @@
     glBindFramebufferEXT(GL_FRAMEBUFFER, fb_id);
     glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D, tex_id, 0);
     GLenum status_rgba = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, width, width, 0, GL_RGB,
                  GL_FLOAT, NULL);
     GLenum status_rgb = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
 
     // For desktop systems, check to see if we support rendering to the full
     // range of formats supported by EXT_color_buffer_float
-    if (status_rgba == GL_FRAMEBUFFER_COMPLETE && IsES3Capable()) {
+    if (status_rgba == GL_FRAMEBUFFER_COMPLETE && enable_es3) {

[piman, 2016/11/02 22:05:08]

I think we still expose the extension on ES2/WebGL1 contexts, if the underlying
context supports it, don't we?

[Zhenyao Mo, 2016/11/02 22:15:00]

I checked the spec, the ES spec says it's ES3 extension. WebGL spec says it's
WebGL2 extension.  We might revisit in the future, but for now it is spec
compliant.

See:
https://www.khronos.org/registry/webgl/extensions/EXT_color_buffer_float/
https://www.khronos.org/registry/gles/extensions/EXT/EXT_color_buffer_float.txt

       bool full_float_support = true;
 
       glTexImage2D(GL_TEXTURE_2D, 0, GL_R16F, width, width, 0, GL_RED,
           GL_FLOAT, NULL);
       full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
           GL_FRAMEBUFFER_COMPLETE;
       glTexImage2D(GL_TEXTURE_2D, 0, GL_RG16F, width, width, 0, GL_RG,
           GL_FLOAT, NULL);
       full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
           GL_FRAMEBUFFER_COMPLETE;
@@ skipping 31 matching lines @@
         EnableCHROMIUMColorBufferFloatRGBA();
     }
     if (status_rgb == GL_FRAMEBUFFER_COMPLETE) {
       feature_flags_.chromium_color_buffer_float_rgb = true;
       if (!disallowed_features_.chromium_color_buffer_float_rgb)
         EnableCHROMIUMColorBufferFloatRGB();
     }
   }
 
   // Enable the GL_EXT_color_buffer_float extension for WebGL 2.0
-  if (enable_ext_color_buffer_float && IsES3Capable()) {
+  if (enable_ext_color_buffer_float && enable_es3) {

[piman, 2016/11/02 22:05:08]

ditto

     ext_color_buffer_float_available_ = true;
     if (!disallowed_features_.ext_color_buffer_float)
       EnableEXTColorBufferFloat();
   }
 
   // Check for multisample support
   if (!workarounds_.disable_chromium_framebuffer_multisample) {
     bool ext_has_multisample =
         extensions.Contains("GL_EXT_framebuffer_multisample") ||
         gl_version_info_->is_es3 ||
@@ skipping 484 matching lines @@
     // 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;
   }
 
   feature_flags_.angle_robust_client_memory =
       extensions.Contains("GL_ANGLE_robust_client_memory");
 }
 
 bool FeatureInfo::IsES3Capable() const {
-  if (!enable_unsafe_es3_apis_switch_)
-    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 126 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu