Merge color options into ColorBehavior

third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

 /*
  * Copyright (c) 2008, 2009, 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 25 matching lines @@
 
 namespace blink {
 
 // Number of bits in .ICO/.CUR used to store the directory and its entries,
 // respectively (doesn't match sizeof values for member structs since we omit
 // some fields).
 static const size_t sizeOfDirectory = 6;
 static const size_t sizeOfDirEntry = 16;
 
 ICOImageDecoder::ICOImageDecoder(AlphaOption alphaOption,
-                                 ColorSpaceOption colorOptions,
-                                 sk_sp<SkColorSpace> targetColorSpace,
+                                 const ColorBehavior& colorBehavior,
                                  size_t maxDecodedBytes)
-    : ImageDecoder(alphaOption,
-                   colorOptions,
-                   std::move(targetColorSpace),
-                   maxDecodedBytes),
+    : ImageDecoder(alphaOption, colorBehavior, maxDecodedBytes),
       m_fastReader(nullptr),
       m_decodedOffset(0),
       m_dirEntriesCount(0),
-      m_colorSpaceOption(colorOptions) {}
+      m_colorBehavior(colorBehavior) {}
 
 ICOImageDecoder::~ICOImageDecoder() {}
 
 void ICOImageDecoder::onSetData(SegmentReader* data) {
   m_fastReader.setData(data);
 
   for (BMPReaders::iterator i(m_bmpReaders.begin()); i != m_bmpReaders.end();
        ++i) {
     if (*i)
       (*i)->setData(data);
@@ skipping 142 matching lines @@
     m_frameSize = dirEntry.m_size;
     bool result = m_bmpReaders[index]->decodeBMP(false);
     m_frameSize = IntSize();
     return result;
   }
 
   if (!m_pngDecoders[index]) {
     AlphaOption alphaOption =
         m_premultiplyAlpha ? AlphaPremultiplied : AlphaNotPremultiplied;
     m_pngDecoders[index] = wrapUnique(
-        new PNGImageDecoder(alphaOption, m_colorSpaceOption, m_targetColorSpace,
-                            m_maxDecodedBytes, dirEntry.m_imageOffset));
+        new PNGImageDecoder(alphaOption, m_colorBehavior, m_maxDecodedBytes,
+                            dirEntry.m_imageOffset));
     setDataForPNGDecoderAtIndex(index);
   }
   // Fail if the size the PNGImageDecoder calculated does not match the size
   // in the directory.
   if (m_pngDecoders[index]->isSizeAvailable() &&
       (m_pngDecoders[index]->size() != dirEntry.m_size))
     return setFailed();
   m_frameBufferCache[index] = *m_pngDecoders[index]->frameBufferAtIndex(0);
   m_frameBufferCache[index].setPremultiplyAlpha(m_premultiplyAlpha);
   return !m_pngDecoders[index]->failed() || setFailed();
@@ skipping 98 matching lines @@
   SECURITY_DCHECK(index < m_dirEntries.size());
   const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;
   if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))
     return Unknown;
   char buffer[4];
   const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer);
   return strncmp(data, "\x89PNG", 4) ? BMP : PNG;
 }
 
 }  // namespace blink