Chromium Code Reviews| Index: ui/gfx/image_mac.mm |
| diff --git a/ui/gfx/image_mac.mm b/ui/gfx/image_mac.mm |
| index b3dc9776ebf135835754539f38873801a45368c4..0342b075326ac7b20b2b54454a1ecb178c5ca6a6 100644 |
| --- a/ui/gfx/image_mac.mm |
| +++ b/ui/gfx/image_mac.mm |
| @@ -10,8 +10,15 @@ |
| namespace gfx { |
| namespace internal { |
| -const SkBitmap* NSImageToSkBitmap(NSImage* image) { |
| - return new SkBitmap(::gfx::NSImageToSkBitmap(image, [image size], false)); |
| +bool NSImageToSkBitmaps(NSImage* image, std::vector<const SkBitmap*>& bitmaps) { |
| + for (NSImageRep* imageRep in [image representations]) { |
| + SkBitmap bitmap(gfx::NSImageRepToSkBitmap(imageRep, |
|
Robert Sesek
2011/04/15 20:27:20
Use a scoped_ptr<> here and .release() if you end
sail
2011/04/16 01:25:00
Done.
|
| + [imageRep size], false)); |
| + if (bitmap.isNull()) |
| + return false; |
| + bitmaps.push_back(new SkBitmap(bitmap)); |
| + } |
| + return true; |
| } |
| } // namespace internal |