Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
index da081e5b4c1702134182f3714a25dacea0d7c5d8..6c5c1c5443227a72f416e466945d8e70d3d2d36a 100644 |
--- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
+++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp |
@@ -49,6 +49,7 @@ ICOImageDecoder::ICOImageDecoder(AlphaOption alphaOption, GammaAndColorProfileOp |
, m_fastReader(nullptr) |
, m_decodedOffset(0) |
, m_dirEntriesCount(0) |
+ , m_gammaAndColorProfileOption(colorOptions) |
{ |
} |
@@ -210,8 +211,7 @@ bool ICOImageDecoder::decodeAtIndex(size_t index) |
if (!m_pngDecoders[index]) { |
AlphaOption alphaOption = m_premultiplyAlpha ? AlphaPremultiplied : AlphaNotPremultiplied; |
- GammaAndColorProfileOption colorOptions = m_ignoreGammaAndColorProfile ? GammaAndColorProfileIgnored : GammaAndColorProfileApplied; |
- m_pngDecoders[index] = wrapUnique(new PNGImageDecoder(alphaOption, colorOptions, m_maxDecodedBytes, dirEntry.m_imageOffset)); |
+ m_pngDecoders[index] = wrapUnique(new PNGImageDecoder(alphaOption, m_gammaAndColorProfileOption, m_maxDecodedBytes, dirEntry.m_imageOffset)); |
setDataForPNGDecoderAtIndex(index); |
} |
// Fail if the size the PNGImageDecoder calculated does not match the size |