Respect colorSpace in DecodingImageGenerator::onGetPixels()

third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h

 /*
  * Copyright (C) 2012 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 46 matching lines @@
   virtual ~ImageDecoderFactory() {}
   virtual std::unique_ptr<ImageDecoder> create() = 0;
 };
 
 class PLATFORM_EXPORT ImageFrameGenerator final
     : public ThreadSafeRefCounted<ImageFrameGenerator> {
   WTF_MAKE_NONCOPYABLE(ImageFrameGenerator);
 
  public:
   static PassRefPtr<ImageFrameGenerator> create(
-      const SkISize& fullSize,
+      const SkImageInfo& info,
       bool isMultiFrame,
       const ColorBehavior& colorBehavior) {
-    return adoptRef(
-        new ImageFrameGenerator(fullSize, isMultiFrame, colorBehavior));
+    return adoptRef(new ImageFrameGenerator(info, isMultiFrame, colorBehavior));
   }
 
   ~ImageFrameGenerator();
 
   // Decodes and scales the specified frame at |index|. The dimensions and
   // output format are given in SkImageInfo. Decoded pixels are written into
   // |pixels| with a stride of |rowBytes|. Returns true if decoding was
   // successful.
   bool decodeAndScale(SegmentReader*,
                       bool allDataReceived,
                       size_t index,
                       const SkImageInfo&,
                       void* pixels,
                       size_t rowBytes);
 
   // Decodes YUV components directly into the provided memory planes. Must not
   // be called unless getYUVComponentSizes has been called and returned true.
   // YUV decoding does not currently support progressive decoding. In order to
   // support it, ImageDecoder needs something analagous to its ImageFrame cache
   // to hold partial planes, and the GPU code needs to handle them.
   bool decodeToYUV(SegmentReader*,
                    size_t index,
                    const SkISize componentSizes[3],
                    void* planes[3],
                    const size_t rowBytes[3]);
 
-  const SkISize& getFullSize() const { return m_fullSize; }
+  SkISize getFullSize() const { return m_info.dimensions(); }
 
   bool isMultiFrame() const { return m_isMultiFrame; }
   bool decodeFailed() const { return m_decodeFailed; }
 
   bool hasAlpha(size_t index);
 
   // Must not be called unless the SkROBuffer has all the data. YUV decoding
   // does not currently support progressive decoding. See comment above on
   // decodeToYUV().
   bool getYUVComponentSizes(SegmentReader*, SkYUVSizeInfo*);
 
  private:
-  ImageFrameGenerator(const SkISize& fullSize,
+  ImageFrameGenerator(const SkImageInfo&,
                       bool isMultiFrame,
                       const ColorBehavior&);
 
   friend class ImageFrameGeneratorTest;
   friend class DeferredImageDecoderTest;
   // For testing. |factory| will overwrite the default ImageDecoder creation
   // logic if |factory->create()| returns non-zero.
   void setImageDecoderFactory(std::unique_ptr<ImageDecoderFactory> factory) {
     m_imageDecoderFactory = std::move(factory);
   }
 
   void setHasAlpha(size_t index, bool hasAlpha);
 
   SkBitmap tryToResumeDecode(SegmentReader*,
                              bool allDataReceived,
                              size_t index,
                              const SkISize& scaledSize,
-                             SkBitmap::Allocator*);
+                             SkBitmap::Allocator*,
+                             const SkImageInfo& dstInfo);
   // This method should only be called while m_decodeMutex is locked.
   bool decode(SegmentReader*,
               bool allDataReceived,
               size_t index,
               ImageDecoder**,
               SkBitmap*,
-              SkBitmap::Allocator*);
+              SkBitmap::Allocator*,
+              ImageDecoder::AlphaOption,
+              const SkImageInfo& dstInfo);
 
-  const SkISize m_fullSize;
+  const SkImageInfo m_info;
 
   // Parameters used to create internal ImageDecoder objects.
   const ColorBehavior m_decoderColorBehavior;
 
   const bool m_isMultiFrame;
   bool m_decodeFailed;
   bool m_yuvDecodingFailed;
   size_t m_frameCount;
   Vector<bool> m_hasAlpha;
 
   std::unique_ptr<ImageDecoderFactory> m_imageDecoderFactory;
 
   // Prevents multiple decode operations on the same data.
   Mutex m_decodeMutex;
 
   // Protect concurrent access to m_hasAlpha.
   Mutex m_alphaMutex;
 };
 
 }  // namespace blink
 
 #endif