Implement transform/clip support for Android WebView.

cc/output/software_renderer.cc

Index: cc/output/software_renderer.cc
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index b555b57e6abbb11aea15779530a0d98dd857c8f6..f6d383f91c0dc1d408c839c1d59ac29523d7501e 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -53,11 +53,10 @@ scoped_ptr<SoftwareRenderer> SoftwareRenderer::Create(
 SoftwareRenderer::SoftwareRenderer(RendererClient* client,
                                    OutputSurface* output_surface,
                                    ResourceProvider* resource_provider)
-  : DirectRenderer(client, resource_provider),
+  : DirectRenderer(client, output_surface, resource_provider),
     visible_(true),
     is_scissor_enabled_(false),
     is_viewport_changed_(true),
-    output_surface_(output_surface),
     output_device_(output_surface->software_device()),
     current_canvas_(NULL) {
   if (resource_provider_) {
@@ -88,7 +87,7 @@ void SoftwareRenderer::BeginDrawingFrame(DrawingFrame* frame) {
   TRACE_EVENT0("cc", "SoftwareRenderer::BeginDrawingFrame");
   if (is_viewport_changed_) {
     is_viewport_changed_ = false;
-    output_device_->Resize(ViewportSize());
+    output_device_->Resize(client_->DeviceViewport().size());
   }
   root_canvas_ = output_device_->BeginPaint(
       gfx::ToEnclosingRect(frame->root_damage_rect));
@@ -152,8 +151,9 @@ bool SoftwareRenderer::BindFramebufferToTexture(
       new ResourceProvider::ScopedWriteLockSoftware(
           resource_provider_, texture->id()));
   current_canvas_ = current_framebuffer_lock_->sk_canvas();
-  InitializeMatrices(frame, framebuffer_rect, false);
-  SetDrawViewportSize(framebuffer_rect.size());
+  InitializeMatrices(
+      frame, framebuffer_rect, gfx::Rect(framebuffer_rect.size()), false);

[enne (OOO), 2013/06/04 17:26:03]

I'm a little curious about this change.  When does this framebuffer rect not
have a position of zero? Should this function be taking in a gfx::Size instead
of a rect?

[aelias_OOO_until_Jul13, 2013/06/04 17:54:20]

I'll investigate and consider changing the argument to gfx::Size.

[aelias_OOO_until_Jul13, 2013/06/04 22:18:27]

It needs to be a rect since framebuffer_rect is set from the clip rect,
therefore the draw is translated and we need to cancel that out in the
projection matrix.  The problem is that the variable name is misleading -- I
changed it to "target_rect" in all the Renderers.

+  SetDrawViewport(gfx::Rect(framebuffer_rect.size()));
 
   return true;
 }
@@ -193,7 +193,7 @@ void SoftwareRenderer::ClearFramebuffer(DrawingFrame* frame) {
   }
 }
 
-void SoftwareRenderer::SetDrawViewportSize(gfx::Size viewport_size) {}
+void SoftwareRenderer::SetDrawViewport(gfx::Rect viewport) {}

[enne (OOO), 2013/06/04 17:26:03]

How does the software renderer get away with ignoring the viewport?

[aelias_OOO_until_Jul13, 2013/06/04 17:54:20]

The software renderer applies the window_matrix directly.  It gets the viewport
transformation that way instead.

 
 bool SoftwareRenderer::IsSoftwareResource(
     ResourceProvider::ResourceId resource_id) const {