Enable texture readback support for Android

content/common/gpu/client/gl_helper.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_COMMON_GPU_CLIENT_GL_HELPER_H_
 #define CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
 
 #include "base/atomicops.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 21 matching lines @@
   // scales it to |dst_size|, and writes it into |out|.
   // |src_size| is the size of |src_texture|. |callback| is invoked with the
   // copy result when the copy operation has completed.
   void CopyTextureTo(WebKit::WebGLId src_texture,
                      const gfx::Size& src_size,
                      const gfx::Rect& src_subrect,
                      const gfx::Size& dst_size,
                      unsigned char* out,
                      const base::Callback<void(bool)>& callback);
 
+  // Copies the raw texture data out of |texture| into |out|.  |size| is the
+  // size of the texture.  The texture is assumed to have a format of GL_RGBA
+  // with a pixel type of GL_UNSIGNED_BYTE.  This is a blocking call that calls
+  // glReadPixels on this current context.
+  void SyncCopyRawTextureTo(WebKit::WebGLId texture,

[piman, 2012/10/19 22:10:10]

I'm not sure what you mean by Raw.
This looks like CopyTextureTo except without cropping or scaling, and
synchronous.
Maybe rename CopyTextureTo into CropScaleAndReadbackTexture, whereas this one
would be ReadbackTextureSync, so that there's no confusion?

[David Trainor- moved to gerrit, 2012/10/19 22:33:54]

So CopyTextureTo seems to also potentially swizzle R and B/vertically flip the
image (inside WebGraphicsContext3D::readbackFramebuffer).  This version performs
no post operations on the texture it reads back for performance reasons.  It
uses readPixels instead of the utility method readbackFramebuffer.  I like the
name changes though.  I could go with CopyScaleReadbackAndCleanTexture
(mouthful, but accurate) and ReadbackTextureSync?

On 2012/10/19 22:10:10, piman wrote:

+                            const gfx::Size& size,
+                            unsigned char* out);
+
   // Creates a copy of the specified texture. |size| is the size of the texture.
   WebKit::WebGLId CopyTexture(WebKit::WebGLId texture,
                               const gfx::Size& size);
 
+  // Creates a scaled copy of the specified texture. |src_size| is the size of
+  // the texture and |dst_size| is the size of the resulting copy.
+  WebKit::WebGLId CopyTexture(WebKit::WebGLId texture,

[piman, 2012/10/19 22:10:10]

No overloading please. CopyAndScaleTexture?

[David Trainor- moved to gerrit, 2012/10/19 23:11:27]

Done.

+                              const gfx::Size& src_size,
+                              const gfx::Size& dst_size);
+
   // Returns the shader compiled from the source.
   WebKit::WebGLId CompileShaderFromSource(const WebKit::WGC3Dchar* source,
                                           WebKit::WGC3Denum type);
 
  private:
   class CopyTextureToImpl;
 
   // Creates |copy_texture_to_impl_| if NULL.
   void InitCopyTextToImpl();
 
   WebKit::WebGraphicsContext3D* context_;
   WebKit::WebGraphicsContext3D* context_for_thread_;
   scoped_ptr<CopyTextureToImpl> copy_texture_to_impl_;
 
   // The number of all GLHelper instances.
   static base::subtle::Atomic32 count_;
 
   DISALLOW_COPY_AND_ASSIGN(GLHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_