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

content/public/browser/android/compositor.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_H_
 #define CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_H_
 
 #include "base/callback.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "cc/resources/ui_resource_client.h"
@@ skipping 54 matching lines @@
   virtual void SetHasTransparentBackground(bool flag) = 0;
 
   // Attempts to composite and read back the result into the provided buffer.
   // The buffer must be at least window width * height * 4 (RGBA) bytes large.
   // The buffer is not modified if false is returned.
   virtual bool CompositeAndReadback(void *pixels, const gfx::Rect& rect) = 0;
 
   // Composite immediately. Used in single-threaded mode.
   virtual void Composite() = 0;
 
-  // Generates a UIResource and returns a UIResourceId.  May return 0.
+  // Generates a UIResource and returns a UIResourceId.  |is_transient|
+  // indicates whether or not to release the resource once the bitmap
+  // has been uploaded. May return 0.
   virtual cc::UIResourceId GenerateUIResource(
-      const cc::UIResourceBitmap& bitmap) = 0;
+      const cc::UIResourceBitmap& bitmap,

[aelias_OOO_until_Jul13, 2014/01/31 05:50:10]

Since GenerateCompressedUIResource takes a void* data, I think this should take
an SkBitmap for consistency.  (And maybe we can then avoid referencing
UIResourceBitmap from downstream entirely?)  Then what's currently in this
method should be in a private method.

[powei, 2014/02/01 01:30:49]

Done.  Removed UIResourceBitmap references downstream.

+      bool is_transient) = 0;
+
+  // Generates a compressed UIResource.  See above for |is_transient|.  May

[aelias_OOO_until_Jul13, 2014/01/31 05:50:10]

"ETC1 compressed"

[powei, 2014/02/01 01:30:49]

Done.

+  // return 0.
+  virtual cc::UIResourceId GenerateCompressedUIResource(gfx::Size& size,
+                                                        int data_size,
+                                                        void* data,
+                                                        bool is_transient) = 0;
 
   // Deletes a UIResource.
   virtual void DeleteUIResource(cc::UIResourceId resource_id) = 0;
 
-  // Generates an OpenGL texture and returns a texture handle.  May return 0
-  // if the current context is lost.
-  virtual blink::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) = 0;
-
-  // Generates an OpenGL compressed texture and returns a texture handle.  May
-  // return 0 if the current context is lost.
-  virtual blink::WebGLId GenerateCompressedTexture(gfx::Size& size,
-                                                    int data_size,
-                                                    void* data) = 0;
-
-  // Deletes an OpenGL texture.
-  virtual void DeleteTexture(blink::WebGLId texture_id) = 0;
-
-  // Grabs a copy of |texture_id| and saves it into |bitmap|.  No scaling is
-  // done.  It is assumed that the texture size matches that of the bitmap.
-  virtual bool CopyTextureToBitmap(blink::WebGLId texture_id,
-                                   gfx::JavaBitmap& bitmap) = 0;
-
-  // Grabs a copy of |texture_id| and saves it into |bitmap|.  No scaling is
-  // done. |src_rect| allows the caller to specify which rect of |texture_id|
-  // to copy to |bitmap|.  It needs to match the size of |bitmap|.  Returns
-  // true if the |texture_id| was copied into |bitmap|, false if not.
-  virtual bool CopyTextureToBitmap(blink::WebGLId texture_id,
-                                   const gfx::Rect& src_rect,
-                                   gfx::JavaBitmap& bitmap) = 0;
  protected:
   Compositor() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_H_