SkColorType instead of (deprecated) SkBitmap::Config

cc/layers/ui_resource_layer_unittest.cc

Index: cc/layers/ui_resource_layer_unittest.cc
diff --git a/cc/layers/ui_resource_layer_unittest.cc b/cc/layers/ui_resource_layer_unittest.cc
index 1e0e1dea0a5a618e42cf7de83da5a9c5a692d85c..362c29c5088d23a875abaa8e4168fe2400a9e7a1 100644
--- a/cc/layers/ui_resource_layer_unittest.cc
+++ b/cc/layers/ui_resource_layer_unittest.cc
@@ -65,8 +65,7 @@ TEST_F(UIResourceLayerTest, SetBitmap) {
   EXPECT_FALSE(test_layer->DrawsContent());
 
   SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
-  bitmap.allocPixels();
+  bitmap.allocN32Pixels(10, 10);

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

Can this be part of the ctor call too?

Or, I guess I don't understand why some calls to
setConfig+allocPixels+setImmutable get moved to the constructor and others like
this just get changed to allocN32Pixels.

[reed1, 2014/03/18 19:33:08]

I tried to move all of the older calling pattern over to the new when I could.
In this case, the caller is not creating a UIResourceBitmap, but is calling
SetBitmap() on a layer. Does that api (SetBitmap) really want a UIResourceBitmap
instead?

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

Oh, I see! Sorry for misreading this.  I don't think other locations need a
UIResourceBitmap.

   bitmap.setImmutable();
 
   test_layer->SetBitmap(bitmap);
@@ -93,13 +92,8 @@ TEST_F(UIResourceLayerTest, SetUIResourceId) {
 
   EXPECT_FALSE(test_layer->DrawsContent());
 
-  SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config, 10, 10);
-  bitmap.allocPixels();
-  bitmap.setImmutable();
-
   scoped_ptr<ScopedUIResource> resource = ScopedUIResource::Create(
-      layer_tree_host_.get(), UIResourceBitmap(bitmap));
+      layer_tree_host_.get(), UIResourceBitmap(10, 10));
   test_layer->SetUIResourceId(resource->id());
   test_layer->Update(&queue, &occlusion_tracker);