Badge Windows profile shortcuts with multi-user avatar.

ui/gfx/icon_util.cc

 // Copyright (c) 2011 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/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_handle.h"
@@ skipping 225 matching lines @@
   SkAutoLockPixels bitmap_lock(bitmap);
   if ((bitmap.getConfig() != SkBitmap::kARGB_8888_Config) ||
       (bitmap.height() <= 0) || (bitmap.width() <= 0) ||
       (bitmap.getPixels() == NULL))
     return false;
 
   // We start by creating the file.
   base::win::ScopedHandle icon_file(::CreateFile(icon_path.value().c_str(),
        GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
 
-  if (icon_file.Get() == INVALID_HANDLE_VALUE)
+  if (icon_file.Get() == INVALID_HANDLE_VALUE || icon_file.Get() == NULL)

[grt (UTC plus 2), 2011/12/05 14:48:27]

what you really want here is:
if (!icon_file.IsValid())

(coming from someone who's made the same mistake. :-) )

[SteveT, 2011/12/05 15:24:46]

Cool, thanks.

     return false;
 
   // Creating a set of bitmaps corresponding to the icon images we'll end up
   // storing in the icon file. Each bitmap is created by resizing the given
   // bitmap to the desired size.
   std::vector<SkBitmap> bitmaps;
   CreateResizedBitmapSet(bitmap, &bitmaps);
   DCHECK(!bitmaps.empty());
   size_t bitmap_count = bitmaps.size();
 
@@ skipping 234 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);
 }