Revert 171569 as it broke some browser_tests on win_aura.

content/browser/renderer_host/image_transport_factory_android.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/image_transport_factory_android.h"
 
 #include "base/memory/singleton.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
-#include "third_party/khronos/GLES2/gl2.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 namespace content {
 
 namespace {
 
 static ImageTransportFactoryAndroid* g_factory = NULL;
 
 class DirectGLImageTransportFactory : public ImageTransportFactoryAndroid {
  public:
   DirectGLImageTransportFactory();
   virtual ~DirectGLImageTransportFactory();
 
   virtual gfx::GLSurfaceHandle CreateSharedSurfaceHandle() OVERRIDE {
     return gfx::GLSurfaceHandle();
   }
   virtual void DestroySharedSurfaceHandle(
       const gfx::GLSurfaceHandle& handle) OVERRIDE {}
   virtual uint32_t InsertSyncPoint() OVERRIDE { return 0; }
-  virtual uint32_t CreateTexture() OVERRIDE {
-    return context_->createTexture();
-  }
-  virtual void DeleteTexture(uint32_t id) OVERRIDE {
-    context_->deleteTexture(id);
-  }
-  virtual void AcquireTexture(
-      uint32 texture_id, const signed char* mailbox_name) OVERRIDE {}
-  virtual void ReleaseTexture(
-      uint32 texture_id, const signed char* mailbox_name) OVERRIDE {}
   virtual WebKit::WebGraphicsContext3D* GetContext3D() OVERRIDE {
     return context_.get();
   }
   virtual GLHelper* GetGLHelper() OVERRIDE { return NULL; }
 
  private:
   scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessImpl> context_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectGLImageTransportFactory);
 };
@@ skipping 14 matching lines @@
 
 class CmdBufferImageTransportFactory : public ImageTransportFactoryAndroid {
  public:
   CmdBufferImageTransportFactory();
   virtual ~CmdBufferImageTransportFactory();
 
   virtual gfx::GLSurfaceHandle CreateSharedSurfaceHandle() OVERRIDE;
   virtual void DestroySharedSurfaceHandle(
       const gfx::GLSurfaceHandle& handle) OVERRIDE;
   virtual uint32_t InsertSyncPoint() OVERRIDE;
-  virtual uint32_t CreateTexture() OVERRIDE;
-  virtual void DeleteTexture(uint32_t id) OVERRIDE;
-  virtual void AcquireTexture(
-      uint32 texture_id, const signed char* mailbox_name) OVERRIDE;
-  virtual void ReleaseTexture(
-      uint32 texture_id, const signed char* mailbox_name) OVERRIDE;
   virtual WebKit::WebGraphicsContext3D* GetContext3D() OVERRIDE {
     return context_.get();
   }
   virtual GLHelper* GetGLHelper() OVERRIDE;
 
  private:
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context_;
   scoped_ptr<GLHelper> gl_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(CmdBufferImageTransportFactory);
@@ skipping 21 matching lines @@
 gfx::GLSurfaceHandle
 CmdBufferImageTransportFactory::CreateSharedSurfaceHandle() {
   if (!context_->makeContextCurrent()) {
     NOTREACHED() << "Failed to make shared graphics context current";
     return gfx::GLSurfaceHandle();
   }
 
   gfx::GLSurfaceHandle handle = gfx::GLSurfaceHandle(
       gfx::kNullPluginWindow, true);
   handle.parent_gpu_process_id = context_->GetGPUProcessID();
+  handle.parent_client_id = context_->GetChannelID();
+  handle.parent_context_id = context_->GetContextID();
+  handle.parent_texture_id[0] = context_->createTexture();
+  handle.parent_texture_id[1] = context_->createTexture();
+  handle.sync_point = context_->insertSyncPoint();
   context_->flush();
   return handle;
 }
 
 void CmdBufferImageTransportFactory::DestroySharedSurfaceHandle(
     const gfx::GLSurfaceHandle& handle) {
   if (!context_->makeContextCurrent()) {
     NOTREACHED() << "Failed to make shared graphics context current";
     return;
   }
+
+  context_->deleteTexture(handle.parent_texture_id[0]);
+  context_->deleteTexture(handle.parent_texture_id[1]);
+  context_->finish();
 }
 
 uint32_t CmdBufferImageTransportFactory::InsertSyncPoint() {
   return context_->insertSyncPoint();
 }
 
-uint32_t CmdBufferImageTransportFactory::CreateTexture() {
-  return context_->createTexture();
-}
-
-void CmdBufferImageTransportFactory::DeleteTexture(uint32_t id) {
-  context_->deleteTexture(id);
-}
-
-void CmdBufferImageTransportFactory::AcquireTexture(
-    uint32 texture_id, const signed char* mailbox_name) {
-  context_->bindTexture(GL_TEXTURE_2D, texture_id);
-  context_->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox_name);
-  context_->flush();
-}
-
-void CmdBufferImageTransportFactory::ReleaseTexture(
-    uint32 texture_id, const signed char* mailbox_name) {
-  context_->bindTexture(GL_TEXTURE_2D, texture_id);
-  context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox_name);
-}
-
 GLHelper* CmdBufferImageTransportFactory::GetGLHelper() {
   if (!gl_helper_.get())
     gl_helper_.reset(new GLHelper(GetContext3D(), NULL));
 
   return gl_helper_.get();
 }
 
 }  // anonymous namespace
 
 // static
 ImageTransportFactoryAndroid* ImageTransportFactoryAndroid::GetInstance() {
   if (!g_factory) {
     if (CompositorImpl::UsesDirectGL())
       g_factory = new DirectGLImageTransportFactory();
     else
       g_factory = new CmdBufferImageTransportFactory();
   }
 
   return g_factory;
 }
 
 ImageTransportFactoryAndroid::ImageTransportFactoryAndroid() {
 }
 
 ImageTransportFactoryAndroid::~ImageTransportFactoryAndroid() {
 }
 
 } // namespace content