cc: Allow output readback/copy requests to specify a sub-rect to copy.

The CopyOutputRequest API is on cc::Layer, so the rect it is given
should be in layer space.

Also add tests for CompositeAndReadback which no longer had any pixel
test coverage in cc/ to ensure that its inputs are correctly applied
as device viewport space.

Clean up the layer tree pixel test framework by passing the test type
(GL/Software cross Bitmap/Texture) as a parameter to RunPixelTest()
instead of having tests set a pair of bools. Forces all tests to
specify the test type.

Tests:
LayerTreeHostReadbackPixelTest.ReadbackSubrect_Software
LayerTreeHostReadbackPixelTest.ReadbackSubrect_GL_Bitmap
LayerTreeHostReadbackPixelTest.ReadbackSubrect_GL
LayerTreeHostReadbackPixelTest.ReadbackNonRootLayerSubrect_Software
LayerTreeHostReadbackPixelTest.ReadbackNonRootLayerSubrect_GL_Bitmap
LayerTreeHostReadbackPixelTest.ReadbackNonRootLayerSubrect_GL
LayerTreeHostReadbackDeviceScalePixelTest.ReadbackSubrect_Software
LayerTreeHostReadbackDeviceScalePixelTest.ReadbackSubrect_GL
LayerTreeHostReadbackDeviceScalePixelTest.ReadbackNonRootLayerSubrect_Software
LayerTreeHostReadbackDeviceScalePixelTest.ReadbackNonRootLayerSubrect_GL
LayerTreeHostReadbackViaCompositeAndReadbackPixelTest.CompositeAndReadback_Software_1
LayerTreeHostReadbackViaCompositeAndReadbackPixelTest.CompositeAndReadback_Software_2
LayerTreeHostReadbackViaCompositeAndReadbackPixelTest.CompositeAndReadback_GL_1
LayerTreeHostReadbackViaCompositeAndReadbackPixelTest.CompositeAndReadback_GL_2

R=piman
BUG=251754
Merged https://codereview.chromium.org/17449014/ and
https://codereview.chromium.org/17261009/ into this CL.

Review URL: https://chromiumcodereview.appspot.com/17335011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207589 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 3 deletions

diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index 3cf1f6a..4b604a8 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -456,12 +456,20 @@ void SoftwareRenderer::DrawUnsupportedQuad(const DrawingFrame* frame,
 void SoftwareRenderer::CopyCurrentRenderPassToBitmap(
     DrawingFrame* frame,
     scoped_ptr<CopyOutputRequest> request) {
+  gfx::Rect copy_rect = frame->current_render_pass->output_rect;
+  if (request->has_area()) {
+    // Intersect with the request's area, positioned with its origin at the
+    // origin of the full copy_rect.
+    copy_rect.Intersect(request->area() - copy_rect.OffsetFromOrigin());
+  }
+  gfx::Rect window_copy_rect = MoveFromDrawToWindowSpace(copy_rect);
+
   scoped_ptr<SkBitmap> bitmap(new SkBitmap);
   bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    current_viewport_rect_.width(),
-                    current_viewport_rect_.height());
+                    window_copy_rect.width(),
+                    window_copy_rect.height());
   current_canvas_->readPixels(
-      bitmap.get(), current_viewport_rect_.x(), current_viewport_rect_.y());
+      bitmap.get(), window_copy_rect.x(), window_copy_rect.y());
 
   request->SendBitmapResult(bitmap.Pass());
 }