Adds a bounds parameter to ui::Compositor::ReadPixels

ui/gfx/compositor/layer_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 989 matching lines @@
   l1->SetBounds(gfx::Rect(5, 5, 100, 100));
 
   // The CompositorDelegate (us) should have been told to draw for a resize.
   EXPECT_TRUE(schedule_draw_invoked_);
 }
 
 // Checks that pixels are actually drawn to the screen with a read back.
 TEST_F(LayerWithRealCompositorTest, MAYBE_DrawPixels) {
   scoped_ptr<Layer> layer(CreateColorLayer(SK_ColorRED,
                                            gfx::Rect(0, 0, 500, 500)));
+  scoped_ptr<Layer> layer2(CreateColorLayer(SK_ColorBLUE,
+                                            gfx::Rect(0, 0, 500, 10)));
+
+  layer->Add(layer2.get());
+
   DrawTree(layer.get());
 
   SkBitmap bitmap;
-  ASSERT_TRUE(GetCompositor()->ReadPixels(&bitmap));
+  gfx::Size size = GetCompositor()->size();
+  ASSERT_TRUE(GetCompositor()->ReadPixels(&bitmap,
+                                          gfx::Rect(0, 10,
+                                          size.width(), size.height() - 10)));
   ASSERT_FALSE(bitmap.empty());
 
   SkAutoLockPixels lock(bitmap);
   bool is_all_red = true;
   for (int x = 0; is_all_red && x < 500; x++)
-    for (int y = 0; is_all_red && y < 500; y++)
+    for (int y = 0; is_all_red && y < 490; y++)
       is_all_red = is_all_red && (bitmap.getColor(x, y) == SK_ColorRED);
 
   EXPECT_TRUE(is_all_red);
 }
 
 // Checks the logic around Compositor::SetRootLayer and Layer::SetCompositor.
 TEST_F(LayerWithRealCompositorTest, MAYBE_SetRootLayer) {
   Compositor* compositor = GetCompositor();
   Layer l1;
   EXPECT_EQ(NULL, l1.GetCompositor());
@@ skipping 81 matching lines @@
   GetCompositor()->RemoveObserver(&observer);
 
   // Opacity changes should no longer alert the removed observer.
   observer.Reset();
   l2->SetOpacity(0.5f);
   RunPendingMessages();
   EXPECT_FALSE(observer.notified());
 }
 
 } // namespace ui