GPU process - parent GL context does not delete the textures it shares with c...

gpu/command_buffer/service/texture_manager.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 <map>
 #include <vector>
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
         : 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) {
+          npot_(false),
+          owned_(true) {
     }
 
     // True if this texture meets all the GLES2 criteria for rendering.
     // See section 3.8.2 of the GLES2 spec.
     bool CanRender(const FeatureInfo* feature_info) const;
 
     // The service side OpenGL id of the texture.
     GLuint service_id() const {
       return service_id_;
     }
@@ skipping 48 matching lines @@
         GLint yoffset,
         GLsizei width,
         GLsizei height,
         GLenum format,
         GLenum type) const;
 
     bool IsValid() const {
       return target() && !IsDeleted();
     }
 
+    void SetNotOwned() {
+      owned_ = false;
+    }
+
    private:
     friend class TextureManager;
     friend class base::RefCounted<TextureInfo>;
 
     ~TextureInfo() { }
 
     struct LevelInfo {
       LevelInfo()
          : valid(false),
            internal_format(0),
@@ skipping 88 matching lines @@
 
     // Whether or not this texture is "cube complete"
     bool cube_complete_;
 
     // Whether or not this texture is non-power-of-two
     bool npot_;
 
     // Whether this texture has ever been bound.
     bool has_been_bound_;
 
+    // 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();
 
@@ skipping 102 matching lines @@
   TextureInfo::Ref default_texture_2d_;
   TextureInfo::Ref default_texture_cube_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_