Add support for multi resolution icons

ui/gfx/image_unittest.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 "base/memory/scoped_ptr.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"
 
@@ skipping 16 matching lines @@
 class ImageTest : public testing::Test {
  public:
   size_t GetRepCount(const gfx::Image& image) {
     return image.representations_.size();
   }
 };
 
 namespace gt = gfx::test;
 
 TEST_F(ImageTest, SkiaToSkia) {
-  gfx::Image image(gt::CreateBitmap());
+  gfx::Image image(gt::CreateBitmap(25, 25));
   const SkBitmap* bitmap = static_cast<const SkBitmap*>(image);
   EXPECT_TRUE(bitmap);
   EXPECT_FALSE(bitmap->isNull());
   EXPECT_EQ(1U, GetRepCount(image));
 
   // Make sure double conversion doesn't happen.
   bitmap = static_cast<const SkBitmap*>(image);
   EXPECT_TRUE(bitmap);
   EXPECT_FALSE(bitmap->isNull());
   EXPECT_EQ(1U, GetRepCount(image));
 
   EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 }
 
 TEST_F(ImageTest, SkiaToSkiaRef) {
-  gfx::Image image(gt::CreateBitmap());
+  gfx::Image image(gt::CreateBitmap(25, 25));
 
   const SkBitmap& bitmap = static_cast<const SkBitmap&>(image);
   EXPECT_FALSE(bitmap.isNull());
   EXPECT_EQ(1U, GetRepCount(image));
 
   const SkBitmap* bitmap1 = static_cast<const SkBitmap*>(image);
   EXPECT_FALSE(bitmap1->isNull());
   EXPECT_EQ(1U, GetRepCount(image));
 
   EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 }
 
 TEST_F(ImageTest, SkiaToPlatform) {
-  gfx::Image image(gt::CreateBitmap());
+  gfx::Image image(gt::CreateBitmap(25, 25));
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
   EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 
   EXPECT_TRUE(static_cast<gt::PlatformImage>(image));
   EXPECT_EQ(kRepCount, GetRepCount(image));
 
   const SkBitmap& bitmap = static_cast<const SkBitmap&>(image);
@@ skipping 42 matching lines @@
   const SkBitmap& bitmap(image);
 
   SkAutoLockPixels auto_lock(bitmap);
   uint32_t* pixel = bitmap.getAddr32(10, 10);
   EXPECT_EQ(SK_ColorRED, *pixel);
 }
 
 TEST_F(ImageTest, SwapRepresentations) {
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
-  gfx::Image image1(gt::CreateBitmap());
+  gfx::Image image1(gt::CreateBitmap(25, 25));
   const SkBitmap* bitmap1 = image1;
   EXPECT_EQ(1U, GetRepCount(image1));
 
   gfx::Image image2(gt::CreatePlatformImage());
   const SkBitmap* bitmap2 = image2;
   gt::PlatformImage platform_image = static_cast<gt::PlatformImage>(image2);
   EXPECT_EQ(kRepCount, GetRepCount(image2));
 
   image1.SwapRepresentations(&image2);
 
   EXPECT_EQ(bitmap2, static_cast<const SkBitmap*>(image1));
   EXPECT_EQ(platform_image, static_cast<gt::PlatformImage>(image1));
   EXPECT_EQ(bitmap1, static_cast<const SkBitmap*>(image2));
   EXPECT_EQ(kRepCount, GetRepCount(image1));
   EXPECT_EQ(1U, GetRepCount(image2));
 }
 
+TEST_F(ImageTest, MultiResolutionSkBitmap) {
+  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());
+
+  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 {
+    EXPECT_EQ(bitmap1->width(), width2);
+    EXPECT_EQ(bitmap1->height(), height2);
+    EXPECT_EQ(bitmap2->width(), width1);
+    EXPECT_EQ(bitmap2->height(), height1);
+  }
+
+  // Sanity check.
+  EXPECT_EQ(1u, GetRepCount(image));
+  EXPECT_EQ(2u, image.GetNumberOfSkBitmaps());
+}
+
 // Integration tests with UI toolkit frameworks require linking against the
 // Views library and cannot be here (gfx_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace