[ImageLoader 2d] Set DecodeError by calling ResourceLoader::cancel()

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 404 matching lines @@
       IntSize dimensions = m_image->size();
       clearImage();
       m_image = PlaceholderImage::create(this, dimensions);
     } else {
       // Clear the image so that it gets treated like a decoding error, since
       // the attempt to build a placeholder image failed.
       clearImage();
     }
   }
 
-  if (!m_image || m_image->isNull()) {
-    size_t size = encodedSize();
-    clear();
-    if (!errorOccurred())
-      setStatus(DecodeError);
-    if (!allDataReceived && loader())
-      loader()->didFinishLoading(nullptr, monotonicallyIncreasingTime(), size);
-    memoryCache()->remove(this);
-  }
+  if (!m_image || m_image->isNull())
+    decodeError();
 
   // 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(allDataReceived);
 }
 
+void ImageResource::decodeError() {
+  if (isLoading() && loader()) {
+    loader()->cancel(DecodeError);
+  } else if (!errorOccurred()) {
+    setStatus(DecodeError);
+    clear();
+    setEncodedSize(0);
+    memoryCache()->remove(this);
+  }
+}
+
 void ImageResource::updateImageAndClearBuffer() {
   clearImage();
   updateImage(true);
   clearData();
 }
 
 void ImageResource::finish(double loadFinishTime) {
   if (m_multipartParser) {
     m_multipartParser->finish();
     if (data())
       updateImageAndClearBuffer();
   } else {
     updateImage(true);
     // As encoded image data can be created from m_image  (see
     // ImageResource::resourceBuffer(), we don't have to keep m_data. Let's
     // clear this. As for the lifetimes of m_image and m_data, see this
     // document:
     // https://docs.google.com/document/d/1v0yTAZ6wkqX2U_M6BNIGUJpM1s0TIw1VsqpxoL7aciY/edit?usp=sharing
     clearData();
     setEncodedSizeMemoryUsage(0);
   }
   Resource::finish(loadFinishTime);
 }
 
-void ImageResource::error(const ResourceError& error) {
+void ImageResource::error(const ResourceError& error, Status errorStatus) {
   if (m_multipartParser)
     m_multipartParser->cancel();
   clear();
-  Resource::error(error);
+  Resource::error(error, errorStatus);
   notifyObservers(true);
 }
 
 void ImageResource::responseReceived(
     const ResourceResponse& response,
     std::unique_ptr<WebDataConsumerHandle> handle) {
   DCHECK(!handle);
   DCHECK(!m_multipartParser);
   // If there's no boundary, just handle the request normally.
   if (response.isMultipart() && !response.multipartBoundary().isEmpty()) {
@@ skipping 159 matching lines @@
            WebServiceWorkerResponseTypeOpaque;
   }
   if (!getImage()->currentFrameHasSingleSecurityOrigin())
     return false;
   if (passesAccessControlCheck(securityOrigin))
     return true;
   return !securityOrigin->taintsCanvas(response().url());
 }
 
 }  // namespace blink