Color: Read embedded ICC profiles regardless of QCMS

third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 200 matching lines @@
 }
 
 TEST_F(BitmapImageTest, noColorProfile)
 {
     loadImage("/LayoutTests/fast/images/resources/green.jpg");
     EXPECT_EQ(1u, decodedFramesCount());
     EXPECT_EQ(1024u, decodedSize());
     EXPECT_FALSE(m_image->hasColorProfile());
 }
 
-#if USE(QCMSLIB)
-
 TEST_F(BitmapImageTest, jpegHasColorProfile)

[ccameron, 2016/08/04 22:07:29]

Oh, oops, should have added these tests.

[Justin Novosad, 2016/08/05 00:06:51]

LOL!

 {
     loadImage("/LayoutTests/fast/images/resources/icc-v2-gbr.jpg");
     EXPECT_EQ(1u, decodedFramesCount());
     EXPECT_EQ(227700u, decodedSize());
     EXPECT_TRUE(m_image->hasColorProfile());
 }
 
 TEST_F(BitmapImageTest, pngHasColorProfile)
 {
     loadImage("/LayoutTests/fast/images/resources/palatted-color-png-gamma-one-color-profile.png");
     EXPECT_EQ(1u, decodedFramesCount());
     EXPECT_EQ(65536u, decodedSize());
     EXPECT_TRUE(m_image->hasColorProfile());
 }
 
 TEST_F(BitmapImageTest, webpHasColorProfile)
 {
     loadImage("/LayoutTests/fast/images/resources/webp-color-profile-lossy.webp");
     EXPECT_EQ(1u, decodedFramesCount());
     EXPECT_EQ(2560000u, decodedSize());
     EXPECT_TRUE(m_image->hasColorProfile());
 }
 
-#endif // USE(QCMSLIB)
-
 TEST_F(BitmapImageTest, icoHasWrongFrameDimensions)
 {
     loadImage("/LayoutTests/fast/images/resources/wrong-frame-dimensions.ico");
     // This call would cause crash without fix for 408026
     imageForDefaultFrame();
 }
 
 TEST_F(BitmapImageTest, correctDecodedDataSize)
 {
     // Requesting any one frame shouldn't result in decoding any other frames.
@@ skipping 72 matching lines @@
     {"/LayoutTests/fast/images/resources/exif-orientation-5-lu.jpg", OriginLeftTop},
     {"/LayoutTests/fast/images/resources/exif-orientation-6-ru.jpg", OriginRightTop},
     {"/LayoutTests/fast/images/resources/exif-orientation-7-rl.jpg", OriginRightBottom},
     {"/LayoutTests/fast/images/resources/exif-orientation-8-llo.jpg", OriginLeftBottom}
 };
 
 INSTANTIATE_TEST_CASE_P(DecodedImageOrientationHistogramTest, DecodedImageOrientationHistogramTest,
     ::testing::ValuesIn(kDecodedImageOrientationHistogramTestParams));
 
 } // namespace blink