switch to new ImageGenerator API

third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.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 310 matching lines @@
 
   sk_sp<SkROBuffer> roBuffer(m_rwBuffer->newRBufferSnapshot());
   RefPtr<SegmentReader> segmentReader =
       SegmentReader::createFromSkROBuffer(std::move(roBuffer));
 
   SkImageInfo info = SkImageInfo::MakeN32(
       decodedSize.width(), decodedSize.height(),
       knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType,
       m_colorSpaceForSkImages);
 
-  DecodingImageGenerator* generator = new DecodingImageGenerator(
+  std::unique_ptr<DecodingImageGenerator> generator(new DecodingImageGenerator(

[f(malita), 2017/02/17 16:41:08]

nit: WTF::makeUnique(...);

[reed1, 2017/02/17 18:19:35]

Done.

       m_frameGenerator, info, std::move(segmentReader), m_allDataReceived,
-      index, m_frameData[index].m_uniqueID);
-  sk_sp<SkImage> image = SkImage::MakeFromGenerator(
-      generator);  // SkImage takes ownership of the generator.
+      index, m_frameData[index].m_uniqueID));
+  generator->setCanYUVDecode(m_canYUVDecode);
+  sk_sp<SkImage> image = SkImage::MakeFromGenerator(std::move(generator));
   if (!image)
     return nullptr;
 
   // We can consider decoded bitmap constant and reuse uniqueID only after all
   // data is received.  We reuse it also for multiframe images when image data
   // is partially received but the frame data is fully received.
   if (m_allDataReceived || m_frameData[index].m_isComplete) {
     DCHECK(m_frameData[index].m_uniqueID ==
                DecodingImageGenerator::kNeedNewImageUniqueID ||
            m_frameData[index].m_uniqueID == image->uniqueID());
     m_frameData[index].m_uniqueID = image->uniqueID();
   }
 
-  generator->setCanYUVDecode(m_canYUVDecode);
-
   return image;
 }
 
 bool DeferredImageDecoder::hotSpot(IntPoint& hotSpot) const {
   if (m_actualDecoder)
     return m_actualDecoder->hotSpot(hotSpot);
   if (m_hasHotSpot)
     hotSpot = m_hotSpot;
   return m_hasHotSpot;
 }
 
 }  // namespace blink
 
 namespace WTF {
 template <>
 struct VectorTraits<blink::DeferredFrameData>
     : public SimpleClassVectorTraits<blink::DeferredFrameData> {
   STATIC_ONLY(VectorTraits);
   static const bool canInitializeWithMemset =
       false;  // Not all DeferredFrameData members initialize to 0.
 };
 }