Revert of Fix ImageLoader::m_hasPendingLoadEvent/m_imageComplete in ImageDocument

third_party/WebKit/Source/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 199 matching lines @@
         }
         if (oldImage) {
             oldImage->removeObserver(this);
         }
     }
 
     if (LayoutImageResource* imageResource = layoutImageResource())
         imageResource->resetAnimation();
 }
 
-void ImageLoader::setImagePending(ImageResource* newImage)
-{
-    ImageResource* oldImage = m_image.get();
-    if (m_hasPendingLoadEvent) {
-        loadEventSender().cancelEvent(this);
-        m_hasPendingLoadEvent = false;
-    }
-
-    // Cancel error events that belong to the previous load, which is now cancelled by changing the src attribute.
-    // If newImage is null and m_hasPendingErrorEvent is true, we know the error event has been just posted by
-    // this load and we should not cancel the event.
-    // FIXME: If both previous load and this one got blocked with an error, we can receive one error event instead of two.
-    if (m_hasPendingErrorEvent && newImage) {
-        errorEventSender().cancelEvent(this);
-        m_hasPendingErrorEvent = false;
-    }
-
-    m_image = newImage;
-    m_hasPendingLoadEvent = newImage;
-    m_imageComplete = !newImage;
-
-    updateLayoutObject();
-    // If newImage exists and is cached, addObserver() will result in the load event
-    // being queued to fire. Ensure this happens after beforeload is dispatched.
-    if (newImage) {
-        newImage->addObserver(this);
-    }
-    if (oldImage) {
-        oldImage->removeObserver(this);
-    }
-}
-
 static void configureRequest(FetchRequest& request, ImageLoader::BypassMainWorldBehavior bypassBehavior, Element& element, const ClientHintsPreferences& clientHintsPreferences)
 {
     if (bypassBehavior == ImageLoader::BypassMainWorldCSP)
         request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy);
 
     CrossOriginAttributeValue crossOrigin = crossOriginAttributeValue(element.fastGetAttribute(HTMLNames::crossoriginAttr));
     if (crossOrigin != CrossOriginAttributeNotSet)
         request.setCrossOriginAccessControl(element.document().getSecurityOrigin(), crossOrigin);
 
     if (clientHintsPreferences.shouldSendResourceWidth() && isHTMLImageElement(element))
@@ skipping 75 matching lines @@
             // Fire an error event if the url string is not empty, but the KURL is.
             dispatchErrorEvent();
         }
         noImageResourceToLoad();
     }
 
     ImageResource* oldImage = m_image.get();
     if (updateBehavior == UpdateSizeChanged && m_element->layoutObject() && m_element->layoutObject()->isImage() && newImage == oldImage) {
         toLayoutImage(m_element->layoutObject())->intrinsicSizeChanged();
     } else {
-        setImagePending(newImage);
+        if (m_hasPendingLoadEvent) {
+            loadEventSender().cancelEvent(this);
+            m_hasPendingLoadEvent = false;
+        }
+
+        // Cancel error events that belong to the previous load, which is now cancelled by changing the src attribute.
+        // If newImage is null and m_hasPendingErrorEvent is true, we know the error event has been just posted by
+        // this load and we should not cancel the event.
+        // FIXME: If both previous load and this one got blocked with an error, we can receive one error event instead of two.
+        if (m_hasPendingErrorEvent && newImage) {
+            errorEventSender().cancelEvent(this);
+            m_hasPendingErrorEvent = false;
+        }
+
+        m_image = newImage;
+        m_hasPendingLoadEvent = newImage;
+        m_imageComplete = !newImage;
+
+        updateLayoutObject();
+        // If newImage exists and is cached, addObserver() will result in the load event
+        // being queued to fire. Ensure this happens after beforeload is dispatched.
+        if (newImage) {
+            newImage->addObserver(this);
+        }
+        if (oldImage) {
+            oldImage->removeObserver(this);
+        }
     }
 
     if (LayoutImageResource* imageResource = layoutImageResource())
         imageResource->resetAnimation();
 
     // Only consider updating the protection ref-count of the Element immediately before returning
     // from this function as doing so might result in the destruction of this ImageLoader.
     updatedHasPendingEvent();
 }
 
 void ImageLoader::updateFromElement(UpdateFromElementBehavior updateBehavior, ReferrerPolicy referrerPolicy)
 {
     AtomicString imageSourceURL = m_element->imageSourceURL();
     m_suppressErrorEvents = (updateBehavior == UpdateSizeChanged);
 
     if (updateBehavior == UpdateIgnorePreviousError)
         clearFailedLoadURL();
 
     if (!m_failedLoadURL.isEmpty() && imageSourceURL == m_failedLoadURL)
         return;
 
     // Prevent the creation of a ResourceLoader (and therefore a network
     // request) for ImageDocument loads. In this case, the image contents have already
     // been requested as a main resource and ImageDocumentParser will take care of
     // funneling the main resource bytes into m_image, so just create an ImageResource
     // to be populated later.
     if (m_loadingImageDocument && updateBehavior != UpdateForcedReload) {
-        setImagePending(ImageResource::create(imageSourceToKURL(m_element->imageSourceURL())));
+        setImage(ImageResource::create(imageSourceToKURL(m_element->imageSourceURL())));
         m_image->setStatus(Resource::Pending);
-        // Only consider updating the protection ref-count of the Element immediately before returning
-        // from this function as doing so might result in the destruction of this ImageLoader.
-        updatedHasPendingEvent();
         return;
     }
 
     // If we have a pending task, we have to clear it -- either we're
     // now loading immediately, or we need to reset the task's state.
     if (m_pendingTask) {
         m_pendingTask->clearLoader();
         m_pendingTask.clear();
     }
 
@@ skipping 224 matching lines @@
 
 void ImageLoader::elementDidMoveToNewDocument()
 {
     if (m_loadDelayCounter)
         m_loadDelayCounter->documentChanged(m_element->document());
     clearFailedLoadURL();
     setImage(0);
 }
 
 } // namespace blink