Aura: Have ui::Layer implement WebKit::WebExternalTextureLayerClient

content/browser/renderer_host/image_transport_factory.h

Index: content/browser/renderer_host/image_transport_factory.h
diff --git a/content/browser/renderer_host/image_transport_factory.h b/content/browser/renderer_host/image_transport_factory.h
index 10a841e20e1b359ae61abcc2f3ce6f38b2a85b51..99363f511f9522ef7d2a9c40a9c054b866b46ca5 100644
--- a/content/browser/renderer_host/image_transport_factory.h
+++ b/content/browser/renderer_host/image_transport_factory.h
@@ -27,8 +27,6 @@ namespace WebKit {
 class WebGraphicsContext3D;
 }
 
-class ImageTransportClient;
-
 // This class provides a way to get notified when surface handles get lost.
 class ImageTransportFactoryObserver {
  public:
@@ -74,11 +72,12 @@ class ImageTransportFactory {
   // Destroys a shared surface handle.
   virtual void DestroySharedSurfaceHandle(gfx::GLSurfaceHandle surface) = 0;
 
-  // Creates a transport client of a given size, and using the opaque handle
+  // Creates a transport texture of a given size, and using the opaque handle
   // sent by the GPU process.
-  virtual scoped_refptr<ImageTransportClient> CreateTransportClient(
+  virtual scoped_refptr<ui::Texture> CreateTransportClient(
       const gfx::Size& size,
-      uint64* transport_handle) = 0;
+      uint64* transport_handle,
+      ui::Compositor* compositor) = 0;
 
   // Gets a GLHelper instance, associated with the compositor context. This
   // GLHelper will get destroyed whenever the context is lost (
@@ -87,12 +86,6 @@ class ImageTransportFactory {
   // Inserts a SyncPoint into the compositor's context.
   virtual uint32 InsertSyncPoint(ui::Compositor* compositor) = 0;
 
-  // Returns a ScopedMakeCurrent that can be used to make current a context that
-  // is shared with the compositor context, e.g. to create a texture in its
-  // namespace. The caller gets ownership of the object.
-  // This will return NULL when using out-of-process (command buffer) contexts.
-  virtual gfx::ScopedMakeCurrent* GetScopedMakeCurrent() = 0;
-
   virtual void AddObserver(ImageTransportFactoryObserver* observer) = 0;
   virtual void RemoveObserver(ImageTransportFactoryObserver* observer) = 0;
 };