Cancel image loads if decoding failed (attempt #2)

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 39 matching lines @@
         , m_uniqueID(DecodingImageGenerator::kNeedNewImageUniqueID)
     {}
 
     ImageOrientation m_orientation;
     float m_duration;
     bool m_isComplete;
     size_t m_frameBytes;
     uint32_t m_uniqueID;
 };
 
-std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::create(const SharedBuffer& data, ImageDecoder::AlphaOption alphaOption, ImageDecoder::GammaAndColorProfileOption colorOptions)
+std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::create(ImageDecoder::SniffResult sniffResult, ImageDecoder::AlphaOption alphaOption, ImageDecoder::GammaAndColorProfileOption colorOptions)
 {
-    std::unique_ptr<ImageDecoder> actualDecoder = ImageDecoder::create(data, alphaOption, colorOptions);
+    std::unique_ptr<ImageDecoder> actualDecoder = ImageDecoder::create(sniffResult, alphaOption, colorOptions);
 
     if (!actualDecoder)
         return nullptr;
 
     return wrapUnique(new DeferredImageDecoder(std::move(actualDecoder)));
 }
 
 std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::createForTesting(std::unique_ptr<ImageDecoder> actualDecoder)
 {
     return wrapUnique(new DeferredImageDecoder(std::move(actualDecoder)));
@@ skipping 266 matching lines @@
 }
 
 } // 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.
 };
 }