Very basic Android browser-side compositing support.

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index d16141b25ff6c3ad5a005f1253f50968229dae01..9ce395ef31e30a934d3d0d8884f5938721458ddc 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -15,6 +15,8 @@
 #include "content/common/android/device_info.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/render_view_host.h"

[jam, 2012/08/30 18:51:54]

it's a layering violation of RenderWidgetHost talks to RenderViewHost. how this
is usually done is that RWHImpl calls a virtual function on itself, which
RVWImpl overrides.

[no sievers, 2012/08/31 01:31:11]

Done.

+#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 
 namespace content {
 
@@ -26,12 +28,16 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
       // ContentViewCore.  It being NULL means that it is not attached to the
       // View system yet, so we treat it as hidden.
       is_hidden_(!content_view_core),
-      content_view_core_(content_view_core) {
+      content_view_core_(content_view_core),
+      texture_layer_(WebKit::WebExternalTextureLayer::create()) {
   host_->SetView(this);
   // RenderWidgetHost is initialized as visible. If is_hidden_ is true, tell
   // RenderWidgetHost to hide.
   if (is_hidden_)
     host_->WasHidden();
+  texture_layer_->layer()->setDrawsContent(!is_hidden_);
+  RenderViewHost* view_host = RenderViewHost::From(host_);
+  view_host->GetDelegate()->AttachLayer(texture_layer_->layer());
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
@@ -85,6 +91,7 @@ void RenderWidgetHostViewAndroid::SetSize(const gfx::Size& size) {
     requested_size_ = gfx::Size(size.width(), size.height());
     host_->WasResized();
   }
+  texture_layer_->layer()->setBounds(size);
 }
 
 void RenderWidgetHostViewAndroid::SetBounds(const gfx::Rect& rect) {
@@ -141,11 +148,11 @@ bool RenderWidgetHostViewAndroid::IsSurfaceAvailableForCopy() const {
 }
 
 void RenderWidgetHostViewAndroid::Show() {
-  // nothing to do
+  texture_layer_->layer()->setDrawsContent(true);
 }
 
 void RenderWidgetHostViewAndroid::Hide() {
-  // nothing to do
+  texture_layer_->layer()->setDrawsContent(false);
 }
 
 bool RenderWidgetHostViewAndroid::IsShowing() {
@@ -196,6 +203,9 @@ void RenderWidgetHostViewAndroid::RenderViewGone(
 }
 
 void RenderWidgetHostViewAndroid::Destroy() {
+  RenderViewHost* view_host = RenderViewHost::From(host_);
+  view_host->GetDelegate()->RemoveLayer(texture_layer_->layer());
+
   content_view_core_ = NULL;
 
   // The RenderWidgetHost's destruction led here, so don't call it.
@@ -256,6 +266,12 @@ void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() {
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
+  texture_layer_->setTextureId(params.surface_handle);
+  texture_layer_->layer()->invalidate();
+  // TODO(sievers): The view and layer should get sized proactively.
+  if (((gfx::Size)texture_layer_->layer()->bounds()).IsEmpty())
+    texture_layer_->layer()->setBounds(
+        DrawDelegateImpl::GetInstance()->GetBounds());
   DrawDelegateImpl::GetInstance()->OnSurfaceUpdated(
       params.surface_handle,
       this,