Add support for multi resolution icons

ui/gfx/image_mac_unittest.mm

Index: ui/gfx/image_mac_unittest.mm
diff --git a/ui/gfx/image_mac_unittest.mm b/ui/gfx/image_mac_unittest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..63b42602d13c76f72d2a4f6cd3565cc2f80900e2
--- /dev/null
+++ b/ui/gfx/image_mac_unittest.mm
@@ -0,0 +1,114 @@
+// 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 <Cocoa/Cocoa.h>
+
+#include "base/logging.h"
+#include "base/memory/scoped_nsobject.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image.h"
+#include "ui/gfx/image_unittest.h"
+
+namespace {
+
+class ImageMacTest : public testing::Test {
+ public:
+  size_t GetRepCount(const gfx::Image& image) {
+    return image.representations_.size();
+  }
+};
+
+void CreateBitmapImageRep(int width, int height, NSImageRep** image_rep) {

[Robert Sesek, 2011/04/19 17:40:09]

nit: make this a member of ImageMacTest?

[sail, 2011/04/19 20:15:19]

Done.

+  scoped_nsobject<NSImage> image([[NSImage alloc]
+      initWithSize:NSMakeSize(width, height)]);
+  [image lockFocus];
+  [[NSColor redColor] set];
+  NSRectFill(NSMakeRect(0, 0, width, height));
+  [image unlockFocus];
+  EXPECT_TRUE([[[image representations] lastObject]
+      isKindOfClass:[NSImageRep class]]);
+  *image_rep = [[image representations] lastObject];
+}
+
+namespace gt = gfx::test;
+
+TEST_F(ImageMacTest, MultiResolutionNSImageToSkBitmap) {
+  const int width1 = 10;
+  const int height1 = 12;
+  const int width2 = 20;
+  const int height2 = 24;
+
+  NSImageRep* image_rep_1;
+  CreateBitmapImageRep(width1, height1, &image_rep_1);
+  NSImageRep* image_rep_2;
+  CreateBitmapImageRep(width2, height2, &image_rep_2);
+  scoped_nsobject<NSImage> ns_image([[NSImage alloc]
+      initWithSize:NSMakeSize(width1, height1)]);
+  [ns_image addRepresentation:image_rep_1];
+  [ns_image addRepresentation:image_rep_2];
+
+  gfx::Image image(ns_image.release());
+
+  EXPECT_EQ(1u, GetRepCount(image));
+  EXPECT_EQ(2u, image.GetNumberOfSkBitmaps());
+
+  const SkBitmap* bitmap1 = image.GetSkBitmapAtIndex(0);
+  EXPECT_TRUE(bitmap1);
+  const SkBitmap* bitmap2 = image.GetSkBitmapAtIndex(1);
+  EXPECT_TRUE(bitmap2);
+
+  if (bitmap1->width() == width1) {
+    EXPECT_EQ(bitmap1->height(), height1);
+    EXPECT_EQ(bitmap2->width(), width2);
+    EXPECT_EQ(bitmap2->height(), height2);
+  } else {

[Robert Sesek, 2011/04/19 17:40:09]

Why should this be false? Shouldn't the ordering be deterministic?

[sail, 2011/04/19 20:15:19]

It should be but I don't think that a specific order should be enforced.

[Robert Sesek, 2011/04/19 20:53:18]

Really? I think that makes a difference. Otherwise callers will have to manually
check sizes each time if they want to use the GetSkBitmapAtIndex() API.

[sail, 2011/04/19 21:07:08]

I don't think knowing the order helps that much. It makes the internals of the
class a lot more flexible.
It also matches NSImage, I don't think there's any guarantee about how -[NSImage
representations] are ordered.

[Robert Sesek, 2011/04/19 21:12:56]

Ok. Compromise: Add a comment like what I suggest in the .h.

[sail, 2011/04/19 21:27:26]

Done.

+    EXPECT_EQ(bitmap1->width(), width2);
+    EXPECT_EQ(bitmap1->height(), height2);
+    EXPECT_EQ(bitmap2->width(), width1);
+    EXPECT_EQ(bitmap2->height(), height1);
+  }
+
+  // GetNumberOfSkBitmaps and GetSkBitmapAtIndex should create a second
+  // representation.
+  EXPECT_EQ(2u, GetRepCount(image));
+}
+
+TEST_F(ImageMacTest, MultiResolutionSkBitmapToNSImage) {
+  const int width1 = 10;
+  const int height1 = 12;
+  const int width2 = 20;
+  const int height2 = 24;
+
+  std::vector<const SkBitmap*> bitmaps;
+  bitmaps.push_back(gt::CreateBitmap(width1, height1));
+  bitmaps.push_back(gt::CreateBitmap(width2, height2));
+  gfx::Image image(bitmaps);
+
+  EXPECT_EQ(1u, GetRepCount(image));
+  EXPECT_EQ(2u, image.GetNumberOfSkBitmaps());
+
+  NSImage* ns_image = image;
+  EXPECT_TRUE(ns_image);
+
+  EXPECT_EQ(2u, [[image representations] count]);
+  NSImageRep* image_rep_1 = [[image representations] objectAtIndex:0];
+  NSImageRep* image_rep_2 = [[image representations] objectAtIndex:1];
+
+  if ([image_rep_1 size].width == width1) {
+    EXPECT_EQ([image_rep_1 size].height, height1);
+    EXPECT_EQ([image_rep_2 size].width, width2);
+    EXPECT_EQ([image_rep_2 size].height, height2);
+  } else {

[Robert Sesek, 2011/04/19 17:40:09]

Same question.

+    EXPECT_EQ([image_rep_1 size].width, width2);
+    EXPECT_EQ([image_rep_1 size].height, height2);
+    EXPECT_EQ([image_rep_2 size].width, width1);
+    EXPECT_EQ([image_rep_2 size].height, height1);
+  }
+
+  // Cast to NSImage* should create a second representation.
+  EXPECT_EQ(2u, GetRepCount(image));
+}
+
+} // namespace