[ImageResource 0a] Do not notify ResourceClient/ImageResourceObserver of finish twice

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 134 matching lines @@
   ImageObserver::trace(visitor);
   MultipartImageResourceParser::Client::trace(visitor);
 }
 
 void ImageResource::checkNotify() {
   // Don't notify observers and clients of completion if this ImageResource is
   // about to be reloaded.
   if (m_isSchedulingReload || shouldReloadBrokenPlaceholder())
     return;
 
-  notifyObserversInternal(MarkFinishedOption::ShouldMarkFinished);
+  notifyObserversInternal();
   Resource::checkNotify();
 }
 
-void ImageResource::notifyObserversInternal(
-    MarkFinishedOption markFinishedOption) {
+void ImageResource::notifyObserversInternal() {
   if (isLoading())
     return;
 
   for (auto* observer : m_observers.asVector()) {
     if (m_observers.contains(observer)) {
-      if (markFinishedOption == MarkFinishedOption::ShouldMarkFinished)
-        markObserverFinished(observer);
+      markObserverFinished(observer);
       observer->imageNotifyFinished(this);
     }
   }
 }
 
 void ImageResource::markObserverFinished(ImageResourceObserver* observer) {
   if (m_observers.contains(observer)) {
     m_finishedObservers.add(observer);
     m_observers.remove(observer);
   }
@@ skipping 515 matching lines @@
     m_multipartParsingState = MultipartParsingState::ParsingFirstPart;
     return;
   }
   updateImageAndClearBuffer();
 
   if (m_multipartParsingState == MultipartParsingState::ParsingFirstPart) {
     m_multipartParsingState = MultipartParsingState::FinishedParsingFirstPart;
     // Notify finished when the first part ends.
     if (!errorOccurred())
       setStatus(Cached);
-    // We will also notify clients/observers of the finish in
-    // Resource::finish()/error() so we don't mark them finished here.
-    notifyObserversInternal(MarkFinishedOption::DoNotMarkFinished);
-    notifyClientsInternal(MarkFinishedOption::DoNotMarkFinished);
+    // We notify clients/observers of finish here, and they will not be
+    // notified again in Resource::finish()/error().
+    checkNotify();
     if (loader())
       loader()->didFinishLoadingFirstPartInMultipart();
   }
 }
 
 void ImageResource::multipartDataReceived(const char* bytes, size_t size) {
   DCHECK(m_multipartParser);
   Resource::appendData(bytes, size);
 }
 
 bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin) {
   if (response().wasFetchedViaServiceWorker()) {
     return response().serviceWorkerResponseType() !=
            WebServiceWorkerResponseTypeOpaque;
   }
   if (!getImage()->currentFrameHasSingleSecurityOrigin())
     return false;
   if (passesAccessControlCheck(securityOrigin))
     return true;
   return !securityOrigin->taintsCanvas(response().url());
 }
 
 }  // namespace blink