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

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

Issue 10860004: image-skia: Remove implicit conversion to SkBitmap on linux and chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « ui/gfx/image/image_skia.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_skia_unittest.cc
diff --git a/ui/gfx/image/image_skia_unittest.cc b/ui/gfx/image/image_skia_unittest.cc
index 789fbe24359add6f09a1fdef1c56821d049492b9..20d9d452fa23edfa6ee1a9c31c370748da6df4e2 100644
--- a/ui/gfx/image/image_skia_unittest.cc
+++ b/ui/gfx/image/image_skia_unittest.cc
@@ -188,6 +188,7 @@ TEST(ImageSkiaTest, GetBitmapFromEmpty) {
EXPECT_TRUE(bitmap->empty());
}
+#if defined(OS_MACOSX) || defined(OS_WIN)
TEST(ImageSkiaTest, OperatorBitmapFromSource) {
ImageSkia image_skia(new DynamicSource(Size(100, 200)), Size(100, 200));
// ImageSkia should use the source to create the bitmap.
@@ -195,6 +196,7 @@ TEST(ImageSkiaTest, OperatorBitmapFromSource) {
ASSERT_NE(static_cast<SkBitmap*>(NULL), &bitmap);
EXPECT_FALSE(bitmap.isNull());
}
+#endif
TEST(ImageSkiaTest, BackedBySameObjectAs) {
// Null images should all be backed by the same object (NULL).
« no previous file with comments | « ui/gfx/image/image_skia.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698