1 files changed, 0 insertions, 81 deletions

diff --git a/chromium/gpu/command_buffer/service/texture_manager.h b/chromium/gpu/command_buffer/service/texture_manager.h
index db470045751..cbc659caf4e 100644
--- a/chromium/gpu/command_buffer/service/texture_manager.h
+++ b/chromium/gpu/command_buffer/service/texture_manager.h
@@ -27,8 +27,6 @@ class StreamTextureManager;
 namespace gles2 {
 
 class GLES2Decoder;
-struct ContextState;
-struct DecoderFramebufferState;
 class Display;
 class ErrorState;
 class FeatureInfo;
@@ -431,29 +429,6 @@ class GPU_EXPORT TextureRef : public base::RefCounted<TextureRef> {
   DISALLOW_COPY_AND_ASSIGN(TextureRef);
 };
 
-// Holds data that is per gles2_cmd_decoder, but is related to to the
-// TextureManager.
-struct DecoderTextureState {
-  // total_texture_upload_time automatically initialized to 0 in default
-  // constructor.
-  DecoderTextureState():
-      tex_image_2d_failed(false),
-      texture_upload_count(0),
-      teximage2d_faster_than_texsubimage2d(true) {}
-
-  // This indicates all the following texSubImage2D calls that are part of the
-  // failed texImage2D call should be ignored.
-  bool tex_image_2d_failed;
-
-  // Command buffer stats.
-  int texture_upload_count;
-  base::TimeDelta total_texture_upload_time;
-
-  // This is really not per-decoder, but the logic to decide this value is in
-  // the decoder for now, so it is simpler to leave it there.
-  bool teximage2d_faster_than_texsubimage2d;
-};
-
 // This class keeps track of the textures and their sizes so we can do NPOT and
 // texture complete checking.
 //
@@ -696,43 +671,6 @@ class GPU_EXPORT TextureManager {
     destruction_observers_.RemoveObserver(observer);
   }
 
-  struct DoTextImage2DArguments {
-    GLenum target;
-    GLint level;
-    GLenum internal_format;
-    GLsizei width;
-    GLsizei height;
-    GLint border;
-    GLenum format;
-    GLenum type;
-    const void* pixels;
-    uint32 pixels_size;
-  };
-
-  bool ValidateTexImage2D(
-    ContextState* state,
-    const char* function_name,
-    const DoTextImage2DArguments& args,
-    // Pointer to TextureRef filled in if validation successful.
-    // Presumes the pointer is valid.
-    TextureRef** texture_ref);
-
-  void ValidateAndDoTexImage2D(
-    DecoderTextureState* texture_state,
-    ContextState* state,
-    DecoderFramebufferState* framebuffer_state,
-    const DoTextImage2DArguments& 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);
-
-  bool ValidateTextureParameters(
-    ErrorState* error_state, const char* function_name,
-    GLenum target, GLenum format, GLenum type, GLint level);
-
  private:
   friend class Texture;
   friend class TextureRef;
@@ -742,13 +680,6 @@ class GPU_EXPORT TextureManager {
       GLenum target,
       GLuint* black_texture);
 
-  void DoTexImage2D(
-    DecoderTextureState* texture_state,
-    ErrorState* error_state,
-    DecoderFramebufferState* framebuffer_state,
-    TextureRef* texture_ref,
-    const DoTextImage2DArguments& args);
-
   void StartTracking(TextureRef* texture);
   void StopTracking(TextureRef* texture);
 
@@ -799,18 +730,6 @@ class GPU_EXPORT TextureManager {
   DISALLOW_COPY_AND_ASSIGN(TextureManager);
 };
 
-// This class records texture upload time when in scope.
-class ScopedTextureUploadTimer {
- public:
-  explicit ScopedTextureUploadTimer(DecoderTextureState* texture_state);
-  ~ScopedTextureUploadTimer();
-
- private:
-  DecoderTextureState* texture_state_;
-  base::TimeTicks begin_time_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer);
-};
-
 }  // namespace gles2
 }  // namespace gpu