Refactor ImageDecoder 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 102 matching lines @@
 
     PlatformInstrumentation::willDecodeLazyPixelRef(uniqueID());
     bool decoded = m_frameGenerator->decodeToYUV(m_data.get(), m_frameIndex, sizeInfo.fSizes, planes, sizeInfo.fWidthBytes);
     PlatformInstrumentation::didDecodeLazyPixelRef();
 
     return decoded;
 }
 
 SkImageGenerator* DecodingImageGenerator::create(SkData* data)
 {
+    RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkData(sk_ref_sp(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()),
+    std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(segmentReader, true,
         ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
-    if (!decoder)
-        return 0;
-
-    RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkData(sk_ref_sp(data));
-    decoder->setData(segmentReader.get(), true);
-    if (!decoder->isSizeAvailable())
-        return 0;
+    if (!decoder || !decoder->isSizeAvailable())
+        return nullptr;
 
     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 nullptr;
 
     return new DecodingImageGenerator(frame, info, segmentReader.release(), true, 0);
 }
 
 } // namespace blink