Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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

Index: third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
diff --git a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
index f437070cd2eadfbcb14db93599d3e732be9685f5..2b633e46883d96e4142332999287957f7dc7178f 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageFrameGenerator.h
@@ -64,8 +64,10 @@ class PLATFORM_EXPORT ImageFrameGenerator final
 
  public:
   static PassRefPtr<ImageFrameGenerator> create(const SkISize& fullSize,
+                                                sk_sp<SkColorSpace> colorSpace,
                                                 bool isMultiFrame = false) {
-    return adoptRef(new ImageFrameGenerator(fullSize, isMultiFrame));
+    return adoptRef(
+        new ImageFrameGenerator(fullSize, colorSpace, isMultiFrame));

[Justin Novosad, 2016/10/31 14:55:13]

Should use std::move here

[ccameron, 2016/10/31 18:10:17]

Done.

   }
 
   ~ImageFrameGenerator();
@@ -93,6 +95,7 @@ class PLATFORM_EXPORT ImageFrameGenerator final
                    const size_t rowBytes[3]);
 
   const SkISize& getFullSize() const { return m_fullSize; }
+  sk_sp<SkColorSpace> getColorSpace() const { return m_colorSpace; }
 
   bool isMultiFrame() const { return m_isMultiFrame; }
   bool decodeFailed() const { return m_decodeFailed; }
@@ -105,7 +108,9 @@ class PLATFORM_EXPORT ImageFrameGenerator final
   bool getYUVComponentSizes(SegmentReader*, SkYUVSizeInfo*);
 
  private:
-  ImageFrameGenerator(const SkISize& fullSize, bool isMultiFrame);
+  ImageFrameGenerator(const SkISize& fullSize,
+                      sk_sp<SkColorSpace>,
+                      bool isMultiFrame);
 
   friend class ImageFrameGeneratorTest;
   friend class DeferredImageDecoderTest;
@@ -131,6 +136,7 @@ class PLATFORM_EXPORT ImageFrameGenerator final
               SkBitmap::Allocator*);
 
   const SkISize m_fullSize;
+  sk_sp<SkColorSpace> m_colorSpace;
 
   const bool m_isMultiFrame;
   bool m_decodeFailed;