Revert of gpu: Make glTexSubImage2D work with GL_SRGB_ALPHA on OpenGL

gpu/command_buffer/service/texture_manager.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_SERVICE_TEXTURE_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 
 #include <algorithm>
 #include <list>
 #include <set>
@@ skipping 852 matching lines @@
     // Presumes the pointer is valid.
     TextureRef** texture_ref);
 
   void ValidateAndDoTexImage(
     DecoderTextureState* texture_state,
     ContextState* state,
     DecoderFramebufferState* framebuffer_state,
     const char* function_name,
     const DoTexImageArguments& args);
 
-  struct DoTexSubImageArguments {
-    GLenum target;
-    GLint level;
-    GLint xoffset;
-    GLint yoffset;
-    GLsizei width;
-    GLsizei height;
-    GLenum format;
-    GLenum type;
-    const void* pixels;
-    uint32 pixels_size;
-    // TODO(kkinnunen): currently this is used only for TexSubImage2D.
-  };
-
-  bool ValidateTexSubImage(
-      ContextState* state,
-      const char* function_name,
-      const DoTexSubImageArguments& args,
-      // Pointer to TextureRef filled in if validation successful.
-      // Presumes the pointer is valid.
-      TextureRef** texture_ref);
-
-  void ValidateAndDoTexSubImage(GLES2Decoder* decoder,
-                                DecoderTextureState* texture_state,
-                                ContextState* state,
-                                DecoderFramebufferState* framebuffer_state,
-                                const char* function_name,
-                                const DoTexSubImageArguments& args);
-
   // TODO(kloveless): Make GetTexture* private once this is no longer called
   // from gles2_cmd_decoder.
   TextureRef* GetTextureInfoForTarget(ContextState* state, GLenum target);
   TextureRef* GetTextureInfoForTargetUnlessDefault(
       ContextState* state, GLenum target);
 
   // Note that internal_format is only checked in relation to the format
   // parameter, so that this function may be used to validate texSubImage2D.
   bool ValidateTextureParameters(
     ErrorState* error_state, const char* function_name,
     GLenum format, GLenum type, GLenum internal_format, GLint level);
 
   // base::trace_event::MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
-  // Returns the union of |rect1| and |rect2| if one of the rectangles is empty,
-  // contains the other rectangle or shares an edge with the other rectangle.
-  // Part of the public interface because texture pixel data rectangle
-  // operations are also implemented in decoder at the moment.
-  static bool CombineAdjacentRects(const gfx::Rect& rect1,
-                                   const gfx::Rect& rect2,
-                                   gfx::Rect* result);
-
  private:
   friend class Texture;
   friend class TextureRef;
 
   // Helper for Initialize().
   scoped_refptr<TextureRef> CreateDefaultAndBlackTextures(
       GLenum target,
       GLuint* black_texture);
 
   void DoTexImage(
@@ skipping 75 matching lines @@
  private:
   DecoderTextureState* texture_state_;
   base::TimeTicks begin_time_;
   DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_