Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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

 /*
  * 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 86 matching lines @@
   size = decoder->decodedYUVSize(1);
   componentSizes[1].set(size.width(), size.height());
   componentWidthBytes[1] = decoder->decodedYUVWidthBytes(1);
   size = decoder->decodedYUVSize(2);
   componentSizes[2].set(size.width(), size.height());
   componentWidthBytes[2] = decoder->decodedYUVWidthBytes(2);
   return true;
 }
 
 ImageFrameGenerator::ImageFrameGenerator(const SkISize& fullSize,
+                                         sk_sp<SkColorSpace> colorSpace,
                                          bool isMultiFrame)
     : m_fullSize(fullSize),
+      m_colorSpace(colorSpace),

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

std::move

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

Done.

       m_isMultiFrame(isMultiFrame),
       m_decodeFailed(false),
       m_yuvDecodingFailed(false),
       m_frameCount(0) {}
 
 ImageFrameGenerator::~ImageFrameGenerator() {
   ImageDecodingStore::instance().removeCacheIndexedByGenerator(this);
 }
 
 bool ImageFrameGenerator::decodeAndScale(SegmentReader* data,
@@ skipping 254 matching lines @@
   // Setting a dummy ImagePlanes object signals to the decoder that we want to
   // do YUV decoding.
   std::unique_ptr<ImagePlanes> dummyImagePlanes = wrapUnique(new ImagePlanes);
   decoder->setImagePlanes(std::move(dummyImagePlanes));
 
   return updateYUVComponentSizes(decoder.get(), sizeInfo->fSizes,
                                  sizeInfo->fWidthBytes);
 }
 
 }  // namespace blink