Refactor ImageDecoder factories

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 65 matching lines @@
 inline bool matchesCURSignature(const char* contents)
 {
     return !memcmp(contents, "\x00\x00\x02\x00", 4);
 }
 
 inline bool matchesBMPSignature(const char* contents)
 {
     return !memcmp(contents, "BM", 2);
 }
 
-std::unique_ptr<ImageDecoder> ImageDecoder::create(SniffResult sniffResult, AlphaOption alphaOption, GammaAndColorProfileOption colorOptions)
+// This needs to be updated if we ever add a matches*Signature() which requires more characters.
+static constexpr size_t kLongestSignatureLength = sizeof("RIFF????WEBPVP") - 1;
+
+std::unique_ptr<ImageDecoder> ImageDecoder::create(PassRefPtr<SegmentReader> passData, bool dataComplete,
+    AlphaOption alphaOption, GammaAndColorProfileOption colorOptions)
 {
-    size_t maxDecodedBytes = Platform::current() ? Platform::current()->maxDecodedImageBytes() : noDecodedImageByteLimit;
+    RefPtr<SegmentReader> data = passData;
 
+    // We need at least kLongestSignatureLength bytes to run the signature matcher.
+    if (data->size() < kLongestSignatureLength)
+        return nullptr;
+
+    const size_t maxDecodedBytes = Platform::current()
+        ? Platform::current()->maxDecodedImageBytes()
+        : noDecodedImageByteLimit;
+
+    // Access the first kLongestSignatureLength chars to sniff the signature.
+    // (note: FastSharedBufferReader only makes a copy if the bytes are segmented)
+    char buffer[kLongestSignatureLength];
+    const FastSharedBufferReader fastReader(data);
+    const ImageDecoder::SniffResult sniffResult = determineImageType(
+        fastReader.getConsecutiveData(0, kLongestSignatureLength, buffer), kLongestSignatureLength);
+
+    std::unique_ptr<ImageDecoder> decoder;
     switch (sniffResult) {
     case SniffResult::JPEG:
-        return wrapUnique(new JPEGImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        decoder = wrapUnique(new JPEGImageDecoder(alphaOption, colorOptions, maxDecodedBytes));

[Peter Kasting, 2016/08/19 23:04:58]

Nit: Do these wrapUnique() calls buy us anything anymore?

[f(malita), 2016/08/22 01:51:15]

There's an assert in there that we're not trying to wrap a garbage-collected
object, but in this case it's pretty clear decoders are not GCed.

Updated to reset().

+        break;
     case SniffResult::PNG:
-        return wrapUnique(new PNGImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        decoder = wrapUnique(new PNGImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        break;
     case SniffResult::GIF:
-        return wrapUnique(new GIFImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        decoder = wrapUnique(new GIFImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        break;
     case SniffResult::WEBP:
-        return wrapUnique(new WEBPImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        decoder = wrapUnique(new WEBPImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        break;
     case SniffResult::ICO:
-        return wrapUnique(new ICOImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        decoder = wrapUnique(new ICOImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        break;
     case SniffResult::BMP:
-        return wrapUnique(new BMPImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
-    case SniffResult::InsufficientData:
+        decoder = wrapUnique(new BMPImageDecoder(alphaOption, colorOptions, maxDecodedBytes));
+        break;
     case SniffResult::Invalid:
-        return nullptr;
+        break;
     }
-    NOTREACHED();
-    return nullptr;
+
+    if (decoder)
+        decoder->setData(data.release(), dataComplete);
+
+    return decoder;
 }
 
-namespace {
-
-// This needs to be updated if we ever add a matches*Signature() which requires more characters.
-constexpr size_t kLongestSignatureLength = sizeof("RIFF????WEBPVP") - 1;
-
-} // anonymous ns
+bool ImageDecoder::isSufficientData(const SharedBuffer& data)
+{
+    return data.size() >= kLongestSignatureLength;
+}
 
 ImageDecoder::SniffResult ImageDecoder::determineImageType(const char* contents, size_t length)
 {
-    if (length < kLongestSignatureLength)
-        return SniffResult::InsufficientData;
+    DCHECK_GE(length, kLongestSignatureLength);
+
     if (matchesJPEGSignature(contents))
         return SniffResult::JPEG;
     if (matchesPNGSignature(contents))
         return SniffResult::PNG;
     if (matchesGIFSignature(contents))
         return SniffResult::GIF;
     if (matchesWebPSignature(contents))
         return SniffResult::WEBP;
     if (matchesICOSignature(contents) || matchesCURSignature(contents))
         return SniffResult::ICO;
     if (matchesBMPSignature(contents))
         return SniffResult::BMP;
     return SniffResult::Invalid;
 }
 
-ImageDecoder::SniffResult ImageDecoder::determineImageType(const SharedBuffer& data)
-{
-    // TODO(fmalita): refactor the method signature to avoid casting.
-    RefPtr<SegmentReader> reader = SegmentReader::createFromSharedBuffer(const_cast<SharedBuffer*>(&data));
-
-    return determineImageType(*reader);
-}
-
-ImageDecoder::SniffResult ImageDecoder::determineImageType(const SegmentReader& data)
-{
-    // TODO(fmalita): refactor the method signature to avoid casting.
-    const FastSharedBufferReader fastReader(const_cast<SegmentReader*>(&data));
-    char buffer[kLongestSignatureLength];
-    const size_t len = std::min(kLongestSignatureLength, data.size());
-
-    return determineImageType(fastReader.getConsecutiveData(0, len, buffer), len);
-}
-
 size_t ImageDecoder::frameCount()
 {
     const size_t oldSize = m_frameBufferCache.size();
     const size_t newSize = decodeFrameCount();
     if (oldSize != newSize) {
         m_frameBufferCache.resize(newSize);
         for (size_t i = oldSize; i < newSize; ++i) {
             m_frameBufferCache[i].setPremultiplyAlpha(m_premultiplyAlpha);
             initializeNewFrame(i);
         }
@@ skipping 249 matching lines @@
         return;
 
     qcms_data_type dataFormat = hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8;
 
     // FIXME: Don't force perceptual intent if the image profile contains an intent.
     m_sourceToOutputDeviceColorTransform.reset(qcms_transform_create(inputProfile.get(), dataFormat, gTargetColorProfile, QCMS_DATA_RGBA_8, QCMS_INTENT_PERCEPTUAL));
 #endif // USE(QCMSLIB)
 }
 
 } // namespace blink