stop calling deprecated setConfig

skia/ext/image_operations_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <cmath>
 #include <iomanip>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 93 matching lines @@
 // Returns true if each channel of the given two colors are "close." This is
 // used for comparing colors where rounding errors may cause off-by-one.
 bool ColorsClose(uint32_t a, uint32_t b) {
   return abs(static_cast<int>(SkColorGetB(a) - SkColorGetB(b))) < 2 &&
          abs(static_cast<int>(SkColorGetG(a) - SkColorGetG(b))) < 2 &&
          abs(static_cast<int>(SkColorGetR(a) - SkColorGetR(b))) < 2 &&
          abs(static_cast<int>(SkColorGetA(a) - SkColorGetA(b))) < 2;
 }
 
 void FillDataToBitmap(int w, int h, SkBitmap* bmp) {
-  bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
-  bmp->allocPixels();
+  bmp->allocN32Pixels(w, h);
 
   for (int y = 0; y < h; ++y) {
     for (int x = 0; x < w; ++x) {
       const uint8_t component = static_cast<uint8_t>(y * w + x);
       const SkColor pixel = SkColorSetARGB(component, component,
                                            component, component);
       *bmp->getAddr32(x, y) = pixel;
     }
   }
 }
 
 // Draws a horizontal and vertical grid into the w x h bitmap passed in.
 // Each line in the grid is drawn with a width of "grid_width" pixels,
 // and those lines repeat every "grid_pitch" pixels. The top left pixel (0, 0)
 // is considered to be part of a grid line.
 // The pixels that fall on a line are colored with "grid_color", while those
 // outside of the lines are colored in "background_color".
 // Note that grid_with can be greather than or equal to grid_pitch, in which
 // case the resulting bitmap will be a solid color "grid_color".
 void DrawGridToBitmap(int w, int h,
                       SkColor background_color, SkColor grid_color,
                       int grid_pitch, int grid_width,
                       SkBitmap* bmp) {
   ASSERT_GT(grid_pitch, 0);
   ASSERT_GT(grid_width, 0);
   ASSERT_NE(background_color, grid_color);
 
-  bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
-  bmp->allocPixels();
+  bmp->allocN32Pixels(w, h);
 
   for (int y = 0; y < h; ++y) {
     bool y_on_grid = ((y % grid_pitch) < grid_width);
 
     for (int x = 0; x < w; ++x) {
       bool on_grid = (y_on_grid || ((x % grid_pitch) < grid_width));
 
       *bmp->getAddr32(x, y) = (on_grid ? grid_color : background_color);
     }
   }
 }
 
 // Draws a checkerboard pattern into the w x h bitmap passed in.
 // Each rectangle is rect_w in width, rect_h in height.
 // The colors alternate between color1 and color2, color1 being used
 // in the rectangle at the top left corner.
 void DrawCheckerToBitmap(int w, int h,
                          SkColor color1, SkColor color2,
                          int rect_w, int rect_h,
                          SkBitmap* bmp) {
   ASSERT_GT(rect_w, 0);
   ASSERT_GT(rect_h, 0);
   ASSERT_NE(color1, color2);
 
-  bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
-  bmp->allocPixels();
+  bmp->allocN32Pixels(w, h);
 
   for (int y = 0; y < h; ++y) {
     bool y_bit = (((y / rect_h) & 0x1) == 0);
 
     for (int x = 0; x < w; ++x) {
       bool x_bit = (((x / rect_w) & 0x1) == 0);
 
       bool use_color2 = (x_bit != y_bit);  // xor
 
       *bmp->getAddr32(x, y) = (use_color2 ? color2 : color1);
@@ skipping 276 matching lines @@
       ASSERT_EQ(
           *full_results.getAddr32(x + subset_rect.fLeft, y + subset_rect.fTop),
           *subset_results.getAddr32(x, y));
     }
   }
 }
 
 TEST(ImageOperations, InvalidParams) {
   // Make our source bitmap.
   SkBitmap src;
-  src.setConfig(SkBitmap::kA8_Config, 16, 34);
-  src.allocPixels();
+  src.allocPixels(SkImageInfo::MakeA8(16, 34));
 
   // Scale it, don't die.
   SkBitmap full_results = skia::ImageOperations::Resize(
       src, skia::ImageOperations::RESIZE_BOX, 10, 20);
 }
 
 // Resamples an image to the same image, it should give the same result.
 TEST(ImageOperations, ResampleToSameHamming1) {
   CheckResampleToSame(skia::ImageOperations::RESIZE_HAMMING1);
 }
@@ skipping 181 matching lines @@
   if (fabs(offset) >= 3) return 0.0;
   return sinc(offset) * sinc(offset / 3.0);
 }
 
 TEST(ImageOperations, ScaleUp) {
   const int src_w = 3;
   const int src_h = 3;
   const int dst_w = 9;
   const int dst_h = 9;
   SkBitmap src;
-  src.setConfig(SkBitmap::kARGB_8888_Config, src_w, src_h);
-  src.allocPixels();
+  src.allocN32Pixels(src_w, src_h);
 
   for (int src_y = 0; src_y < src_h; ++src_y) {
     for (int src_x = 0; src_x < src_w; ++src_x) {
       *src.getAddr32(src_x, src_y) = SkColorSetARGBInline(255,
                                                           10 + src_x * 100,
                                                           10 + src_y * 100,
                                                           0);
     }
   }
 
@@ skipping 40 matching lines @@
       EXPECT_LE(fabs(SkColorGetA(dst_color) - a), 1.5f);
       EXPECT_LE(fabs(SkColorGetR(dst_color) - r), 1.5f);
       EXPECT_LE(fabs(SkColorGetG(dst_color) - g), 1.5f);
       EXPECT_LE(fabs(SkColorGetB(dst_color) - b), 1.5f);
       if (HasFailure()) {
         return;
       }
     }
   }
 }