SkColorType instead of (deprecated) SkBitmap::Config

Part of this refactoring was the recognition of a common pattern:
- setConfig + alloc + setImmutable + pass_to_UIResourceBitmap

This CL introduces a direct way on UIResourceBitmap to create such a bitmap, by just specifying its dimensions. This encapsulates internal requirements (e.g. colortype and immutability).

Review URL: https://codereview.chromium.org/197883017

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

1 files changed, 5 insertions, 12 deletions

diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc
index 277a124..7d1c3b8 100644
--- a/cc/test/skia_common.cc
+++ b/cc/test/skia_common.cc
@@ -15,26 +15,19 @@ namespace cc {
 void DrawPicture(unsigned char* buffer,
                  const gfx::Rect& layer_rect,
                  scoped_refptr<Picture> picture) {
+  SkImageInfo info =
+      SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                   layer_rect.width(),
-                   layer_rect.height());
-  bitmap.setPixels(buffer);
+  bitmap.installPixels(info, buffer, info.minRowBytes());
   SkCanvas canvas(bitmap);
   canvas.clipRect(gfx::RectToSkRect(layer_rect));
   picture->Raster(&canvas, NULL, layer_rect, 1.0f);
 }
 
 void CreateBitmap(const gfx::Size& size, const char* uri, SkBitmap* bitmap) {
-  SkImageInfo info = {
-    size.width(),
-    size.height(),
-    kPMColor_SkColorType,
-    kPremul_SkAlphaType
-  };
+  SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
 
-  bitmap->setConfig(info);
-  bitmap->allocPixels();
+  bitmap->allocPixels(info);
   bitmap->pixelRef()->setImmutable();
   bitmap->pixelRef()->setURI(uri);
 }