Properly flip the CGContext during UIImage->SkBitmap conversions.

ui/gfx/image/image_unittest.cc

 // Copyright (c) 2012 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 "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_unittest_util.h"
@@ skipping 158 matching lines @@
 
 TEST_F(ImageTest, PNGDecodeToSkiaFailure) {
   std::vector<unsigned char> png(100, 0);
   gfx::Image image(&png.front(), png.size());
   const SkBitmap* bitmap = image.ToSkBitmap();
 
   SkAutoLockPixels auto_lock(*bitmap);
   gt::CheckColor(bitmap->getColor(10, 10), true);
 }
 
-// TODO(rohitrao): This test needs an iOS implementation of
-// GetPlatformImageColor().
-#if !defined(OS_IOS)
 TEST_F(ImageTest, PNGDecodeToPlatformFailure) {
   std::vector<unsigned char> png(100, 0);
   gfx::Image image(&png.front(), png.size());
   gt::CheckColor(gt::GetPlatformImageColor(gt::ToPlatformType(image), 10, 10),
                  true);
 }
-#endif
 
 TEST_F(ImageTest, SkiaToPlatform) {
   gfx::Image image(gt::CreateBitmap(25, 25));
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
   EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 
   EXPECT_TRUE(gt::IsPlatformImageValid(gt::ToPlatformType(image)));
@@ skipping 102 matching lines @@
 #endif
 
 TEST_F(ImageTest, CheckSkiaColor) {
   gfx::Image image(gt::CreatePlatformImage());
 
   const SkBitmap* bitmap = image.ToSkBitmap();
   SkAutoLockPixels auto_lock(*bitmap);
   gt::CheckColor(bitmap->getColor(10, 10), false);
 }
 
-// TODO(rohitrao): This test needs an iOS implementation of
-// GetPlatformImageColor().
-#if !defined(OS_IOS)
 TEST_F(ImageTest, SkBitmapConversionPreservesOrientation) {
   const int width = 50;
   const int height = 50;
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
   bitmap.allocPixels();
   bitmap.eraseRGB(0, 255, 0);
 
   // Paint the upper half of the image in red (lower half is in green).
   SkCanvas canvas(bitmap);
   SkPaint red;
   red.setColor(SK_ColorRED);
   canvas.drawRect(SkRect::MakeWH(width, height / 2), red);
-  gt::CheckColor(bitmap.getColor(10, 10), true);
-  gt::CheckColor(bitmap.getColor(10, 40), false);
+  {
+    SCOPED_TRACE("Checking color of the initial SkBitmap");
+    gt::CheckColor(bitmap.getColor(10, 10), true);
+    gt::CheckColor(bitmap.getColor(10, 40), false);
+  }
 
   // Convert from SkBitmap to a platform representation, then check the upper
   // half of the platform image to make sure it is red, not green.
   gfx::Image from_skbitmap(bitmap);
-  gt::CheckColor(
-      gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 10),
-      true);
-  gt::CheckColor(
-      gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 40),
-      false);
+  {
+    SCOPED_TRACE("Checking color of the platform image");
+    gt::CheckColor(
+        gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 10),
+        true);
+    gt::CheckColor(
+        gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 40),
+        false);
+  }
 
   // Force a conversion back to SkBitmap and check that the upper half is red.
   gfx::Image from_platform(gt::CopyPlatformType(from_skbitmap));
   const SkBitmap* bitmap2 = from_platform.ToSkBitmap();
   SkAutoLockPixels auto_lock(*bitmap2);
-  gt::CheckColor(bitmap2->getColor(10, 10), true);
-  gt::CheckColor(bitmap2->getColor(10, 40), false);
+  {
+    SCOPED_TRACE("Checking color after conversion back to SkBitmap");
+    gt::CheckColor(bitmap2->getColor(10, 10), true);
+    gt::CheckColor(bitmap2->getColor(10, 40), false);
+  }
 }
-#endif  // !defined(OS_IOS)
 
 TEST_F(ImageTest, SwapRepresentations) {
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
   gfx::Image image1(gt::CreateBitmap(25, 25));
   const SkBitmap* bitmap1 = image1.ToSkBitmap();
   EXPECT_EQ(1U, image1.RepresentationCount());
 
   gfx::Image image2(gt::CreatePlatformImage());
   const SkBitmap* bitmap2 = image2.ToSkBitmap();
@@ skipping 100 matching lines @@
     image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
   }
   EXPECT_TRUE(!image.ToSkBitmap()->isNull());
 }
 
 // Integration tests with UI toolkit frameworks require linking against the
 // Views library and cannot be here (ui_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace