SkColorType instead of (deprecated) SkBitmap::Config

cc/test/layer_tree_pixel_test.cc

Index: cc/test/layer_tree_pixel_test.cc
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc
index 7ae11c35d2e87ff532f63038898ed3accc2fd748..a282cc498d6126428afd3c770a6ce5fb65920d76 100644
--- a/cc/test/layer_tree_pixel_test.cc
+++ b/cc/test/layer_tree_pixel_test.cc
@@ -268,12 +268,8 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(
   gl->DeleteTextures(1, &texture_id);
 
   scoped_ptr<SkBitmap> bitmap(new SkBitmap);
-  bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                    size.width(),
-                    size.height());
-  bitmap->allocPixels();
+  bitmap->allocN32Pixels(size.width(), size.height());
 
-  scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap));
   uint8* out_pixels = static_cast<uint8*>(bitmap->getPixels());
 
   size_t row_bytes = size.width() * 4;
@@ -324,7 +320,7 @@ void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture(
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-  DCHECK_EQ(SkBitmap::kARGB_8888_Config, bitmap.getConfig());
+  DCHECK_EQ(kPMColor_SkColorType, bitmap.colorType());

[enne (OOO), 2014/03/18 19:43:03]

Is this the same check?

[reed1, 2014/03/21 20:49:01]

Yes. In SkColorType world, we now have two explicit swizzles named: kRGBA and
kBGRA. kPMColor is an alias for which ever one corresponds to the default for
skia's backend (which is exactly what kARGB_8888_Config was used for).

In the future, when we fully support both swizzles (at least on input), the
caller for this may want to pick either, and then we should relax this assert
AND update the swizzle code below.

My change was to just maintain parity with the existing functionality.

 
   {
     SkAutoLockPixels lock(bitmap);