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

content/browser/renderer_host/compositor_impl_android.cc

 // 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.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <map>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "cc/trees/layer_tree_host.h"
+#include "content/browser/android/transient_ui_resource.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/browser/android/compositor_client.h"
 #include "content/public/common/content_switches.h"
@@ skipping 225 matching lines @@
   if (host_)
     return host_->CompositeAndReadback(pixels, rect);
   else
     return false;
 }
 
 cc::UIResourceId CompositorImpl::GenerateUIResource(
     const cc::UIResourceBitmap& bitmap) {
   if (!host_)
     return 0;
-  scoped_ptr<cc::ScopedUIResource> ui_resource =
-      cc::ScopedUIResource::Create(host_.get(), bitmap);
-  cc::UIResourceId id = ui_resource->id();
+  scoped_ptr<cc::UIResourceClient> ui_resource;
+  cc::UIResourceId id = 0;
+  if (bitmap.GetFormat() == cc::UIResourceBitmap::RGBA8) {
+    scoped_ptr<cc::ScopedUIResource> scoped =
+        cc::ScopedUIResource::Create(host_.get(), bitmap);
+    id = scoped->id();
+    ui_resource.reset(scoped.release());
+  } else if (bitmap.GetFormat() == cc::UIResourceBitmap::ETC1) {
+    scoped_ptr<TransientUIResource> transient =
+        TransientUIResource::Create(host_.get(), bitmap);
+    id = transient->id();
+    ui_resource.reset(transient.release());
+  } else {
+    NOTREACHED();
+  }
+
   ui_resource_map_.set(id, ui_resource.Pass());
   return id;
 }
 
 void CompositorImpl::DeleteUIResource(cc::UIResourceId resource_id) {
   UIResourceMap::iterator it = ui_resource_map_.find(resource_id);
   if (it != ui_resource_map_.end())
     ui_resource_map_.erase(it);
 }
 
-GLuint CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) {
-  unsigned int texture_id = BuildBasicTexture();
-  gpu::gles2::GLES2Interface* gl =
-      ImageTransportFactoryAndroid::GetInstance()->GetContextGL();
-  if (texture_id == 0u)
-    return 0u;
-  GLenum format = GetGLFormatForBitmap(bitmap);
-  GLenum type = GetGLTypeForBitmap(bitmap);
-
-  gl->TexImage2D(GL_TEXTURE_2D,
-                 0,
-                 format,
-                 bitmap.size().width(),
-                 bitmap.size().height(),
-                 0,
-                 format,
-                 type,
-                 bitmap.pixels());
-  gl->ShallowFlushCHROMIUM();
-  return texture_id;
-}
-
-GLuint CompositorImpl::GenerateCompressedTexture(gfx::Size& size,
-                                                 int data_size,
-                                                 void* data) {
-  unsigned int texture_id = BuildBasicTexture();
-  gpu::gles2::GLES2Interface* gl =
-      ImageTransportFactoryAndroid::GetInstance()->GetContextGL();
-  if (texture_id == 0u)
-    return 0u;
-  gl->CompressedTexImage2D(GL_TEXTURE_2D,
-                           0,
-                           GL_ETC1_RGB8_OES,
-                           size.width(),
-                           size.height(),
-                           0,
-                           data_size,
-                           data);
-  gl->ShallowFlushCHROMIUM();
-  return texture_id;
-}
-
-void CompositorImpl::DeleteTexture(GLuint texture_id) {
-  gpu::gles2::GLES2Interface* gl =
-      ImageTransportFactoryAndroid::GetInstance()->GetContextGL();
-  gl->DeleteTextures(1, &texture_id);
-  gl->ShallowFlushCHROMIUM();
-}
-
-bool CompositorImpl::CopyTextureToBitmap(GLuint texture_id,
-                                         gfx::JavaBitmap& bitmap) {
-  return CopyTextureToBitmap(texture_id, gfx::Rect(bitmap.size()), bitmap);
-}
-
-bool CompositorImpl::CopyTextureToBitmap(GLuint texture_id,
-                                         const gfx::Rect& sub_rect,
-                                         gfx::JavaBitmap& bitmap) {
-  // The sub_rect should match the bitmap size.
-  DCHECK(bitmap.size() == sub_rect.size());
-  if (bitmap.size() != sub_rect.size() || texture_id == 0) return false;
-
-  GLHelper* helper = ImageTransportFactoryAndroid::GetInstance()->GetGLHelper();
-  helper->ReadbackTextureSync(texture_id,
-                              sub_rect,
-                              static_cast<unsigned char*> (bitmap.pixels()),
-                              SkBitmap::kARGB_8888_Config);
-  return true;
+void CompositorImpl::SetNeedsCommit() {
+  if (host_) {
+    host_->SetNeedsCommit();
+  }
 }
 
 static scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
 CreateGpuProcessViewContext(
     const blink::WebGraphicsContext3D::Attributes attributes,
     int surface_id) {
   BrowserGpuChannelHostFactory* factory =
       BrowserGpuChannelHostFactory::instance();
   CauseForGpuLaunch cause =
       CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
@@ skipping 73 matching lines @@
 void CompositorImpl::DidPostSwapBuffers() {
   TRACE_EVENT0("compositor", "CompositorImpl::DidPostSwapBuffers");
   client_->OnSwapBuffersPosted();
 }
 
 void CompositorImpl::DidAbortSwapBuffers() {
   TRACE_EVENT0("compositor", "CompositorImpl::DidAbortSwapBuffers");
   client_->OnSwapBuffersCompleted();
 }
 
 GLuint CompositorImpl::BuildBasicTexture() {

[no sievers, 2014/01/28 20:47:21]

remove this function

[powei, 2014/01/29 13:53:17]

Done.

   gpu::gles2::GLES2Interface* gl =
       ImageTransportFactoryAndroid::GetInstance()->GetContextGL();
   GLuint texture_id = 0u;
   gl->GenTextures(1, &texture_id);
   gl->BindTexture(GL_TEXTURE_2D, texture_id);
   gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   return texture_id;
 }
 
 GLenum CompositorImpl::GetGLFormatForBitmap(gfx::JavaBitmap& bitmap) {

[no sievers, 2014/01/28 20:47:21]

remove this function

[powei, 2014/01/29 13:53:17]

Done.

   switch (bitmap.format()) {
     case ANDROID_BITMAP_FORMAT_A_8:
       return GL_ALPHA;
       break;
     case ANDROID_BITMAP_FORMAT_RGBA_4444:
       return GL_RGBA;
       break;
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_RGBA;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_RGB;
   }
 }
 
 GLenum CompositorImpl::GetGLTypeForBitmap(gfx::JavaBitmap& bitmap) {

[no sievers, 2014/01/28 20:47:21]

remove this function

[powei, 2014/01/29 13:53:17]

Done.

   switch (bitmap.format()) {
     case ANDROID_BITMAP_FORMAT_A_8:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGBA_4444:
       return GL_UNSIGNED_SHORT_4_4_4_4;
       break;
     case ANDROID_BITMAP_FORMAT_RGBA_8888:
       return GL_UNSIGNED_BYTE;
       break;
     case ANDROID_BITMAP_FORMAT_RGB_565:
     default:
       return GL_UNSIGNED_SHORT_5_6_5;
   }
 }
 
 void CompositorImpl::DidCommit() {
   root_window_->OnCompositingDidCommit();
 }
 
 } // namespace content