Update from https://crrev.com/311076

gpu/command_buffer/client/gles2_implementation.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <GLES2/gl2.h>
 
 #include <list>
@@ skipping 492 matching lines @@
 
   // Helper for GetVertexAttrib
   bool GetVertexAttribHelper(GLuint index, GLenum pname, uint32* param);
 
   GLuint GetMaxValueInBufferCHROMIUMHelper(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 
   void RestoreElementAndArrayBuffers(bool restore);
   void RestoreArrayBuffer(bool restrore);
 
-  // The pixels pointer should already account for unpack skip rows and skip
-  // pixels.
+  // The pixels pointer should already account for unpack skip
+  // images/rows/pixels.
   void TexSubImage2DImpl(
       GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
       GLsizei height, GLenum format, GLenum type, uint32 unpadded_row_size,
       const void* pixels, uint32 pixels_padded_row_size, GLboolean internal,
       ScopedTransferBufferPtr* buffer, uint32 buffer_padded_row_size);
+  void TexSubImage3DImpl(
+      GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+      GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
+      uint32 unpadded_row_size, const void* pixels,
+      uint32 pixels_padded_row_size, GLboolean internal,
+      ScopedTransferBufferPtr* buffer, uint32 buffer_padded_row_size);
 
   // Helpers for query functions.
   bool GetHelper(GLenum pname, GLint* params);
   bool GetBooleanvHelper(GLenum pname, GLboolean* params);
   bool GetBufferParameterivHelper(GLenum target, GLenum pname, GLint* params);
   bool GetFloatvHelper(GLenum pname, GLfloat* params);
   bool GetFramebufferAttachmentParameterivHelper(
       GLenum target, GLenum attachment, GLenum pname, GLint* params);
   bool GetIntegervHelper(GLenum pname, GLint* params);
   bool GetInternalformativHelper(
@@ skipping 103 matching lines @@
 
   // unpack alignment as last set by glPixelStorei
   GLint unpack_alignment_;
 
   // unpack yflip as last set by glPixelstorei
   bool unpack_flip_y_;
 
   // unpack row length as last set by glPixelStorei
   GLint unpack_row_length_;
 
+  // unpack image height as last set by glPixelStorei
+  GLint unpack_image_height_;
+
   // unpack skip rows as last set by glPixelStorei
   GLint unpack_skip_rows_;
 
   // unpack skip pixels as last set by glPixelStorei
   GLint unpack_skip_pixels_;
 
+  // unpack skip images as last set by glPixelStorei
+  GLint unpack_skip_images_;
+
   // pack reverse row order as last set by glPixelstorei
   bool pack_reverse_row_order_;
 
   scoped_ptr<TextureUnit[]> texture_units_;
 
   // 0 to gl_state_.max_combined_texture_image_units.
   GLuint active_texture_unit_;
 
   GLuint bound_framebuffer_;
   GLuint bound_read_framebuffer_;
@@ skipping 65 matching lines @@
 
   scoped_ptr<QueryTracker> query_tracker_;
   typedef std::map<GLuint, QueryTracker::Query*> QueryMap;
   QueryMap current_queries_;
   scoped_ptr<IdAllocator> query_id_allocator_;
 
   scoped_ptr<BufferTracker> buffer_tracker_;
 
   GLES2ImplementationErrorMessageCallback* error_message_callback_;
 
-  scoped_ptr<std::string> current_trace_category_;
-  scoped_ptr<std::string> current_trace_name_;
+  int current_trace_stack_;
 
   GpuControl* gpu_control_;
 
   Capabilities capabilities_;
 
   base::WeakPtrFactory<GLES2Implementation> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
 };
 
@@ skipping 27 matching lines @@
 
 inline bool GLES2Implementation::GetTexParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_