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

gpu/command_buffer/build_gles2_cmd_buffer.py

Index: gpu/command_buffer/build_gles2_cmd_buffer.py
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 73abad1f079dc51f84a7a6486cd2511d8744f47d..11c3c9c61f80ccfbc24be0daaeda6c83c68ffdee 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -2375,10 +2375,9 @@ _PEPPER_INTERFACES = [
 #               the corresponding feature info flag is enabled. Implies
 #               'extension': True.
 # not_shared:   For GENn types, True if objects can't be shared between contexts
-# unsafe:       True = no validation is implemented on the service side and the
-#               command is only available with --enable-unsafe-es3-apis.
+# es3api:       ES3 API, which is valid in WebGL2 or ES3 context.
 # id_mapping:   A list of resource type names whose client side IDs need to be
-#               mapped to service side IDs.  This is only used for unsafe APIs.
+#               mapped to service side IDs.  This is only used for es3 APIs.
 
 _FUNCTION_INFO = {
   'ActiveTexture': {
@@ -2410,7 +2409,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoBindBufferBase',
     'gen_func': 'GenBuffersARB',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'BindBufferRange': {
     'type': 'Bind',
@@ -2421,7 +2420,7 @@ _FUNCTION_INFO = {
       '3': '4',
       '4': '4'
     },
-    'unsafe': True,
+    'es3api': True,
   },
   'BindFramebuffer': {
     'type': 'Bind',
@@ -2439,7 +2438,7 @@ _FUNCTION_INFO = {
   'BindSampler': {
     'type': 'Bind',
     'decoder_func': 'DoBindSampler',
-    'unsafe': True,
+    'es3api': True,
   },
   'BindTexture': {
     'type': 'Bind',
@@ -2453,7 +2452,7 @@ _FUNCTION_INFO = {
   'BindTransformFeedback': {
     'type': 'Bind',
     'decoder_func': 'DoBindTransformFeedback',
-    'unsafe': True,
+    'es3api': True,
     'unit_test': False,
   },
   'BlitFramebufferCHROMIUM': {
@@ -2499,7 +2498,7 @@ _FUNCTION_INFO = {
     'count': 4,
     'decoder_func': 'DoClearBufferiv',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 2,
   },
   'ClearBufferuiv': {
@@ -2507,7 +2506,7 @@ _FUNCTION_INFO = {
     'count': 4,
     'decoder_func': 'DoClearBufferuiv',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 2,
   },
   'ClearBufferfv': {
@@ -2516,11 +2515,11 @@ _FUNCTION_INFO = {
     'count': 4,
     'decoder_func': 'DoClearBufferfv',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 2,
   },
   'ClearBufferfi': {
-    'unsafe': True,
+    'es3api': True,
     'decoder_func': 'DoClearBufferfi',
     'unit_test': False,
     'trace_level': 2,
@@ -2543,7 +2542,7 @@ _FUNCTION_INFO = {
     'data_transfer_methods': ['shm'],
     'cmd_args': 'GLuint sync, GLbitfieldSyncFlushFlags flags, '
                 'GLuint64 timeout, GLenum* result',
-    'unsafe': True,
+    'es3api': True,
     'result': ['GLenum'],
     'trace_level': 2,
   },
@@ -2566,7 +2565,7 @@ _FUNCTION_INFO = {
   'CopyBufferSubData': {
     'decoder_func': 'DoCopyBufferSubData',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'CoverageModulationCHROMIUM': {
     'type': 'StateSet',
@@ -2629,21 +2628,21 @@ _FUNCTION_INFO = {
     'type': 'Data',
     'data_transfer_methods': ['bucket', 'shm'],
     'decoder_func': 'DoCompressedTexImage3D',
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 1,
   },
   'CompressedTexSubImage3D': {
     'type': 'Data',
     'data_transfer_methods': ['bucket', 'shm'],
     'decoder_func': 'DoCompressedTexSubImage3D',
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 1,
   },
   'CopyTexSubImage3D': {
     'decoder_func': 'DoCopyTexSubImage3D',
     'unit_test': False,
     'defer_reads': True,
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 1,
   },
   'CreateImageCHROMIUM': {
@@ -2781,14 +2780,14 @@ _FUNCTION_INFO = {
     'type': 'DELn',
     'resource_type': 'Sampler',
     'resource_types': 'Samplers',
-    'unsafe': True,
+    'es3api': True,
   },
   'DeleteShader': { 'type': 'Delete' },
   'DeleteSync': {
     'type': 'Delete',
     'cmd_args': 'GLuint sync',
     'resource_type': 'Sync',
-    'unsafe': True,
+    'es3api': True,
   },
   'DeleteTextures': {
     'type': 'DELn',
@@ -2799,7 +2798,7 @@ _FUNCTION_INFO = {
     'type': 'DELn',
     'resource_type': 'TransformFeedback',
     'resource_types': 'TransformFeedbacks',
-    'unsafe': True,
+    'es3api': True,
     'unit_test': False,
   },
   'DepthRangef': {
@@ -2840,7 +2839,7 @@ _FUNCTION_INFO = {
   },
   'DrawRangeElements': {
     'type': 'NoCommand',
-    'unsafe': True,
+    'es3api': True,
   },
   'Enable': {
     'decoder_func': 'DoEnable',
@@ -2855,7 +2854,7 @@ _FUNCTION_INFO = {
     'type': 'Create',
     'client_test': False,
     'decoder_func': 'DoFenceSync',
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 1,
   },
   'Finish': {
@@ -2874,7 +2873,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoFlushMappedBufferRange',
     'trace_level': 1,
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'FramebufferRenderbuffer': {
     'decoder_func': 'DoFramebufferRenderbuffer',
@@ -2897,7 +2896,7 @@ _FUNCTION_INFO = {
   },
   'FramebufferTextureLayer': {
     'decoder_func': 'DoFramebufferTextureLayer',
-    'unsafe': True,
+    'es3api': True,
     'unit_test': False,
     'trace_level': 1,
   },
@@ -2932,7 +2931,7 @@ _FUNCTION_INFO = {
     'gl_test_func': 'glGenSamplers',
     'resource_type': 'Sampler',
     'resource_types': 'Samplers',
-    'unsafe': True,
+    'es3api': True,
   },
   'GenTextures': {
     'type': 'GENn',
@@ -2945,7 +2944,7 @@ _FUNCTION_INFO = {
     'gl_test_func': 'glGenTransformFeedbacks',
     'resource_type': 'TransformFeedback',
     'resource_types': 'TransformFeedbacks',
-    'unsafe': True,
+    'es3api': True,
   },
   'GetActiveAttrib': {
     'type': 'Custom',
@@ -2975,7 +2974,7 @@ _FUNCTION_INFO = {
     'type': 'Custom',
     'data_transfer_methods': ['shm'],
     'result': ['SizedResult<GLint>'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetActiveUniformBlockName': {
     'type': 'Custom',
@@ -2984,7 +2983,7 @@ _FUNCTION_INFO = {
         'GLidProgram program, GLuint index, uint32_t name_bucket_id, '
         'void* result',
     'result': ['int32_t'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetActiveUniformsiv': {
     'type': 'Custom',
@@ -2993,7 +2992,7 @@ _FUNCTION_INFO = {
         'GLidProgram program, uint32_t indices_bucket_id, GLenum pname, '
         'GLint* params',
     'result': ['SizedResult<GLint>'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetAttachedShaders': {
     'type': 'Custom',
@@ -3015,7 +3014,7 @@ _FUNCTION_INFO = {
     'cmd_args': 'GLenumBufferTarget target, GLintptrNotNegative offset, '
                 'GLsizeiptr size, '
                 'uint32_t data_shm_id, uint32_t data_shm_offset',
-    'unsafe': True,
+    'es3api': True,
     'impl_func': False,
     'client_test': False,
     'trace_level': 1,
@@ -3037,7 +3036,7 @@ _FUNCTION_INFO = {
         'GLidProgram program, uint32_t name_bucket_id, GLint* location',
     'result': ['GLint'],
     'error_return': -1,
-    'unsafe': True,
+    'es3api': True,
   },
   'GetBooleanv': {
     'type': 'GETn',
@@ -3051,7 +3050,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoGetBufferParameteri64v',
     'expectation': False,
     'shadowed': True,
-    'unsafe': True,
+    'es3api': True,
   },
   'GetBufferParameteriv': {
     'type': 'GETn',
@@ -3090,7 +3089,7 @@ _FUNCTION_INFO = {
     'client_test': False,
     'decoder_func': 'DoGetInteger64v',
     'gl_test_func': 'glGetIntegerv',
-    'unsafe': True
+    'es3api': True
   },
   'GetIntegerv': {
     'type': 'GETn',
@@ -3105,7 +3104,7 @@ _FUNCTION_INFO = {
     'shadowed': True,
     'client_test': False,
     'unit_test': False,
-    'unsafe': True
+    'es3api': True
   },
   'GetIntegeri_v': {
     'type': 'GETn',
@@ -3114,7 +3113,7 @@ _FUNCTION_INFO = {
     'shadowed': True,
     'client_test': False,
     'unit_test': False,
-    'unsafe': True
+    'es3api': True
   },
   'GetInternalformativ': {
     'type': 'Custom',
@@ -3123,7 +3122,7 @@ _FUNCTION_INFO = {
     'cmd_args':
         'GLenumRenderBufferTarget target, GLenumRenderBufferFormat format, '
         'GLenumInternalFormatParameter pname, GLint* params',
-    'unsafe': True,
+    'es3api': True,
   },
   'GetMaxValueInBufferCHROMIUM': {
     'type': 'Is',
@@ -3166,13 +3165,13 @@ _FUNCTION_INFO = {
     'type': 'GETn',
     'decoder_func': 'DoGetSamplerParameterfv',
     'result': ['SizedResult<GLfloat>'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetSamplerParameteriv': {
     'type': 'GETn',
     'decoder_func': 'DoGetSamplerParameteriv',
     'result': ['SizedResult<GLint>'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetShaderiv': {
     'type': 'GETn',
@@ -3212,14 +3211,14 @@ _FUNCTION_INFO = {
   },
   'GetStringi': {
     'type': 'NoCommand',
-    'unsafe': True,
+    'es3api': True,
   },
   'GetSynciv': {
     'type': 'GETn',
     'cmd_args': 'GLuint sync, GLenumSyncParameter pname, void* values',
     'result': ['SizedResult<GLint>'],
     'id_mapping': ['Sync'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetTexParameterfv': {
     'type': 'GETn',
@@ -3245,7 +3244,7 @@ _FUNCTION_INFO = {
         'GLidProgram program, uint32_t name_bucket_id, GLuint* index',
     'result': ['GLuint'],
     'error_return': 'GL_INVALID_INDEX',
-    'unsafe': True,
+    'es3api': True,
   },
   'GetUniformBlocksCHROMIUM': {
     'type': 'Custom',
@@ -3254,7 +3253,7 @@ _FUNCTION_INFO = {
     'client_test': False,
     'cmd_args': 'GLidProgram program, uint32_t bucket_id',
     'result': ['uint32_t'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetUniformsES3CHROMIUM': {
     'type': 'Custom',
@@ -3263,7 +3262,7 @@ _FUNCTION_INFO = {
     'client_test': False,
     'cmd_args': 'GLidProgram program, uint32_t bucket_id',
     'result': ['uint32_t'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetTransformFeedbackVarying': {
     'type': 'Custom',
@@ -3276,7 +3275,7 @@ _FUNCTION_INFO = {
       'int32_t size',
       'uint32_t type',
     ],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetTransformFeedbackVaryingsCHROMIUM': {
     'type': 'Custom',
@@ -3285,7 +3284,7 @@ _FUNCTION_INFO = {
     'client_test': False,
     'cmd_args': 'GLidProgram program, uint32_t bucket_id',
     'result': ['uint32_t'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetUniformfv': {
     'type': 'Custom',
@@ -3301,7 +3300,7 @@ _FUNCTION_INFO = {
     'type': 'Custom',
     'data_transfer_methods': ['shm'],
     'result': ['SizedResult<GLuint>'],
-    'unsafe': True,
+    'es3api': True,
   },
   'GetUniformIndices': {
     'type': 'Custom',
@@ -3309,7 +3308,7 @@ _FUNCTION_INFO = {
     'result': ['SizedResult<GLuint>'],
     'cmd_args': 'GLidProgram program, uint32_t names_bucket_id, '
                 'GLuint* indices',
-    'unsafe': True,
+    'es3api': True,
   },
   'GetUniformLocation': {
     'type': 'Custom',
@@ -3342,7 +3341,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoGetVertexAttribIiv',
     'expectation': False,
     'client_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'GetVertexAttribIuiv': {
     'type': 'GETn',
@@ -3351,7 +3350,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoGetVertexAttribIuiv',
     'expectation': False,
     'client_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'GetVertexAttribPointerv': {
     'type': 'Custom',
@@ -3365,7 +3364,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoInvalidateFramebuffer',
     'client_test': False,
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'InvalidateSubFramebuffer': {
     'type': 'PUTn',
@@ -3373,7 +3372,7 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoInvalidateSubFramebuffer',
     'client_test': False,
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'IsBuffer': {
     'type': 'Is',
@@ -3411,7 +3410,7 @@ _FUNCTION_INFO = {
     'type': 'Is',
     'decoder_func': 'DoIsSampler',
     'expectation': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'IsSync': {
     'type': 'Is',
@@ -3419,7 +3418,7 @@ _FUNCTION_INFO = {
     'cmd_args': 'GLuint sync',
     'decoder_func': 'DoIsSync',
     'expectation': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'IsTexture': {
     'type': 'Is',
@@ -3430,7 +3429,7 @@ _FUNCTION_INFO = {
     'type': 'Is',
     'decoder_func': 'DoIsTransformFeedback',
     'expectation': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'GetLastFlushIdCHROMIUM': {
     'type': 'NoCommand',
@@ -3467,14 +3466,14 @@ _FUNCTION_INFO = {
                 'GLsizeiptr size, GLbitfieldMapBufferAccess access, '
                 'uint32_t data_shm_id, uint32_t data_shm_offset, '
                 'uint32_t result_shm_id, uint32_t result_shm_offset',
-    'unsafe': True,
+    'es3api': True,
     'result': ['uint32_t'],
     'trace_level': 1,
   },
   'PauseTransformFeedback': {
     'decoder_func': 'DoPauseTransformFeedback',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'PixelStorei': {
     'type': 'Custom',
@@ -3535,7 +3534,7 @@ _FUNCTION_INFO = {
     'trace_level': 1,
   },
   'ReadBuffer': {
-    'unsafe': True,
+    'es3api': True,
     'decoder_func': 'DoReadBuffer',
     'trace_level': 1,
   },
@@ -3570,14 +3569,14 @@ _FUNCTION_INFO = {
   'ResumeTransformFeedback': {
     'decoder_func': 'DoResumeTransformFeedback',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'SamplerParameterf': {
     'valid_args': {
       '2': 'GL_NEAREST'
     },
     'decoder_func': 'DoSamplerParameterf',
-    'unsafe': True,
+    'es3api': True,
   },
   'SamplerParameterfv': {
     'type': 'PUT',
@@ -3586,14 +3585,14 @@ _FUNCTION_INFO = {
     'gl_test_func': 'glSamplerParameterf',
     'decoder_func': 'DoSamplerParameterfv',
     'first_element_only': True,
-    'unsafe': True,
+    'es3api': True,
   },
   'SamplerParameteri': {
     'valid_args': {
       '2': 'GL_NEAREST'
     },
     'decoder_func': 'DoSamplerParameteri',
-    'unsafe': True,
+    'es3api': True,
   },
   'SamplerParameteriv': {
     'type': 'PUT',
@@ -3602,7 +3601,7 @@ _FUNCTION_INFO = {
     'gl_test_func': 'glSamplerParameteri',
     'decoder_func': 'DoSamplerParameteriv',
     'first_element_only': True,
-    'unsafe': True,
+    'es3api': True,
   },
   'ShaderBinary': {
     'type': 'Custom',
@@ -3664,7 +3663,7 @@ _FUNCTION_INFO = {
     'impl_func': False,
     'data_transfer_methods': ['shm'],
     'client_test': False,
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 2,
   },
   'TexParameterf': {
@@ -3696,7 +3695,7 @@ _FUNCTION_INFO = {
     'first_element_only': True,
   },
   'TexStorage3D': {
-    'unsafe': True,
+    'es3api': True,
     'unit_test': False,
     'decoder_func': 'DoTexStorage3D',
     'trace_level': 2,
@@ -3724,7 +3723,7 @@ _FUNCTION_INFO = {
                 'GLsizei width, GLsizei height, GLsizei depth, '
                 'GLenumTextureFormat format, GLenumPixelType type, '
                 'const void* pixels, GLboolean internal',
-    'unsafe': True,
+    'es3api': True,
   },
   'TransformFeedbackVaryings': {
     'type': 'PUTSTR',
@@ -3733,7 +3732,7 @@ _FUNCTION_INFO = {
     'cmd_args':
         'GLuint program, const char** varyings, GLenum buffermode',
     'expectation': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform1f': {'type': 'PUTXn', 'count': 1},
   'Uniform1fv': {
@@ -3752,14 +3751,14 @@ _FUNCTION_INFO = {
     'type': 'PUTXn',
     'count': 1,
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform1uiv': {
     'type': 'PUTn',
     'count': 1,
     'decoder_func': 'DoUniform1uiv',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform2i': {'type': 'PUTXn', 'count': 2},
   'Uniform2f': {'type': 'PUTXn', 'count': 2},
@@ -3777,14 +3776,14 @@ _FUNCTION_INFO = {
     'type': 'PUTXn',
     'count': 2,
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform2uiv': {
     'type': 'PUTn',
     'count': 2,
     'decoder_func': 'DoUniform2uiv',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform3i': {'type': 'PUTXn', 'count': 3},
   'Uniform3f': {'type': 'PUTXn', 'count': 3},
@@ -3802,14 +3801,14 @@ _FUNCTION_INFO = {
     'type': 'PUTXn',
     'count': 3,
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform3uiv': {
     'type': 'PUTn',
     'count': 3,
     'decoder_func': 'DoUniform3uiv',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform4i': {'type': 'PUTXn', 'count': 4},
   'Uniform4f': {'type': 'PUTXn', 'count': 4},
@@ -3827,14 +3826,14 @@ _FUNCTION_INFO = {
     'type': 'PUTXn',
     'count': 4,
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'Uniform4uiv': {
     'type': 'PUTn',
     'count': 4,
     'decoder_func': 'DoUniform4uiv',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'UniformMatrix2fv': {
     'type': 'PUTn',
@@ -3846,13 +3845,13 @@ _FUNCTION_INFO = {
     'type': 'PUTn',
     'count': 6,
     'decoder_func': 'DoUniformMatrix2x3fv',
-    'unsafe': True,
+    'es3api': True,
   },
   'UniformMatrix2x4fv': {
     'type': 'PUTn',
     'count': 8,
     'decoder_func': 'DoUniformMatrix2x4fv',
-    'unsafe': True,
+    'es3api': True,
   },
   'UniformMatrix3fv': {
     'type': 'PUTn',
@@ -3864,13 +3863,13 @@ _FUNCTION_INFO = {
     'type': 'PUTn',
     'count': 6,
     'decoder_func': 'DoUniformMatrix3x2fv',
-    'unsafe': True,
+    'es3api': True,
   },
   'UniformMatrix3x4fv': {
     'type': 'PUTn',
     'count': 12,
     'decoder_func': 'DoUniformMatrix3x4fv',
-    'unsafe': True,
+    'es3api': True,
   },
   'UniformMatrix4fv': {
     'type': 'PUTn',
@@ -3890,18 +3889,18 @@ _FUNCTION_INFO = {
     'type': 'PUTn',
     'count': 8,
     'decoder_func': 'DoUniformMatrix4x2fv',
-    'unsafe': True,
+    'es3api': True,
   },
   'UniformMatrix4x3fv': {
     'type': 'PUTn',
     'count': 12,
     'decoder_func': 'DoUniformMatrix4x3fv',
-    'unsafe': True,
+    'es3api': True,
   },
   'UniformBlockBinding': {
     'type': 'Custom',
     'impl_func': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'UnmapBufferCHROMIUM': {
     'type': 'NoCommand',
@@ -3916,7 +3915,7 @@ _FUNCTION_INFO = {
   },
   'UnmapBuffer': {
     'type': 'Custom',
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 1,
   },
   'UnmapTexSubImage2DCHROMIUM': {
@@ -3955,23 +3954,23 @@ _FUNCTION_INFO = {
     'decoder_func': 'DoVertexAttrib4fv',
   },
   'VertexAttribI4i': {
-    'unsafe': True,
+    'es3api': True,
     'decoder_func': 'DoVertexAttribI4i',
   },
   'VertexAttribI4iv': {
     'type': 'PUT',
     'count': 4,
-    'unsafe': True,
+    'es3api': True,
     'decoder_func': 'DoVertexAttribI4iv',
   },
   'VertexAttribI4ui': {
-    'unsafe': True,
+    'es3api': True,
     'decoder_func': 'DoVertexAttribI4ui',
   },
   'VertexAttribI4uiv': {
     'type': 'PUT',
     'count': 4,
-    'unsafe': True,
+    'es3api': True,
     'decoder_func': 'DoVertexAttribI4uiv',
   },
   'VertexAttribIPointer': {
@@ -3981,7 +3980,7 @@ _FUNCTION_INFO = {
                 'GLenumVertexAttribIType type, GLsizei stride, '
                 'GLuint offset',
     'client_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'VertexAttribPointer': {
     'type': 'Custom',
@@ -3997,7 +3996,7 @@ _FUNCTION_INFO = {
                 'GLuint64 timeout',
     'impl_func': False,
     'client_test': False,
-    'unsafe': True,
+    'es3api': True,
     'trace_level': 1,
   },
   'Scissor': {
@@ -4126,7 +4125,7 @@ _FUNCTION_INFO = {
   'BeginTransformFeedback': {
     'decoder_func': 'DoBeginTransformFeedback',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'EndQueryEXT': {
     'type': 'Custom',
@@ -4140,7 +4139,7 @@ _FUNCTION_INFO = {
   'EndTransformFeedback': {
     'decoder_func': 'DoEndTransformFeedback',
     'unit_test': False,
-    'unsafe': True,
+    'es3api': True,
   },
   'FlushDriverCachesCHROMIUM': {
     'decoder_func': 'DoFlushDriverCachesCHROMIUM',
@@ -4780,7 +4779,7 @@ static_assert(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d,
 
   def WriteHandlerImplementation(self, func, f):
     """Writes the handler implementation for this command."""
-    if func.IsUnsafe() and func.GetInfo('id_mapping'):
+    if func.IsES3API() and func.GetInfo('id_mapping'):
       code_no_gen = """  if (!group_->Get%(type)sServiceId(
         %(var)s, &%(service_var)s)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "%(func)s", "invalid %(var)s id");
@@ -4879,7 +4878,7 @@ static_assert(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d,
 
   def __WriteIdMapping(self, func, f):
     """Writes client side / service side ID mapping."""
-    if not func.IsUnsafe() or not func.GetInfo('id_mapping'):
+    if not func.IsES3API() or not func.GetInfo('id_mapping'):
       return
     for id_type in func.GetInfo('id_mapping'):
       f.write("  group_->Get%sServiceId(%s, &%s);\n" %
@@ -4902,8 +4901,8 @@ static_assert(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d,
     f.write("""error::Error GLES2DecoderImpl::Handle%(name)s(
         uint32_t immediate_data_size, const volatile void* cmd_data) {
       """ % {'name': func.name})
-    if func.IsUnsafe():
-      f.write("""if (!unsafe_es3_apis_enabled())
+    if func.IsES3API():
+      f.write("""if (!es3_apis_enabled())
           return error::kUnknownCommand;
         """)
     if func.GetCmdArgs():
@@ -5069,7 +5068,7 @@ static_assert(offsetof(%(cmd_name)s::Result, %(field_name)s) == %(offset)d,
 
   def WriteInvalidUnitTest(self, func, f, test, *extras):
     """Writes an invalid unit test for the service implementation."""
-    if func.IsUnsafe():
+    if func.IsES3API():
       return
     for invalid_arg_index, invalid_arg in enumerate(func.GetOriginalArgs()):
       # Service implementation does not test constants, as they are not part of
@@ -5138,12 +5137,12 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmds::%(name)s cmd;
   cmd.Init(%(args)s);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
 """
@@ -5155,7 +5154,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
 """
     self.WriteValidUnitTest(func, f, valid_test, *extras)
 
-    if not func.IsUnsafe():
+    if not func.IsES3API():
       invalid_test = """
 TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
   EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
@@ -5803,12 +5802,12 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmds::%(name)s cmd;
   cmd.Init(%(args)s);"""
-      if func.IsUnsafe():
+      if func.IsES3API():
         valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
 """
@@ -5843,12 +5842,12 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmds::%(name)s cmd;
   cmd.Init(%(args)s);"""
-      if func.IsUnsafe():
+      if func.IsES3API():
         valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
 """
@@ -5868,13 +5867,13 @@ TEST_P(%(test_name)s, %(name)sValidArgsNewId) {
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmds::%(name)s cmd;
   cmd.Init(%(args_with_new_id)s);"""
-        if func.IsUnsafe():
+        if func.IsES3API():
           valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_TRUE(Get%(resource_type)s(kNewClientId) != NULL);
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
 """
@@ -5960,7 +5959,7 @@ TEST_F(GLES2ImplementationTest, %(name)s) {
 
   gl_->%(name)s(%(args)s);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));"""
-    if not func.IsUnsafe():
+    if not func.IsES3API():
       code += """
   ClearCommands();
   gl_->%(name)s(%(args)s);
@@ -6099,9 +6098,9 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   cmds::%(name)s* cmd = GetImmediateAs<cmds::%(name)s>();
   GLuint temp = kNewClientId;
   SpecializedSetup<cmds::%(name)s, 0>(true);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   cmd->Init(1, &temp);
   EXPECT_EQ(error::kNoError,
@@ -6119,9 +6118,9 @@ TEST_P(%(test_name)s, %(name)sDuplicateOrNullIds) {
   cmds::%(name)s* cmd = GetImmediateAs<cmds::%(name)s>();
   GLuint temp[3] = {kNewClientId, kNewClientId + 1, kNewClientId};
   SpecializedSetup<cmds::%(name)s, 1>(true);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       duplicate_id_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     duplicate_id_test += """
   cmd->Init(3, temp);
   EXPECT_EQ(error::kInvalidArguments,
@@ -6144,12 +6143,12 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs) {
   cmds::%(name)s* cmd = GetImmediateAs<cmds::%(name)s>();
   SpecializedSetup<cmds::%(name)s, 0>(false);
   cmd->Init(1, &client_%(resource_name)s_id_);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       invalid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kInvalidArguments,
             ExecuteImmediateCmd(*cmd, sizeof(&client_%(resource_name)s_id_)));
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
 }
 """
     else:
@@ -6276,18 +6275,18 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmds::%(name)s cmd;
   cmd.Init(%(args)s%(comma)skNewClientId);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
   %(return_type)s service_id = 0;
   EXPECT_TRUE(Get%(resource_type)sServiceId(kNewClientId, &service_id));
   EXPECT_EQ(%(const_service_id)s, service_id);
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 }
 """
@@ -6332,7 +6331,7 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
 
   def WriteHandlerImplementation (self, func, f):
     """Overrriden from TypeHandler."""
-    if func.IsUnsafe():
+    if func.IsES3API():
       code = """  uint32_t client_id = c.client_id;
   %(return_type)s service_id = 0;
   if (group_->Get%(resource_name)sServiceId(client_id, &service_id)) {
@@ -6398,7 +6397,7 @@ class DeleteHandler(TypeHandler):
 
   def WriteServiceImplementation(self, func, f):
     """Overrriden from TypeHandler."""
-    if func.IsUnsafe():
+    if func.IsES3API():
       TypeHandler.WriteServiceImplementation(self, func, f)
     # HandleDeleteShader and HandleDeleteProgram are manually written.
     pass
@@ -6505,9 +6504,9 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   cmds::%(name)s& cmd = *GetImmediateAs<cmds::%(name)s>();
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmd.Init(1, &client_%(resource_name)s_id_);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(client_%(resource_name)s_id_)));
@@ -6526,12 +6525,12 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs) {
   SpecializedSetup<cmds::%(name)s, 0>(false);
   GLuint temp = kInvalidClientId;
   cmd.Init(1, &temp);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       invalid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
 }
@@ -6916,18 +6915,18 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   result->size = 0;
   cmds::%(name)s cmd;
   cmd.Init(%(cmd_args)s);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(decoder_->GetGLES2Util()->GLGetNumValuesReturned(
                 %(valid_pname)s),
             result->GetNumResults());
   EXPECT_EQ(GL_NO_ERROR, GetGLError());"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));"""
     valid_test += """
 }
@@ -6968,7 +6967,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
         'valid_pname': valid_pname,
       }, *extras)
 
-    if not func.IsUnsafe():
+    if not func.IsES3API():
       invalid_test = """
 TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
   EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
@@ -7059,16 +7058,16 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   EXPECT_CALL(
       *gl_,
       %(gl_func_name)s(%(gl_args)s, %(expectation)s));"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand,
             ExecuteImmediateCmd(cmd, sizeof(temp)));"""
     valid_test += """
@@ -7101,7 +7100,7 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
     invalid_test = """
 TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
   cmds::%(name)s& cmd = *GetImmediateAs<cmds::%(name)s>();"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       invalid_test += """
   EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_any_args)s, _)).Times(1);
 """
@@ -7113,12 +7112,12 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
   SpecializedSetup<cmds::%(name)s, 0>(false);
   %(data_type)s temp[%(data_count)s] = { %(data_value)s, };
   cmd.Init(%(all_but_last_args)s, &temp[0]);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       invalid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::%(parse_result)s,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
 }
 """
     else:
@@ -7392,16 +7391,16 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
       %(gl_func_name)s(%(gl_args)s,
           PointsToArray(temp, %(data_count)s)));
   cmd.Init(%(args)s, &temp[0]);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   EXPECT_EQ(error::kNoError,
             ExecuteImmediateCmd(cmd, sizeof(temp)));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand,
             ExecuteImmediateCmd(cmd, sizeof(temp)));"""
     valid_test += """
@@ -7927,11 +7926,11 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   SetBucketAsCStrings(kBucketId, 1, kSource, 1, kValidStrEnd);
   cmds::%(name)s cmd;
   cmd.Init(%(cmd_args)s);
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       test += """
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
 """
     test += """
@@ -7948,7 +7947,7 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs) {
   const char kSource0[] = "hello";
   const char* kSource[] = { kSource0 };
   const char kValidStrEnd = 0;
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   cmds::%(name)s cmd;
   // Test no bucket.
   cmd.Init(%(cmd_args)s);
@@ -7978,7 +7977,7 @@ TEST_P(%(test_name)s, %(name)sInvalidHeader) {
       std::numeric_limits<GLsizei>::max(),
       -1,
   };
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   for (size_t ii = 0; ii < arraysize(kTests); ++ii) {
     SetBucketAsCStrings(kBucketId, 1, kSource, kTests[ii], kValidStrEnd);
     cmds::%(name)s cmd;
@@ -8000,7 +7999,7 @@ TEST_P(%(test_name)s, %(name)sInvalidStringEnding) {
   SetBucketAsCStrings(kBucketId, 1, kSource, 1, kInvalidStrEnd);
   cmds::%(name)s cmd;
   cmd.Init(%(cmd_args)s);
-  decoder_->set_unsafe_es3_apis_enabled(true);
+  decoder_->set_es3_apis_enabled(true);
   EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
 }
 """
@@ -8041,15 +8040,15 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmds::%(name)s cmd;
   cmd.Init(%(args)s);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));"""
     valid_test += """
 }
@@ -8247,15 +8246,15 @@ TEST_P(%(test_name)s, %(name)sValidArgs) {
   SpecializedSetup<cmds::%(name)s, 0>(true);
   cmds::%(name)s cmd;
   cmd.Init(%(args)s%(comma)sshared_memory_id_, shared_memory_offset_);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     valid_test += """
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       valid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(false);
+  decoder_->set_es3_apis_enabled(false);
   EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));"""
     valid_test += """
 }
@@ -8284,18 +8283,18 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
 TEST_P(%(test_name)s, %(name)sInvalidArgsBadSharedMemoryId) {
   EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
   SpecializedSetup<cmds::%(name)s, 0>(false);"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       invalid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     invalid_test += """
   cmds::%(name)s cmd;
   cmd.Init(%(args)s%(comma)skInvalidSharedMemoryId, shared_memory_offset_);
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));
   cmd.Init(%(args)s%(comma)sshared_memory_id_, kInvalidSharedMemoryOffset);
   EXPECT_EQ(error::kOutOfBounds, ExecuteCmd(cmd));"""
-    if func.IsUnsafe():
+    if func.IsES3API():
       invalid_test += """
-  decoder_->set_unsafe_es3_apis_enabled(true);"""
+  decoder_->set_es3_apis_enabled(true);"""
     invalid_test += """
 }
 """
@@ -9432,9 +9431,9 @@ class Function(object):
     """Returns whether the function is immediate data function or not."""
     return False
 
-  def IsUnsafe(self):
+  def IsES3API(self):
     """Returns whether the function has service side validation or not."""
-    return self.GetInfo('unsafe', False)
+    return self.GetInfo('es3api', False)
 
   def GetInfo(self, name, default = None):
     """Returns a value from the function info for this function."""
@@ -9465,7 +9464,7 @@ class Function(object):
   def IsCoreGLFunction(self):
     return (not self.IsExtension() and
             not self.GetInfo('pepper_interface') and
-            not self.IsUnsafe())
+            not self.IsES3API())
 
   def InPepperInterface(self, interface):
     ext = self.GetInfo('pepper_interface')