Revert 94743 - Allow the renderer process to map textures from one context into another.

gpu/command_buffer/service/texture_manager.h

 // Copyright (c) 2011 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 <vector>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 
 namespace gpu {
 namespace gles2 {
 
 class FeatureInfo;
 
 // This class keeps track of the textures and their sizes so we can do NPOT and
 // texture complete checking.
 //
 // NOTE: To support shared resources an instance of this class will need to be
 // shared by multiple GLES2Decoders.
-class TextureManager : public base::SupportsWeakPtr<TextureManager> {
+class TextureManager {
  public:
   // Info about Textures currently in the system.
   class TextureInfo : public base::RefCounted<TextureInfo> {
    public:
     typedef scoped_refptr<TextureInfo> Ref;
 
     explicit TextureInfo(GLuint service_id)
         : service_id_(service_id),
           deleted_(false),
           target_(0),
           min_filter_(GL_NEAREST_MIPMAP_LINEAR),
           mag_filter_(GL_LINEAR),
           wrap_s_(GL_REPEAT),
           wrap_t_(GL_REPEAT),
           max_level_set_(-1),
           texture_complete_(false),
           cube_complete_(false),
           npot_(false),
           has_been_bound_(false),
-          framebuffer_attachment_count_(0) {
+          framebuffer_attachment_count_(0),
+          owned_(true) {
     }
 
     GLenum min_filter() const {
       return min_filter_;
     }
 
     GLenum mag_filter() const {
       return mag_filter_;
     }
 
@@ skipping 32 matching lines @@
     // same format, all the same dimensions and all width = height.
     bool cube_complete() const {
       return cube_complete_;
     }
 
     // Whether or not this texture is a non-power-of-two texture.
     bool npot() const {
       return npot_;
     }
 
-    TextureManager* owner() const {
-      return owner_.get();
-    }
-
     // Returns true if mipmaps can be generated by GL.
     bool CanGenerateMipmaps(const FeatureInfo* feature_info) const;
 
     // Get the width and height for a particular level. Returns false if level
     // does not exist.
     bool GetLevelSize(
         GLint face, GLint level, GLsizei* width, GLsizei* height) const;
 
     // Get the type of a level. Returns false if level does not exist.
     bool GetLevelType(
@@ skipping 12 matching lines @@
         GLint yoffset,
         GLsizei width,
         GLsizei height,
         GLenum format,
         GLenum type) const;
 
     bool IsValid() const {
       return target() && !IsDeleted();
     }
 
+    void SetNotOwned() {
+      owned_ = false;
+    }
+
     bool IsAttachedToFramebuffer() const {
       return framebuffer_attachment_count_ != 0;
     }
 
     void AttachToFramebuffer() {
       ++framebuffer_attachment_count_;
     }
 
     void DetachFromFramebuffer() {
       DCHECK(framebuffer_attachment_count_ > 0);
@@ skipping 98 matching lines @@
 
     // Whether or not this texture is non-power-of-two
     bool npot_;
 
     // Whether this texture has ever been bound.
     bool has_been_bound_;
 
     // The number of framebuffers this texture is attached to.
     int framebuffer_attachment_count_;
 
-    // The framebuffer manager that controls the lifetime of this framebuffer
-    // or NULL if it has been deleted.
-    base::WeakPtr<TextureManager> owner_;
+    // Whether the associated context group owns this texture and should delete
+    // it.
+    bool owned_;
 
     DISALLOW_COPY_AND_ASSIGN(TextureInfo);
   };
 
   TextureManager(GLsizei max_texture_size,
                  GLsizei max_cube_map_texture_size);
   ~TextureManager();
 
   // Init the texture manager.
   bool Initialize(const FeatureInfo* feature_info);
@@ skipping 65 matching lines @@
       const FeatureInfo* feature_info,
       TextureManager::TextureInfo* info);
 
   // Creates a new texture info.
   TextureInfo* CreateTextureInfo(
       const FeatureInfo* feature_info, GLuint client_id, GLuint service_id);
 
   // Gets the texture info for the given texture.
   TextureInfo* GetTextureInfo(GLuint client_id);
 
-  // Adds a texture info for a texture owned by another texture
-  // manager.
-  void AddTextureInfo(const FeatureInfo* feature_info,
-                      GLuint client_id,
-                      TextureInfo* info);
-
   // Removes a texture info.
   void RemoveTextureInfo(const FeatureInfo* feature_info, GLuint client_id);
 
   // Gets a client id for a given service id.
   bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
   TextureInfo* GetDefaultTextureInfo(GLenum target) {
     switch (target) {
       case GL_TEXTURE_2D:
         return default_texture_2d_;
@@ skipping 49 matching lines @@
   TextureInfo::Ref default_texture_cube_map_;
   TextureInfo::Ref default_texture_external_oes_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_