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

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // 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.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 447 matching lines @@
   virtual const char* GetCommandName(unsigned int command_id) const;
 
   // Overridden from GLES2Decoder.
   virtual bool Initialize(const scoped_refptr<gfx::GLSurface>& surface,
                           const scoped_refptr<gfx::GLContext>& context,
                           const gfx::Size& size,
                           const DisallowedExtensions& disallowed_extensions,
                           const char* allowed_extensions,
                           const std::vector<int32>& attribs);
   virtual void Destroy();
-  virtual bool MapExternalResource(resource_type::ResourceType resource_type,
-                                   uint32 resource_source_id,
-                                   GLES2Decoder* source_decoder,
-                                   uint32 resource_dest_id);
   virtual bool SetParent(GLES2Decoder* parent_decoder,
                          uint32 parent_texture_id);
   virtual void ResizeOffscreenFrameBuffer(const gfx::Size& size);
   virtual bool UpdateOffscreenFrameBufferSize();
   void UpdateParentTextureInfo();
   virtual bool MakeCurrent();
   virtual GLES2Util* GetGLES2Util() { return &util_; }
   virtual gfx::GLContext* GetGLContext() { return context_.get(); }
   virtual gfx::GLSurface* GetGLSurface() { return surface_.get(); }
   virtual ContextGroup* GetContextGroup() { return group_.get(); }
@@ skipping 103 matching lines @@
         feature_info_, client_id, service_id);
   }
 
   // Gets the texture info for the given texture. Returns NULL if none exists.
   TextureManager::TextureInfo* GetTextureInfo(GLuint client_id) {
     TextureManager::TextureInfo* info =
         texture_manager()->GetTextureInfo(client_id);
     return (info && !info->IsDeleted()) ? info : NULL;
   }
 
-  // Adds the texture info for the given texture.
-  void AddTextureInfo(GLuint client_id, TextureManager::TextureInfo* info) {
-    texture_manager()->AddTextureInfo(feature_info_, client_id, info);
-  }
-
   // Deletes the texture info for the given texture.
   void RemoveTextureInfo(GLuint client_id) {
     texture_manager()->RemoveTextureInfo(feature_info_, client_id);
   }
 
   // Get the size (in pixels) of the currently bound frame buffer (either FBO
   // or regular back buffer).
   gfx::Size GetBoundReadFrameBufferSize();
 
   // Get the format of the currently bound frame buffer (either FBO or regular
@@ skipping 1481 matching lines @@
 }
 
 void GLES2DecoderImpl::DeleteTexturesHelper(
     GLsizei n, const GLuint* client_ids) {
   for (GLsizei ii = 0; ii < n; ++ii) {
     TextureManager::TextureInfo* info = GetTextureInfo(client_ids[ii]);
     if (info) {
       if (info->IsAttachedToFramebuffer()) {
         state_dirty_ = true;
       }
-      if (info->owner() == group_->texture_manager()) {
-        GLuint service_id = info->service_id();
-        glDeleteTextures(1, &service_id);
-      }
+      GLuint service_id = info->service_id();
+      glDeleteTextures(1, &service_id);
       RemoveTextureInfo(client_ids[ii]);
     }
   }
 }
 
 // }  // anonymous namespace
 
 bool GLES2DecoderImpl::MakeCurrent() {
   bool result = context_.get() ? context_->MakeCurrent(surface_.get()) : false;
   if (result && WasContextLost()) {
@@ skipping 359 matching lines @@
 
   offscreen_target_frame_buffer_.reset();
   offscreen_target_color_texture_.reset();
   offscreen_target_color_render_buffer_.reset();
   offscreen_target_depth_render_buffer_.reset();
   offscreen_target_stencil_render_buffer_.reset();
   offscreen_saved_frame_buffer_.reset();
   offscreen_saved_color_texture_.reset();
 }
 
-bool GLES2DecoderImpl::MapExternalResource(
-    resource_type::ResourceType resource_type,
-    uint32 resource_source_id,
-    GLES2Decoder* source_decoder,
-    uint32 resource_dest_id) {
-  GLES2DecoderImpl* source_decoder_impl = static_cast<GLES2DecoderImpl*>(
-      source_decoder);
-
-  if (resource_type != resource_type::kTexture)
-    return false;
-
-  if (!source_decoder)
-    return false;
-
-  // The client should already have created the texture in the source context
-  // group and flushed.
-  TextureManager::TextureInfo* source_info =
-      source_decoder_impl->GetTextureInfo(resource_source_id);
-  if (!source_info)
-    return false;
-
-  // Delete or unmap any existing texture with this ID.
-  DeleteTexturesHelper(1, &resource_dest_id);
-
-  // Add the source texture info to this group's manager with the
-  // requested id.
-  AddTextureInfo(resource_dest_id, source_info);
-
-  return true;
-}
-
 bool GLES2DecoderImpl::SetParent(GLES2Decoder* new_parent,
                                  uint32 new_parent_texture_id) {
   if (!offscreen_saved_color_texture_.get())
     return false;
 
   // Remove the saved frame buffer mapping from the parent decoder. The
   // parent pointer is a weak pointer so it will be null if the parent has
   // already been destroyed.
   if (parent_) {
     // First check the texture has been mapped into the parent. This might not
@@ skipping 12 matching lines @@
     // it can reference it.
     GLuint service_id = offscreen_saved_color_texture_->id();
 
     // Replace texture info when ID is already in use by parent.
     if (new_parent_impl->texture_manager()->GetTextureInfo(
             new_parent_texture_id))
       new_parent_impl->texture_manager()->RemoveTextureInfo(
           feature_info_, new_parent_texture_id);
 
     TextureManager::TextureInfo* info =
-        new TextureManager::TextureInfo(service_id);
-    new_parent_impl->AddTextureInfo(new_parent_texture_id, info);
+        new_parent_impl->CreateTextureInfo(new_parent_texture_id, service_id);
+    info->SetNotOwned();
     new_parent_impl->texture_manager()->SetInfoTarget(info, GL_TEXTURE_2D);
 
     parent_ = new_parent_impl->AsWeakPtr();
 
     UpdateParentTextureInfo();
   } else {
     parent_.reset();
   }
 
   return true;
@@ skipping 4275 matching lines @@
   return false;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu