Revert 151153 - Partial revert of 146621

content/browser/renderer_host/image_transport_factory.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.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 39 matching lines @@
       ui::Compositor* compositor) OVERRIDE {
     return gfx::GLSurfaceHandle();
   }
 
   virtual void DestroySharedSurfaceHandle(
       gfx::GLSurfaceHandle surface) OVERRIDE {
   }
 
   virtual scoped_refptr<ui::Texture> CreateTransportClient(
       const gfx::Size& size,
-      uint64 transport_handle) OVERRIDE {
+      uint64 transport_handle,
+      ui::Compositor* compositor) OVERRIDE {
     return NULL;
   }
 
   virtual GLHelper* GetGLHelper(ui::Compositor* compositor) OVERRIDE {
     return NULL;
   }
 
   virtual uint32 InsertSyncPoint(ui::Compositor* compositor) OVERRIDE {
     return 0;
   }
 
   // We don't generate lost context events, so we don't need to keep track of
   // observers
   virtual void AddObserver(ImageTransportFactoryObserver* observer) OVERRIDE {
   }
 
   virtual void RemoveObserver(
       ImageTransportFactoryObserver* observer) OVERRIDE {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultTransportFactory);
 };
 
 class ImageTransportClientTexture : public ui::Texture {
  public:
   ImageTransportClientTexture(
+      WebKit::WebGraphicsContext3D* host_context,
       const gfx::Size& size,
       uint64 surface_id)
-          : ui::Texture(true, size) {
+          : ui::Texture(true, size),
+            host_context_(host_context) {
     set_texture_id(surface_id);
   }
 
+  virtual WebKit::WebGraphicsContext3D* HostContext3D() {
+    return host_context_;
+  }
+
  protected:
   virtual ~ImageTransportClientTexture() {}
 
  private:
+  // A raw pointer. This |ImageTransportClientTexture| will be destroyed
+  // before the |host_context_| via
+  // |ImageTransportFactoryObserver::OnLostContext()| handlers.
+  WebKit::WebGraphicsContext3D* host_context_;
+
   DISALLOW_COPY_AND_ASSIGN(ImageTransportClientTexture);
 };
 
 class GpuProcessTransportFactory;
 
 class CompositorSwapClient
     : public base::SupportsWeakPtr<CompositorSwapClient>,
       public WebGraphicsContext3DSwapBuffersClient {
  public:
   CompositorSwapClient(ui::Compositor* compositor,
@@ skipping 94 matching lines @@
         data->shared_context->deleteTexture(surface.parent_texture_id[0]);
         data->shared_context->deleteTexture(surface.parent_texture_id[1]);
         data->shared_context->flush();
         break;
       }
     }
   }
 
   virtual scoped_refptr<ui::Texture> CreateTransportClient(
       const gfx::Size& size,
-      uint64 transport_handle) {
+      uint64 transport_handle,
+      ui::Compositor* compositor) {
+    PerCompositorData* data = per_compositor_data_[compositor];
+    DCHECK(data);
     scoped_refptr<ImageTransportClientTexture> image(
-        new ImageTransportClientTexture(size, transport_handle));
+        new ImageTransportClientTexture(data->shared_context.get(),
+                                        size, transport_handle));
     return image;
   }
 
   virtual GLHelper* GetGLHelper(ui::Compositor* compositor) {
     PerCompositorData* data = per_compositor_data_[compositor];
     if (!data)
       data = CreatePerCompositorData(compositor);
     if (!data->gl_helper.get()) {
       WebKit::WebGraphicsContext3D* context_for_thread =
           CreateContextCommon(compositor, true);
@@ skipping 168 matching lines @@
 void ImageTransportFactory::Terminate() {
   ui::ContextFactory::SetInstance(NULL);
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }