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

Unified Diff: ui/gfx/color_transform_unittest.cc

Issue 2691213007: color: Don't use QCMS for transforms unless necessary (Closed)
Patch Set: Fix cache hit computation of parse result Created 3 years, 10 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/color_transform_unittest.cc
diff --git a/ui/gfx/color_transform_unittest.cc b/ui/gfx/color_transform_unittest.cc
index 5a8882672f7ffb9933581876b9e30bc86ba7d9ae..41df4a8a0520d046de19f78df9ff75bb7b80ff32 100644
--- a/ui/gfx/color_transform_unittest.cc
+++ b/ui/gfx/color_transform_unittest.cc
@@ -99,8 +99,8 @@ TEST(SimpleColorSpace, SRGBFromICCAndNotICC) {
std::unique_ptr<ColorTransform> toxyzd50_fromicc(
ColorTransform::NewColorTransform(
srgb_fromicc, xyzd50, ColorTransform::Intent::INTENT_ABSOLUTE));
- // This will have 1 step, namely, the QCMS transform.
- EXPECT_EQ(toxyzd50_fromicc->NumberOfStepsForTesting(), 1u);
+ // This will be converted to a transfer function and then linear transform.
+ EXPECT_EQ(toxyzd50_fromicc->NumberOfStepsForTesting(), 2u);
toxyzd50_fromicc->Transform(&value_fromicc, 1);
std::unique_ptr<ColorTransform> toxyzd50_default(
@@ -200,23 +200,29 @@ TEST(SimpleColorSpace, UnknownToSRGB) {
std::unique_ptr<ColorTransform> t(ColorTransform::NewColorTransform(
unknown, sRGB, ColorTransform::Intent::INTENT_PERCEPTUAL));
- ColorTransform::TriStim tmp(16.0f / 255.0f, 0.5f, 0.5f);
+ ColorTransform::TriStim input;
+ ColorTransform::TriStim tmp;
+ input = ColorTransform::TriStim(16.0f / 255.0f, 0.5f, 0.5f);
+ tmp = input;
t->Transform(&tmp, 1);
- EXPECT_NEAR(tmp.x(), 0.0f, 0.001f);
- EXPECT_NEAR(tmp.y(), 0.0f, 0.001f);
- EXPECT_NEAR(tmp.z(), 0.0f, 0.001f);
+ EXPECT_NEAR(tmp.x(), input.x(), 0.001f);
+ EXPECT_NEAR(tmp.y(), input.y(), 0.001f);
+ EXPECT_NEAR(tmp.z(), input.z(), 0.001f);
- tmp = ColorTransform::TriStim(235.0f / 255.0f, 0.5f, 0.5f);
+ input = ColorTransform::TriStim(235.0f / 255.0f, 0.5f, 0.5f);
+ tmp = input;
t->Transform(&tmp, 1);
- EXPECT_NEAR(tmp.x(), 1.0f, 0.001f);
- EXPECT_NEAR(tmp.y(), 1.0f, 0.001f);
- EXPECT_NEAR(tmp.z(), 1.0f, 0.001f);
+ EXPECT_NEAR(tmp.x(), input.x(), 0.001f);
+ EXPECT_NEAR(tmp.y(), input.y(), 0.001f);
+ EXPECT_NEAR(tmp.z(), input.z(), 0.001f);
// Test a blue color
- tmp = ColorTransform::TriStim(128.0f / 255.0f, 240.0f / 255.0f, 0.5f);
+ input = ColorTransform::TriStim(128.0f / 255.0f, 240.0f / 255.0f, 0.5f);
+ tmp = input;
t->Transform(&tmp, 1);
- EXPECT_GT(tmp.z(), tmp.x());
- EXPECT_GT(tmp.z(), tmp.y());
+ EXPECT_NEAR(tmp.x(), input.x(), 0.001f);
+ EXPECT_NEAR(tmp.y(), input.y(), 0.001f);
+ EXPECT_NEAR(tmp.z(), input.z(), 0.001f);
}
class TransferTest : public testing::TestWithParam<ColorSpace::TransferID> {};
« ui/gfx/color_transform.cc ('K') | « ui/gfx/color_transform.cc ('k') | ui/gfx/icc_profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698