Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/command_buffer/service/texture_definition.h

 // Copyright 2014 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_DEFINITION_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 43 matching lines @@
     return (version - version_) < 0x80000000;
   }
   bool Matches(const Texture* texture) const;
 
   scoped_refptr<NativeImageBuffer> image() const { return image_buffer_; }
 
  private:
   bool SafeToRenderFrom() const;
 
   struct LevelInfo {
-    LevelInfo();
     LevelInfo(GLenum target,
               GLenum internal_format,
               GLsizei width,
               GLsizei height,
               GLsizei depth,
               GLint border,
               GLenum format,
               GLenum type,
               bool cleared);
     ~LevelInfo();
 
     GLenum target;
     GLenum internal_format;
     GLsizei width;
     GLsizei height;
     GLsizei depth;
     GLint border;
     GLenum format;
     GLenum type;
     bool cleared;
   };
 
+  typedef std::vector<std::vector<LevelInfo> > LevelInfos;
+
   unsigned int version_;
   GLenum target_;
   scoped_refptr<NativeImageBuffer> image_buffer_;
   GLenum min_filter_;
   GLenum mag_filter_;
   GLenum wrap_s_;
   GLenum wrap_t_;
   GLenum usage_;
   bool immutable_;
-  bool defined_;
-
-  // Only support textures with one face and one level.
-  LevelInfo level_info_;
+  LevelInfos level_infos_;
 };
 
 }  // namespage gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_DEFINITION_H_