Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1369)

Unified Diff: ui/gfx/image/image_unittest.cc

Issue 10928093: Adds an iOS implementation of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@skia
Patch Set: Cleanup. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/image/image_unittest.cc
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 967bb3a7581f2583ee33aa88fa203c7d181ba196..5c5dd23fc7f163aa49113ad60eb5663deb8bb17a 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -10,6 +10,9 @@
#if defined(TOOLKIT_GTK)
#include <gtk/gtk.h>
#include "ui/gfx/gtk_util.h"
+#elif defined(OS_IOS)
+#include "base/mac/foundation_util.h"
+#include "skia/ext/skia_utils_ios.h"
#elif defined(OS_MACOSX)
#include "base/mac/mac_util.h"
#include "skia/ext/skia_utils_mac.h"
@@ -171,11 +174,15 @@ TEST_F(ImageTest, PNGDecodeToSkiaFailure) {
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)), true);
}
+#endif
TEST_F(ImageTest, SkiaToPlatform) {
gfx::Image image(gt::CreateBitmap(25, 25));
@@ -264,7 +271,19 @@ TEST_F(ImageTest, SkiaToCairoCreatesGdk) {
}
#endif
-#if defined(OS_MACOSX)
+#if defined(OS_IOS)
+TEST_F(ImageTest, SkiaToCocoaTouchCopy) {
+ UIImage* ui_image;
+
+ {
+ gfx::Image image(gt::CreateBitmap(25, 25));
+ ui_image = image.CopyUIImage();
+ }
+
+ EXPECT_TRUE(ui_image);
+ base::mac::NSObjectRelease(ui_image);
+}
+#elif defined(OS_MACOSX)
TEST_F(ImageTest, SkiaToCocoaCopy) {
NSImage* ns_image;

Powered by Google App Engine
This is Rietveld 408576698