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

Unified Diff: ui/gfx/icc_profile_unittest.cc

Issue 2660393002: Use gfx::ColorSpace instead of SkColorSpace in Blink (Closed)
Patch Set: Rebase (again) Created 3 years, 11 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/icc_profile.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/icc_profile_unittest.cc
diff --git a/ui/gfx/icc_profile_unittest.cc b/ui/gfx/icc_profile_unittest.cc
index 16f208bdc94f760ddf579e94fff853839c9edd8c..1fcba1d13be665f32ebe678125b50b9d2330d61b 100644
--- a/ui/gfx/icc_profile_unittest.cc
+++ b/ui/gfx/icc_profile_unittest.cc
@@ -17,17 +17,6 @@ TEST(ICCProfile, Conversions) {
ICCProfile icc_profile_from_color_space =
ICCProfile::FromColorSpace(color_space_from_icc_profile);
EXPECT_TRUE(icc_profile == icc_profile_from_color_space);
-
- sk_sp<SkColorSpace> sk_color_space_from_color_space =
- color_space_from_icc_profile.ToSkColorSpace();
-
- ColorSpace color_space_from_sk_color_space =
- ColorSpace::FromSkColorSpace(sk_color_space_from_color_space);
- EXPECT_TRUE(color_space_from_icc_profile == color_space_from_sk_color_space);
-
- ICCProfile icc_profile_from_color_space_from_sk_color_space =
- ICCProfile::FromColorSpace(color_space_from_sk_color_space);
- EXPECT_TRUE(icc_profile == icc_profile_from_color_space_from_sk_color_space);
}
TEST(ICCProfile, SRGB) {
@@ -35,14 +24,8 @@ TEST(ICCProfile, SRGB) {
sk_sp<SkColorSpace> sk_color_space =
SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
- ColorSpace color_space_from_sk_color_space =
- ColorSpace::FromSkColorSpace(sk_color_space);
- EXPECT_TRUE(color_space == color_space_from_sk_color_space);
-
- sk_sp<SkColorSpace> sk_color_space_from_color_space =
- color_space.ToSkColorSpace();
- EXPECT_TRUE(SkColorSpace::Equals(sk_color_space.get(),
- sk_color_space_from_color_space.get()));
+ // These should be the same pointer, not just equal.
+ EXPECT_EQ(color_space.ToSkColorSpace().get(), sk_color_space.get());
}
TEST(ICCProfile, Equality) {
@@ -64,6 +47,12 @@ TEST(ICCProfile, Equality) {
EXPECT_FALSE(spin_profile != ICCProfile::FromColorSpace(spin_space));
EXPECT_FALSE(spin_profile == ICCProfile::FromColorSpace(adobe_space));
EXPECT_TRUE(spin_profile != ICCProfile::FromColorSpace(adobe_space));
+
+ EXPECT_TRUE(!!spin_space.ToSkColorSpace());
+ EXPECT_TRUE(!!adobe_space.ToSkColorSpace());
+ EXPECT_FALSE(SkColorSpace::Equals(
+ spin_space.ToSkColorSpace().get(),
+ adobe_space.ToSkColorSpace().get()));
}
} // namespace gfx
« no previous file with comments | « ui/gfx/icc_profile.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698