Remove uses of skia::ReadPixels(PaintCanvas)

ui/gfx/nine_image_painter_unittest.cc

 // Copyright 2015 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 "ui/gfx/nine_image_painter.h"
 
 #include "base/base64.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/codec/png_codec.h"
@@ skipping 67 matching lines @@
 
   bool is_opaque = true;
   gfx::Canvas canvas(gfx::Size(100, 100), image_scale, is_opaque);
 
   gfx::Vector2d offset(20, 10);
   canvas.Translate(offset);
 
   gfx::Rect bounds(0, 0, 50, 50);
   painter.Paint(&canvas, bounds);
 
-  SkBitmap result;
-  const SkISize size = canvas.sk_canvas()->getBaseLayerSize();
-  result.allocN32Pixels(size.width(), size.height());
-  canvas.sk_canvas()->readPixels(&result, 0, 0);
+  SkBitmap result = canvas.ToBitmap();
 
   gfx::Vector2d paint_offset =
       gfx::ToFlooredVector2d(gfx::ScaleVector2d(offset, image_scale));
   gfx::Rect green_rect = gfx::Rect(10, 10, 80, 80) + paint_offset;
   gfx::Rect outer_rect = gfx::Rect(100, 100) + paint_offset;
   ExpectRedWithGreenRect(result, outer_rect, green_rect);
 }
 
 TEST(NineImagePainterTest, PaintStaysInBounds) {
   // In this test the bounds rect is 1x1 but each image is 2x2.
@@ skipping 10 matching lines @@
   gfx::NineImagePainter painter(image, insets);
 
   int image_scale = 1;
   bool is_opaque = true;
   gfx::Canvas canvas(gfx::Size(3, 3), image_scale, is_opaque);
   canvas.DrawColor(SK_ColorBLACK);
 
   gfx::Rect bounds(1, 1, 1, 1);
   painter.Paint(&canvas, bounds);
 
-  SkBitmap result;
-  const SkISize size = canvas.sk_canvas()->getBaseLayerSize();
-  result.allocN32Pixels(size.width(), size.height());
-  canvas.sk_canvas()->readPixels(&result, 0, 0);
+  SkBitmap result = canvas.ToBitmap();
 
   EXPECT_EQ(SK_ColorGREEN, result.getColor(1, 1));
 
   EXPECT_EQ(SK_ColorBLACK, result.getColor(0, 0));
   EXPECT_EQ(SK_ColorBLACK, result.getColor(0, 1));
   EXPECT_EQ(SK_ColorBLACK, result.getColor(0, 2));
   EXPECT_EQ(SK_ColorBLACK, result.getColor(1, 0));
   EXPECT_EQ(SK_ColorBLACK, result.getColor(1, 2));
   EXPECT_EQ(SK_ColorBLACK, result.getColor(2, 0));
   EXPECT_EQ(SK_ColorBLACK, result.getColor(2, 1));
   EXPECT_EQ(SK_ColorBLACK, result.getColor(2, 2));
 }
 
 TEST(NineImagePainterTest, PaintWithBoundOffset) {
   SkBitmap src;
   src.allocN32Pixels(10, 10);
   src.eraseColor(SK_ColorRED);
   src.eraseArea(SkIRect::MakeXYWH(1, 1, 8, 8), SK_ColorGREEN);
 
   gfx::ImageSkia image(gfx::ImageSkiaRep(src, 0.0f));
   gfx::Insets insets(1, 1, 1, 1);
   gfx::NineImagePainter painter(image, insets);
 
   bool is_opaque = true;
   gfx::Canvas canvas(gfx::Size(10, 10), 1, is_opaque);
 
   gfx::Rect bounds(1, 1, 10, 10);
   painter.Paint(&canvas, bounds);
 
-  SkBitmap result;
-  const SkISize size = canvas.sk_canvas()->getBaseLayerSize();
-  result.allocN32Pixels(size.width(), size.height());
-  canvas.sk_canvas()->readPixels(&result, 0, 0);
+  SkBitmap result = canvas.ToBitmap();
 
   SkIRect green_rect = SkIRect::MakeLTRB(2, 2, 10, 10);
   for (int y = 1; y < 10; y++) {
     for (int x = 1; x < 10; x++) {
       if (green_rect.contains(x, y)) {
         ASSERT_EQ(SK_ColorGREEN, result.getColor(x, y));
       } else {
         ASSERT_EQ(SK_ColorRED, result.getColor(x, y));
       }
     }
@@ skipping 15 matching lines @@
   bool is_opaque = true;
   gfx::Canvas canvas(gfx::Size(400, 400), image_scale, is_opaque);
 
   gfx::Vector2d offset(20, 10);
   canvas.Translate(offset);
   canvas.Scale(2, 1);
 
   gfx::Rect bounds(0, 0, 50, 50);
   painter.Paint(&canvas, bounds);
 
-  SkBitmap result;
-  const SkISize size = canvas.sk_canvas()->getBaseLayerSize();
-  result.allocN32Pixels(size.width(), size.height());
-  canvas.sk_canvas()->readPixels(&result, 0, 0);
+  SkBitmap result = canvas.ToBitmap();
 
   gfx::Vector2d paint_offset =
       gfx::ToFlooredVector2d(gfx::ScaleVector2d(offset, image_scale));
   gfx::Rect green_rect = gfx::Rect(20, 10, 160, 80) + paint_offset;
   gfx::Rect outer_rect = gfx::Rect(200, 100) + paint_offset;
   ExpectRedWithGreenRect(result, outer_rect, green_rect);
 }
 
 TEST(NineImagePainterTest, PaintWithNegativeScale) {
   SkBitmap src;
   src.allocN32Pixels(100, 100);
   src.eraseColor(SK_ColorRED);
   src.eraseArea(SkIRect::MakeXYWH(10, 10, 80, 80), SK_ColorGREEN);
 
   float image_scale = 2.f;
 
   gfx::ImageSkia image(gfx::ImageSkiaRep(src, image_scale));
   gfx::Insets insets(10, 10, 10, 10);
   gfx::NineImagePainter painter(image, insets);
 
   bool is_opaque = true;
   gfx::Canvas canvas(gfx::Size(400, 400), image_scale, is_opaque);
   canvas.Translate(gfx::Vector2d(70, 60));
   canvas.Scale(-1, -1);
 
   gfx::Rect bounds(0, 0, 50, 50);
   painter.Paint(&canvas, bounds);
 
-  SkBitmap result;
-  const SkISize size = canvas.sk_canvas()->getBaseLayerSize();
-  result.allocN32Pixels(size.width(), size.height());
-  canvas.sk_canvas()->readPixels(&result, 0, 0);
+  SkBitmap result = canvas.ToBitmap();
 
   // The painting space is 50x50 and the scale of -1,-1 means an offset of 50,50
   // would put the output in the top left corner. Since the offset is 70,60 it
   // moves by 20,10. Since the output is 2x DPI it will become offset by 40,20.
   gfx::Vector2d paint_offset(40, 20);
   gfx::Rect green_rect = gfx::Rect(10, 10, 80, 80) + paint_offset;
   gfx::Rect outer_rect = gfx::Rect(100, 100) + paint_offset;
   ExpectRedWithGreenRect(result, outer_rect, green_rect);
 }
 
 }  // namespace gfx