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..71911c5ae25dc81261a308c7351ddbc2abd2123d 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -17,13 +17,13 @@
 #include "content/public/browser/android/compositor.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
+class SkBitmap;
 struct ANativeWindow;
 
 namespace cc {
 class InputHandlerClient;
 class Layer;
 class LayerTreeHost;
-class ScopedUIResource;
 }
 
 namespace content {
@@ -58,18 +58,14 @@ class CONTENT_EXPORT CompositorImpl
   virtual bool CompositeAndReadback(
       void *pixels, const gfx::Rect& rect) OVERRIDE;
   virtual void Composite() OVERRIDE;
-  virtual cc::UIResourceId GenerateUIResource(
-      const cc::UIResourceBitmap& bitmap) OVERRIDE;
+  virtual cc::UIResourceId GenerateUIResource(const SkBitmap& bitmap,
+                                              bool is_transient) OVERRIDE;
+  virtual cc::UIResourceId GenerateCompressedUIResource(const gfx::Size& size,
+                                                        size_t data_size,

[aelias_OOO_until_Jul13, 2014/02/01 02:09:20]

On second thought, is this argument needed at all?  Isn't it always size.width()
* size.height() / 2?

[David Trainor- moved to gerrit, 2014/02/02 18:38:53]

IIRC valid content size is different from the size of the data (we had to pad it
for the - potentially incorrect - compression algorithm requirements).  Some
drivers required powers of 2 or something.  Not 100% sure if that's still
necessary though?

On 2014/02/01 02:09:20, aelias wrote:

[aelias_OOO_until_Jul13, 2014/02/03 08:40:36]

It's likely still necessary since those devices likely never got updated
requirements.  My assumption was more that you are already handling all the
adjustments needed for that padding downstream so nothing in Chromium-side needs
to know about it?  Is that correct?

[David Trainor- moved to gerrit, 2014/02/03 18:40:10]

We handle adding the padding the compressed texture, but the size of the texture
data might not represent the valid size of the content area after that, so I
think this is needed so the resource layers can properly calculate the right uv.
 That stuff is all abstracted away from downstream now.

On 2014/02/03 08:40:36, aelias wrote:

[aelias_OOO_until_Jul13, 2014/02/03 18:51:13]

Well, the "size" value passed in this method isn't used for UV calculation but
for memory allocation only, so I don't think we need to pass it in this
particular method.

[powei, 2014/02/03 23:39:10]

Done.  I removed this argument for now since downstream code does pad.

+                                                        void* pixels,
+                                                        bool is_transient)
+      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 {}
@@ -98,9 +94,9 @@ class CONTENT_EXPORT CompositorImpl
   virtual void OnLostResources() OVERRIDE;
 
  private:
-  GLuint BuildBasicTexture();
-  GLenum GetGLFormatForBitmap(gfx::JavaBitmap& bitmap);
-  GLenum GetGLTypeForBitmap(gfx::JavaBitmap& bitmap);
+  cc::UIResourceId GenerateUIResourceFromUIResourceBitmap(
+      const cc::UIResourceBitmap& bitmap,
+      bool is_transient);
 
   scoped_refptr<cc::Layer> root_layer_;
   scoped_ptr<cc::LayerTreeHost> host_;
@@ -115,8 +111,8 @@ class CONTENT_EXPORT CompositorImpl
 
   scoped_refptr<cc::ContextProvider> null_offscreen_context_provider_;
 
-  typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::ScopedUIResource>
-        UIResourceMap;
+  typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::UIResourceClient>
+      UIResourceMap;
   UIResourceMap ui_resource_map_;
 
   gfx::NativeWindow root_window_;