Cancel image loads if decoding failed (attempt #2)

third_party/WebKit/Source/core/fetch/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. 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
@@ skipping 357 matching lines @@
     m_image.clear();
 }
 
 void ImageResource::updateImage(bool allDataReceived)
 {
     TRACE_EVENT0("blink", "ImageResource::updateImage");
 
     if (m_data)
         createImage();
 
-    bool sizeAvailable = false;
+    Image::SizeAvailability sizeAvailable = Image::SizeUnavailable;
 
     // Have the image update its data from its internal buffer.
     // It will not do anything now, but will delay decoding until
     // queried for info (like size or specific image frames).
     if (m_data) {
         DCHECK(m_image);
         sizeAvailable = m_image->setData(m_data, allDataReceived);
     }
 
     // Go ahead and tell our observers to try to draw if we have either
     // received all the data or the size is known. Each chunk from the
     // network causes observers to repaint, which will force that chunk
     // to decode.
-    if (sizeAvailable || allDataReceived) {
-        if (!m_image || m_image->isNull()) {
-            if (!errorOccurred())
-                setStatus(DecodeError);
-            clear();
-            if (memoryCache()->contains(this))
-                memoryCache()->remove(this);
-        }
+    if (sizeAvailable == Image::SizeUnavailable && !allDataReceived)
+        return;
+    if (!m_image || m_image->isNull()) {
+        if (!errorOccurred())
+            setStatus(DecodeError);
+        if (!allDataReceived && m_loader)
+            m_loader->didFinishLoading(nullptr, monotonicallyIncreasingTime(), encodedSize());
+        clear();
+        memoryCache()->remove(this);
+    }
 
-        // It would be nice to only redraw the decoded band of the image, but with the current design
-        // (decoding delayed until painting) that seems hard.
-        notifyObservers();
-    }
+    // It would be nice to only redraw the decoded band of the image, but with the current design
+    // (decoding delayed until painting) that seems hard.
+    notifyObservers();
 }
 
 void ImageResource::updateImageAndClearBuffer()
 {
     clearImage();
     updateImage(true);
     m_data.clear();
 }
 
 void ImageResource::finish(double loadFinishTime)
@@ skipping 170 matching lines @@
     if (response().wasFetchedViaServiceWorker())
         return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
     if (!getImage()->currentFrameHasSingleSecurityOrigin())
         return false;
     if (passesAccessControlCheck(securityOrigin))
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 } // namespace blink