Add support for multi resolution icons

skia/ext/skia_utils_mac.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef SKIA_EXT_SKIA_UTILS_MAC_H_
 #define SKIA_EXT_SKIA_UTILS_MAC_H_
 #pragma once
 
 #include <CoreGraphics/CGColor.h>
+#include <vector>
 
 #include "third_party/skia/include/core/SkColor.h"
 
 struct SkIRect;
 struct SkPoint;
 struct SkRect;
 class SkBitmap;
 class SkMatrix;
 #ifdef __LP64__
 typedef CGSize NSSize;
 #else
 typedef struct _NSSize NSSize;
 #endif
 
 #ifdef __OBJC__
 @class NSImage;
+@class NSImageRep;
 #else
 class NSImage;
+class NSImageRep;
 #endif
 
 namespace gfx {
 
 // Converts a Skia point to a CoreGraphics CGPoint.
 // Both use same in-memory format.
 inline const CGPoint& SkPointToCGPoint(const SkPoint& point) {
   return reinterpret_cast<const CGPoint&>(point);
 }
 
@@ skipping 19 matching lines @@
 
 // Converts ARGB to CGColorRef.
 CGColorRef SkColorToCGColorRef(SkColor color);
 
 // Converts a CGImage to a SkBitmap.
 SkBitmap CGImageToSkBitmap(CGImageRef image);
 
 // Draws an NSImage with a given size into a SkBitmap.
 SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque);
 
+// Draws an NSImageRep with a given size into a SkBitmap.
+SkBitmap NSImageRepToSkBitmap(NSImageRep* image, NSSize size, bool is_opaque);

[Robert Sesek, 2011/04/15 20:27:20]

This needs a unit test

[sail, 2011/04/16 01:25:00]

Done.

+
 // Given an SkBitmap and a color space, return an autoreleased NSImage.
 NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon,
                                          CGColorSpaceRef colorSpace);
 
 // Given an SkBitmap, return an autoreleased NSImage in the generic color space.
 // DEPRECATED, use SkBitmapToNSImageWithColorSpace() instead.
 // TODO(thakis): Remove this -- http://crbug.com/69432
 NSImage* SkBitmapToNSImage(const SkBitmap& icon);
 
+// Given a vector of SkBitmaps, return an NSImage with each bitmap added
+// as a representation.
+NSImage* SkBitmapsToNSImage(const std::vector<const SkBitmap*>& bitmaps);

[Robert Sesek, 2011/04/15 20:27:20]

This needs a unit test

[sail, 2011/04/16 01:25:00]

Done.
Ouch, thanks for asking me to do a unit test. This caught a bug where the image
size actually the maximum of all the bitmaps instead of the minimum!

+
 // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap.
 SkBitmap AppplicationIconAtSize(int size);
 
 }  // namespace gfx
 
 #endif  // SKIA_EXT_SKIA_UTILS_MAC_H_