setConfig is deprecated, use setInfo or allocPixels instead

ui/gfx/icon_util.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 "ui/gfx/icon_util.h"
 
 #include "base/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 59 matching lines @@
     }
 
     if (best->Size() == size) {
       resized_image_family->Add(*best);
     } else {
       // There is no |dimension|x|dimension| source image.
       // Resize this one to the desired size, and insert it.
       SkBitmap best_bitmap = best->AsBitmap();
       // Only kARGB_8888 images are supported.
       // This will also filter out images with no pixels.
-      if (best_bitmap.colorType() != kPMColor_SkColorType)
+      if (best_bitmap.colorType() != kN32_SkColorType)
         return false;
       SkBitmap resized_bitmap = skia::ImageOperations::Resize(
           best_bitmap, skia::ImageOperations::RESIZE_LANCZOS3,
           dimension, dimension);
       resized_image_family->Add(gfx::Image::CreateFrom1xBitmap(resized_bitmap));
     }
   }
   return true;
 }
 
@@ skipping 21 matching lines @@
     DCHECK_GT(image.Width(), 0);
     DCHECK_LE(image.Width(), IconUtil::kLargeIconSize);
     DCHECK_GT(image.Height(), 0);
     DCHECK_LE(image.Height(), IconUtil::kLargeIconSize);
 
     SkBitmap bitmap = image.AsBitmap();
 
     // Only 32 bit ARGB bitmaps are supported. We also make sure the bitmap has
     // been properly initialized.
     SkAutoLockPixels bitmap_lock(bitmap);
-    if ((bitmap.colorType() != kPMColor_SkColorType) ||
+    if ((bitmap.colorType() != kN32_SkColorType) ||
         (bitmap.getPixels() == NULL)) {
       return false;
     }
 
     // Special case: Icons exactly 256x256 are stored in PNG format.
     if (image.Width() == IconUtil::kLargeIconSize &&
         image.Height() == IconUtil::kLargeIconSize) {
       *png_bytes = image.As1xPNGBytes();
     } else {
       bitmaps->push_back(bitmap);
@@ skipping 26 matching lines @@
   256   // Used by Vista onwards for large icons.
 };
 
 const size_t IconUtil::kNumIconDimensions = arraysize(kIconDimensions);
 const size_t IconUtil::kNumIconDimensionsUpToMediumSize = 9;
 
 HICON IconUtil::CreateHICONFromSkBitmap(const SkBitmap& bitmap) {
   // Only 32 bit ARGB bitmaps are supported. We also try to perform as many
   // validations as we can on the bitmap.
   SkAutoLockPixels bitmap_lock(bitmap);
-  if ((bitmap.colorType() != kPMColor_SkColorType) ||
+  if ((bitmap.colorType() != kN32_SkColorType) ||
       (bitmap.width() <= 0) || (bitmap.height() <= 0) ||
       (bitmap.getPixels() == NULL))
     return NULL;
 
   // We start by creating a DIB which we'll use later on in order to create
   // the HICON. We use BITMAPV5HEADER since the bitmap we are about to convert
   // may contain an alpha channel and the V5 header allows us to specify the
   // alpha mask for the DIB.
   BITMAPV5HEADER bitmap_header;
   InitializeBitmapHeader(&bitmap_header, bitmap.width(), bitmap.height());
@@ skipping 501 matching lines @@
   // Once we compute the size for a singe AND mask scan line, we multiply that
   // number by the image height in order to get the total number of bytes for
   // the AND mask. Thus, for a 15X15 image, we need 15 * 4 which is 60 bytes
   // for the monochrome bitmap representing the AND mask.
   size_t and_line_length = (bitmap.width() + 7) >> 3;
   and_line_length = (and_line_length + 3) & ~3;
   size_t and_mask_size = and_line_length * bitmap.height();
   size_t masks_size = *xor_mask_size + and_mask_size;
   *bytes_in_resource = masks_size + sizeof(BITMAPINFOHEADER);
 }