Partial revert of 146621

content/browser/renderer_host/image_transport_factory.cc

Index: content/browser/renderer_host/image_transport_factory.cc
diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc
index 08fbe6b28e76da4dbe211aacb47a9a3ac8aff40d..e8ab1b1d641e196188003292af661cb7fec09a13 100644
--- a/content/browser/renderer_host/image_transport_factory.cc
+++ b/content/browser/renderer_host/image_transport_factory.cc
@@ -57,8 +57,7 @@ class DefaultTransportFactory
 
   virtual scoped_refptr<ui::Texture> CreateTransportClient(
       const gfx::Size& size,
-      uint64 transport_handle,
-      ui::Compositor* compositor) OVERRIDE {
+      uint64 transport_handle) OVERRIDE {
     return NULL;
   }
 
@@ -86,27 +85,16 @@ class DefaultTransportFactory
 class ImageTransportClientTexture : public ui::Texture {
  public:
   ImageTransportClientTexture(
-      WebKit::WebGraphicsContext3D* host_context,
       const gfx::Size& size,
       uint64 surface_id)
-          : ui::Texture(true, size),
-            host_context_(host_context) {
+          : ui::Texture(true, size) {
     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);
 };
 
@@ -221,13 +209,9 @@ class GpuProcessTransportFactory : public ui::ContextFactory,
 
   virtual scoped_refptr<ui::Texture> CreateTransportClient(
       const gfx::Size& size,
-      uint64 transport_handle,
-      ui::Compositor* compositor) {
-    PerCompositorData* data = per_compositor_data_[compositor];
-    DCHECK(data);
+      uint64 transport_handle) {
     scoped_refptr<ImageTransportClientTexture> image(
-        new ImageTransportClientTexture(data->shared_context.get(),
-                                        size, transport_handle));
+        new ImageTransportClientTexture(size, transport_handle));
     return image;
   }