Update from https://crrev.com/312600

gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index 7766b0decbf32c2676ed3dffc9c488bfe9674068..a1947f4bc3c535c08b64694850718969337cb9f7 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -703,9 +703,13 @@ error::Error GLES2DecoderImpl::HandleCreateProgram(uint32_t immediate_data_size,
       *static_cast<const gles2::cmds::CreateProgram*>(cmd_data);
   (void)c;
   uint32_t client_id = c.client_id;
-  if (!CreateProgramHelper(client_id)) {
+  if (GetProgram(client_id)) {
     return error::kInvalidArguments;
   }
+  GLuint service_id = glCreateProgram();
+  if (service_id) {
+    CreateProgram(client_id, service_id);
+  }
   return error::kNoError;
 }
 
@@ -720,9 +724,13 @@ error::Error GLES2DecoderImpl::HandleCreateShader(uint32_t immediate_data_size,
     return error::kNoError;
   }
   uint32_t client_id = c.client_id;
-  if (!CreateShaderHelper(type, client_id)) {
+  if (GetShader(client_id)) {
     return error::kInvalidArguments;
   }
+  GLuint service_id = glCreateShader(type);
+  if (service_id) {
+    CreateShader(client_id, service_id, type);
+  }
   return error::kNoError;
 }
 
@@ -831,6 +839,24 @@ error::Error GLES2DecoderImpl::HandleDeleteSamplersImmediate(
   return error::kNoError;
 }
 
+error::Error GLES2DecoderImpl::HandleDeleteSync(uint32_t immediate_data_size,
+                                                const void* cmd_data) {
+  if (!unsafe_es3_apis_enabled())
+    return error::kUnknownCommand;
+  const gles2::cmds::DeleteSync& c =
+      *static_cast<const gles2::cmds::DeleteSync*>(cmd_data);
+  (void)c;
+  GLuint sync = c.sync;
+  GLsync service_id = 0;
+  if (group_->GetSyncServiceId(sync, &service_id)) {
+    glDeleteSync(service_id);
+    group_->RemoveSyncId(sync);
+  } else {
+    LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glDeleteSync", "unknown sync");
+  }
+  return error::kNoError;
+}
+
 error::Error GLES2DecoderImpl::HandleDeleteTexturesImmediate(
     uint32_t immediate_data_size,
     const void* cmd_data) {
@@ -982,6 +1008,27 @@ error::Error GLES2DecoderImpl::HandleEnableVertexAttribArray(
   return error::kNoError;
 }
 
+error::Error GLES2DecoderImpl::HandleFenceSync(uint32_t immediate_data_size,
+                                               const void* cmd_data) {
+  if (!unsafe_es3_apis_enabled())
+    return error::kUnknownCommand;
+  const gles2::cmds::FenceSync& c =
+      *static_cast<const gles2::cmds::FenceSync*>(cmd_data);
+  (void)c;
+  GLenum condition = static_cast<GLenum>(c.condition);
+  GLbitfield flags = static_cast<GLbitfield>(c.flags);
+  uint32_t client_id = c.client_id;
+  GLsync service_id = 0;
+  if (group_->GetSyncServiceId(client_id, &service_id)) {
+    return error::kInvalidArguments;
+  }
+  service_id = glFenceSync(condition, flags);
+  if (service_id) {
+    group_->AddSyncId(client_id, service_id);
+  }
+  return error::kNoError;
+}
+
 error::Error GLES2DecoderImpl::HandleFinish(uint32_t immediate_data_size,
                                             const void* cmd_data) {
   const gles2::cmds::Finish& c =
@@ -2044,7 +2091,8 @@ error::Error GLES2DecoderImpl::HandleIsSampler(uint32_t immediate_data_size,
   if (!result_dst) {
     return error::kOutOfBounds;
   }
-  *result_dst = group_->GetSamplerServiceId(sampler, &sampler);
+  GLuint service_sampler = 0;
+  *result_dst = group_->GetSamplerServiceId(sampler, &service_sampler);
   return error::kNoError;
 }
 
@@ -2064,6 +2112,25 @@ error::Error GLES2DecoderImpl::HandleIsShader(uint32_t immediate_data_size,
   return error::kNoError;
 }
 
+error::Error GLES2DecoderImpl::HandleIsSync(uint32_t immediate_data_size,
+                                            const void* cmd_data) {
+  if (!unsafe_es3_apis_enabled())
+    return error::kUnknownCommand;
+  const gles2::cmds::IsSync& c =
+      *static_cast<const gles2::cmds::IsSync*>(cmd_data);
+  (void)c;
+  GLuint sync = c.sync;
+  typedef cmds::IsSync::Result Result;
+  Result* result_dst = GetSharedMemoryAs<Result*>(
+      c.result_shm_id, c.result_shm_offset, sizeof(*result_dst));
+  if (!result_dst) {
+    return error::kOutOfBounds;
+  }
+  GLsync service_sync = 0;
+  *result_dst = group_->GetSyncServiceId(sync, &service_sync);
+  return error::kNoError;
+}
+
 error::Error GLES2DecoderImpl::HandleIsTexture(uint32_t immediate_data_size,
                                                const void* cmd_data) {
   const gles2::cmds::IsTexture& c =
@@ -2095,8 +2162,9 @@ error::Error GLES2DecoderImpl::HandleIsTransformFeedback(
   if (!result_dst) {
     return error::kOutOfBounds;
   }
-  *result_dst = group_->GetTransformFeedbackServiceId(transformfeedback,
-                                                      &transformfeedback);
+  GLuint service_transformfeedback = 0;
+  *result_dst = group_->GetTransformFeedbackServiceId(
+      transformfeedback, &service_transformfeedback);
   return error::kNoError;
 }
 
@@ -2353,6 +2421,60 @@ error::Error GLES2DecoderImpl::HandleScissor(uint32_t immediate_data_size,
   return error::kNoError;
 }
 
+error::Error GLES2DecoderImpl::HandleShaderSourceBucket(
+    uint32_t immediate_data_size,
+    const void* cmd_data) {
+  const gles2::cmds::ShaderSourceBucket& c =
+      *static_cast<const gles2::cmds::ShaderSourceBucket*>(cmd_data);
+  (void)c;
+  GLuint shader = static_cast<GLuint>(c.shader);
+
+  const size_t kMinBucketSize = sizeof(GLint);
+  // Each string has at least |length| in the header and a NUL character.
+  const size_t kMinStringSize = sizeof(GLint) + 1;
+  Bucket* bucket = GetBucket(c.str_bucket_id);
+  if (!bucket) {
+    return error::kInvalidArguments;
+  }
+  const size_t bucket_size = bucket->size();
+  if (bucket_size < kMinBucketSize) {
+    return error::kInvalidArguments;
+  }
+  const char* bucket_data = bucket->GetDataAs<const char*>(0, bucket_size);
+  const GLint* header = reinterpret_cast<const GLint*>(bucket_data);
+  GLsizei count = static_cast<GLsizei>(header[0]);
+  if (count < 0) {
+    return error::kInvalidArguments;
+  }
+  const size_t max_count = (bucket_size - kMinBucketSize) / kMinStringSize;
+  if (max_count < static_cast<size_t>(count)) {
+    return error::kInvalidArguments;
+  }
+  const GLint* length = header + 1;
+  scoped_ptr<const char* []> strs;
+  if (count > 0)
+    strs.reset(new const char* [count]);
+  const char** str = strs.get();
+  base::CheckedNumeric<size_t> total_size = sizeof(GLint);
+  total_size *= count + 1;  // Header size.
+  if (!total_size.IsValid())
+    return error::kInvalidArguments;
+  for (GLsizei ii = 0; ii < count; ++ii) {
+    str[ii] = bucket_data + total_size.ValueOrDefault(0);
+    total_size += length[ii];
+    total_size += 1;  // NUL char at the end of each char array.
+    if (!total_size.IsValid() || total_size.ValueOrDefault(0) > bucket_size ||
+        str[ii][length[ii]] != 0) {
+      return error::kInvalidArguments;
+    }
+  }
+  if (total_size.ValueOrDefault(0) != bucket_size) {
+    return error::kInvalidArguments;
+  }
+  DoShaderSource(shader, count, str, length);
+  return error::kNoError;
+}
+
 error::Error GLES2DecoderImpl::HandleStencilFunc(uint32_t immediate_data_size,
                                                  const void* cmd_data) {
   const gles2::cmds::StencilFunc& c =