Remove SK_SUPPORT_LEGACY_DATA_FACTORIES.

third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.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
@@ skipping 48 matching lines @@
     // skip it and just return nullptr to avoid a slowdown. (See
     // crbug.com/568016 for details about such a slowdown.)
     // TODO (scroggo): Stop relying on the internal knowledge of how Skia uses
     // this. skbug.com/5485
     if (ctx && !m_allDataReceived)
         return nullptr;
 
     // Other clients are serializers, which want the data even if it requires
     // copying, and even if the data is incomplete. (Otherwise they would
     // potentially need to decode the partial image in order to re-encode it.)
-    return m_data->getAsSkData().leakRef();
+    return m_data->getAsSkData().release();
 }
 
 bool DecodingImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor table[], int* tableCount)
 {
     TRACE_EVENT1("blink", "DecodingImageGenerator::getPixels", "frame index", static_cast<int>(m_frameIndex));
 
     // Implementation doesn't support scaling yet so make sure we're not given a different size.
     if (info.width() != getInfo().width() || info.height() != getInfo().height())
         return false;
 
@@ skipping 40 matching lines @@
 
 SkImageGenerator* DecodingImageGenerator::create(SkData* data)
 {
     // We just need the size of the image, so we have to temporarily create an ImageDecoder. Since
     // we only need the size, it doesn't really matter about premul or not, or gamma settings.
     std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(ImageDecoder::determineImageType(static_cast<const char*>(data->data()), data->size()),
         ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
     if (!decoder)
         return 0;
 
-    // Blink does not know Skia has already adopted |data|.
-    WTF::adopted(data);

[f(malita), 2016/08/03 19:23:04]

Nice to see this gone!

-    RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkData(data);
+    RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkData(sk_sp<SkData>(data));

[f(malita), 2016/08/03 19:23:05]

Shouldn't this be sk_ref_sp(data)?

The prev variant takes a PassRefPtr, and the implicit PassRefPtr<T*> ctor grabs
a new ref off the bare pointer.  Here it appears we're adopting instead.

(ideally the create param should also be a smart pointer, that would help
clarify what's going on here)

[bungeman-chromium, 2016/08/03 19:37:54]

After taking a closer look, I think you're right here.

Done.

     decoder->setData(segmentReader.get(), true);
     if (!decoder->isSizeAvailable())
         return 0;
 
     const IntSize size = decoder->size();
     const SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height());
 
     RefPtr<ImageFrameGenerator> frame = ImageFrameGenerator::create(SkISize::Make(size.width(), size.height()), false);
     if (!frame)
         return 0;
 
     return new DecodingImageGenerator(frame, info, segmentReader.release(), true, 0);
 }
 
 } // namespace blink