Revert 114059 - Fixed service side implementation of glTexStorage2DEXT to only initialize the num...

gpu/command_buffer/service/texture_manager.h

Index: gpu/command_buffer/service/texture_manager.h
===================================================================
--- gpu/command_buffer/service/texture_manager.h	(revision 114132)
+++ gpu/command_buffer/service/texture_manager.h	(working copy)
@@ -254,7 +254,7 @@
         const FeatureInfo* feature_info, GLenum pname, GLint param);
 
     // Makes each of the mip levels as though they were generated.
-    bool MarkMipmapsGenerated(const FeatureInfo* feature_info);
+    bool MarkMipmapsGenerated(const FeatureInfo* feature_info, bool cleared);
 
     void MarkAsDeleted() {
       service_id_ = 0;
@@ -409,8 +409,8 @@
 
   // Makes each of the mip levels as though they were generated.
   // Returns false if that's not allowed for the given texture.
-  bool MarkMipmapsGenerated(const FeatureInfo* feature_info,
-                            TextureInfo* info);
+  bool MarkMipmapsGenerated(const FeatureInfo* feature_info, TextureInfo* info,
+                            bool cleared);
 
   // Clears any uncleared renderable levels.
   bool ClearRenderableLevels(GLES2Decoder* decoder, TextureInfo* info);
Property changes on: gpu/command_buffer/service/texture_manager.h
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /trunk/src/o3d/gpu/command_buffer/service/texture_manager.h:r32866-32958
   Reverse-merged /branches/chrome_webkit_merge_branch/o3d/gpu/command_buffer/service/texture_manager.h:r69-2775