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

Unified Diff: skia/ext/skia_utils_ios_unittest.mm

Issue 1508893003: Use proper namespace in skia/ext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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 | « skia/ext/skia_utils_ios.mm ('k') | skia/ext/skia_utils_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/skia_utils_ios_unittest.mm
diff --git a/skia/ext/skia_utils_ios_unittest.mm b/skia/ext/skia_utils_ios_unittest.mm
index 02994727bf54647c0149eef44515e5b20de919a3..543f3012f3fe8d1a8e507ff86dc4ce13c2cc7eeb 100644
--- a/skia/ext/skia_utils_ios_unittest.mm
+++ b/skia/ext/skia_utils_ios_unittest.mm
@@ -129,7 +129,7 @@ NSData* InvalidData(NSUInteger length) {
TEST_F(SkiaUtilsIosTest, ImageDataToSkBitmaps) {
std::vector<SkBitmap> bitmaps(
- gfx::ImageDataToSkBitmaps(StringToNSData(kIcoEncodedData)));
+ skia::ImageDataToSkBitmaps(StringToNSData(kIcoEncodedData)));
EXPECT_EQ(2UL, bitmaps.size());
EXPECT_EQ(32, bitmaps[0].width());
@@ -139,20 +139,20 @@ TEST_F(SkiaUtilsIosTest, ImageDataToSkBitmaps) {
}
TEST_F(SkiaUtilsIosTest, InvalidDataFailure) {
- std::vector<SkBitmap> bitmaps1(gfx::ImageDataToSkBitmaps(InvalidData(1)));
+ std::vector<SkBitmap> bitmaps1(skia::ImageDataToSkBitmaps(InvalidData(1)));
EXPECT_EQ(0UL, bitmaps1.size());
- std::vector<SkBitmap> bitmaps2(gfx::ImageDataToSkBitmaps(InvalidData(10)));
+ std::vector<SkBitmap> bitmaps2(skia::ImageDataToSkBitmaps(InvalidData(10)));
EXPECT_EQ(0UL, bitmaps2.size());
- std::vector<SkBitmap> bitmaps3(gfx::ImageDataToSkBitmaps(InvalidData(100)));
+ std::vector<SkBitmap> bitmaps3(skia::ImageDataToSkBitmaps(InvalidData(100)));
EXPECT_EQ(0UL, bitmaps3.size());
- std::vector<SkBitmap> bitmaps4(gfx::ImageDataToSkBitmaps(InvalidData(1000)));
+ std::vector<SkBitmap> bitmaps4(skia::ImageDataToSkBitmaps(InvalidData(1000)));
EXPECT_EQ(0UL, bitmaps4.size());
- std::vector<SkBitmap> bitmaps5(gfx::ImageDataToSkBitmaps(InvalidData(5000)));
+ std::vector<SkBitmap> bitmaps5(skia::ImageDataToSkBitmaps(InvalidData(5000)));
EXPECT_EQ(0UL, bitmaps5.size());
}
TEST_F(SkiaUtilsIosTest, EmptyDataFailure) {
- std::vector<SkBitmap> bitmaps(gfx::ImageDataToSkBitmaps([NSData data]));
+ std::vector<SkBitmap> bitmaps(skia::ImageDataToSkBitmaps([NSData data]));
EXPECT_EQ(0UL, bitmaps.size());
}
@@ -742,7 +742,7 @@ const char kIco88x88EncodedData[] =
TEST_F(SkiaUtilsIosTest, Image88x88OrLarger) {
std::vector<SkBitmap> bitmaps(
- gfx::ImageDataToSkBitmaps(StringToNSData(kIco88x88EncodedData)));
+ skia::ImageDataToSkBitmaps(StringToNSData(kIco88x88EncodedData)));
if (base::ios::IsRunningOnOrLater(8, 1, 1))
EXPECT_EQ(0UL, bitmaps.size());
else
@@ -751,7 +751,7 @@ TEST_F(SkiaUtilsIosTest, Image88x88OrLarger) {
TEST_F(SkiaUtilsIosTest, UIColorFromSkColor) {
SkColor color = SkColorSetARGB(50, 100, 150, 200);
- UIColor* ios_color = gfx::UIColorFromSkColor(color);
+ UIColor* ios_color = skia::UIColorFromSkColor(color);
CGFloat red, green, blue, alpha;
[ios_color getRed:&red green:&green blue:&blue alpha:&alpha];
EXPECT_EQ(50, static_cast<int>(alpha * 255 + 0.5f));
« no previous file with comments | « skia/ext/skia_utils_ios.mm ('k') | skia/ext/skia_utils_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698