SkColorType instead of (deprecated) SkBitmap::Config

cc/layers/ui_resource_layer_unittest.cc

 // Copyright 2013 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 "cc/layers/ui_resource_layer.h"
 
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/resources/scoped_ui_resource.h"
@@ skipping 47 matching lines @@
 
   ResourceUpdateQueue queue;
   gfx::Rect screen_space_clip_rect;
   OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect);
   test_layer->SavePaintProperties();
   test_layer->Update(&queue, &occlusion_tracker);
 
   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);
   test_layer->Update(&queue, &occlusion_tracker);
 
   EXPECT_TRUE(test_layer->DrawsContent());
 }
 
 TEST_F(UIResourceLayerTest, SetUIResourceId) {
   scoped_refptr<UIResourceLayer> test_layer = UIResourceLayer::Create();
   ASSERT_TRUE(test_layer.get());
   test_layer->SetIsDrawable(true);
   test_layer->SetBounds(gfx::Size(100, 100));
 
   layer_tree_host_->SetRootLayer(test_layer);
   Mock::VerifyAndClearExpectations(layer_tree_host_.get());
   EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get());
 
   ResourceUpdateQueue queue;
   gfx::Rect screen_space_clip_rect;
   OcclusionTracker<Layer> occlusion_tracker(screen_space_clip_rect);
   test_layer->SavePaintProperties();
   test_layer->Update(&queue, &occlusion_tracker);
 
   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);
 
   EXPECT_TRUE(test_layer->DrawsContent());
 }
 
 }  // namespace
 }  // namespace cc