android: Migrate old content readback to use async readback (and delegated renderer)

content/browser/renderer_host/compositor_impl_android.h

Index: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index c5dfd27ef7408e64b74daea79b49b00a090b3728..1574251f13b5dc709d4fcdc1eb5bb11ad034dfb4 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -37,7 +37,8 @@ class CONTENT_EXPORT CompositorImpl
     : public Compositor,
       public cc::LayerTreeHostClient,
       public cc::LayerTreeHostSingleThreadClient,
-      public ImageTransportFactoryAndroidObserver {
+      public ImageTransportFactoryAndroidObserver,
+      public cc::UIResourceClient {
  public:
   CompositorImpl(CompositorClient* client, gfx::NativeWindow root_window);
   virtual ~CompositorImpl();
@@ -61,15 +62,6 @@ class CONTENT_EXPORT CompositorImpl
   virtual cc::UIResourceId GenerateUIResource(
       const cc::UIResourceBitmap& bitmap) OVERRIDE;
   virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;
-  virtual GLuint GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE;
-  virtual GLuint GenerateCompressedTexture(
-      gfx::Size& size, int data_size, void* data) OVERRIDE;
-  virtual void DeleteTexture(GLuint texture_id) OVERRIDE;
-  virtual bool CopyTextureToBitmap(GLuint texture_id,
-                                   gfx::JavaBitmap& bitmap) OVERRIDE;
-  virtual bool CopyTextureToBitmap(GLuint texture_id,
-                                   const gfx::Rect& sub_rect,
-                                   gfx::JavaBitmap& bitmap) OVERRIDE;
 
   // LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
@@ -97,11 +89,11 @@ class CONTENT_EXPORT CompositorImpl
   // ImageTransportFactoryAndroidObserver implementation.
   virtual void OnLostResources() OVERRIDE;
 
- private:
-  GLuint BuildBasicTexture();
-  GLenum GetGLFormatForBitmap(gfx::JavaBitmap& bitmap);
-  GLenum GetGLTypeForBitmap(gfx::JavaBitmap& bitmap);
+  // UIResourceClient implementation.
+  virtual cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,
+                                         bool resource_lost) OVERRIDE;
 
+ private:
   scoped_refptr<cc::Layer> root_layer_;
   scoped_ptr<cc::LayerTreeHost> host_;
 
@@ -116,8 +108,9 @@ class CONTENT_EXPORT CompositorImpl
   scoped_refptr<cc::ContextProvider> null_offscreen_context_provider_;
 
   typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::ScopedUIResource>
-        UIResourceMap;
-  UIResourceMap ui_resource_map_;
+      ScopedUIResourceMap;
+  ScopedUIResourceMap scoped_ui_resource_map_;
+  scoped_ptr<cc::UIResourceBitmap> transient_ui_bitmap_;
 
   gfx::NativeWindow root_window_;