SkColorType instead of (deprecated) SkBitmap::Config

cc/trees/layer_tree_host_pixeltest_readback.cc

Index: cc/trees/layer_tree_host_pixeltest_readback.cc
diff --git a/cc/trees/layer_tree_host_pixeltest_readback.cc b/cc/trees/layer_tree_host_pixeltest_readback.cc
index e7845359dea29d7313041689fc49db32e3521aa3..e8ad466dfa72633c83b7b164a5239bc501ee9ba1 100644
--- a/cc/trees/layer_tree_host_pixeltest_readback.cc
+++ b/cc/trees/layer_tree_host_pixeltest_readback.cc
@@ -1109,15 +1109,10 @@ class LayerTreeHostReadbackViaCompositeAndReadbackPixelTest
       device_viewport_copy_rect.Intersect(device_viewport_copy_subrect_);
 
     scoped_ptr<SkBitmap> bitmap(new SkBitmap);
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                      device_viewport_copy_rect.width(),
-                      device_viewport_copy_rect.height());
-    bitmap->allocPixels();
-    {
-      scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap));

[danakj, 2014/03/25 16:13:59]

So what will unlock the bitmap's pixels, or why don't we need to worry about
that anymore?

[reed1, 2014/03/25 17:19:41]

allocPixels() guarantees to lock the pixels automatically. That behavior is not
new, so I am just removing unnecessary code.

[danakj, 2014/03/25 17:31:29]

Ya, I wasn't aware of that before, but doing a scoped lock would have unlocked
the pixels. Do we need to worry about leaving the pixels locked indefinitely, is
what I am wondering?

[reed1, 2014/03/25 17:35:53]

For non-lazy bitmaps (as when they are the target for drawing like this),
staying locked all the time is fine, and basically the norm.

The old code performed a lock/unlock pair, so it was also leaving the bitmap
locked (net), since it started out locked.

-      layer_tree_host()->CompositeAndReadback(bitmap->getPixels(),
-                                              device_viewport_copy_rect);
-    }
+    bitmap->allocN32Pixels(device_viewport_copy_rect.width(),
+                           device_viewport_copy_rect.height());
+    layer_tree_host()->CompositeAndReadback(bitmap->getPixels(),
+                                            device_viewport_copy_rect);
 
     result_bitmap_ = bitmap.Pass();
     EndTest();