Merge color options into ColorBehavior

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

 /*
  * 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 26 matching lines @@
 
 namespace blink {
 
 class PNGImageDecoder;
 
 // This class decodes the ICO and CUR image formats.
 class PLATFORM_EXPORT ICOImageDecoder final : public ImageDecoder {
   WTF_MAKE_NONCOPYABLE(ICOImageDecoder);
 
  public:
-  ICOImageDecoder(AlphaOption,
-                  ColorSpaceOption,
-                  sk_sp<SkColorSpace>,
-                  size_t maxDecodedBytes);
+  ICOImageDecoder(AlphaOption, const ColorBehavior&, size_t maxDecodedBytes);
   ~ICOImageDecoder() override;
 
   // ImageDecoder:
   String filenameExtension() const override { return "ico"; }
   void onSetData(SegmentReader*) override;
   IntSize size() const override;
   IntSize frameSizeAtIndex(size_t) const override;
   bool setSize(unsigned width, unsigned height) override;
   bool frameIsCompleteAtIndex(size_t) const override;
   // CAUTION: setFailed() deletes all readers and decoders.  Be careful to
@@ skipping 113 matching lines @@
   typedef Vector<std::unique_ptr<BMPImageReader>> BMPReaders;
   BMPReaders m_bmpReaders;
   typedef Vector<std::unique_ptr<PNGImageDecoder>> PNGDecoders;
   PNGDecoders m_pngDecoders;
 
   // Valid only while a BMPImageReader is decoding, this holds the size
   // for the particular entry being decoded.
   IntSize m_frameSize;
 
   // Used to pass on to an internally created PNG decoder.
-  const ColorSpaceOption m_colorSpaceOption;
+  const ColorBehavior m_colorBehavior;
 };
 
 }  // namespace blink
 
 #endif