SkColorType instead of (deprecated) SkBitmap::Config

cc/test/layer_tree_json_parser.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/test/layer_tree_json_parser.h"
 
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
@@ skipping 51 matching lines @@
     success &= list->GetInteger(1, &border_y);
     success &= list->GetInteger(2, &border_width);
     success &= list->GetInteger(3, &border_height);
 
     bool fill_center;
     success &= dict->GetBoolean("FillCenter", &fill_center);
 
     scoped_refptr<NinePatchLayer> nine_patch_layer = NinePatchLayer::Create();
 
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config, image_width, image_height);
-    bitmap.allocPixels(NULL, NULL);
+    bitmap.setConfig(SkImageInfo::MakeN32Premul(image_width, image_height));

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

why isn't this allocN32Pixels()?

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

good catch. Done.

     bitmap.setImmutable();
     nine_patch_layer->SetBitmap(bitmap);
     nine_patch_layer->SetAperture(
         gfx::Rect(aperture_x, aperture_y, aperture_width, aperture_height));
     nine_patch_layer->SetBorder(
         gfx::Rect(border_x, border_y, border_width, border_height));
     nine_patch_layer->SetFillCenter(fill_center);
 
     new_layer = nine_patch_layer;
   } else if (layer_type == "TextureLayer") {
@@ skipping 80 matching lines @@
 
 }  // namespace
 
 scoped_refptr<Layer> ParseTreeFromJson(std::string json,
                                        ContentLayerClient* content_client) {
   scoped_ptr<base::Value> val = base::test::ParseJson(json);
   return ParseTreeFromValue(val.get(), content_client);
 }
 
 }  // namespace cc