Mark ResourceClient/ImageResourceObserver finished just before notifying

third_party/WebKit/Source/core/fetch/Resource.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, 2008, 2009, 2010, 2011 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 323 matching lines @@
 }
 
 void Resource::setLoader(ResourceLoader* loader)
 {
     RELEASE_ASSERT(!m_loader);
     ASSERT(stillNeedsLoad());
     m_loader = loader;
     m_status = Pending;
 }
 
-void Resource::checkNotify()
+void Resource::checkNotify(MarkFinishedOption markFinishedOption)
 {
     if (isLoading())
         return;
 
     ResourceClientWalker<ResourceClient> w(m_clients);
-    while (ResourceClient* c = w.next())
+    while (ResourceClient* c = w.next()) {
+        if (markFinishedOption == MarkFinishedOption::ShouldMarkFinished)
+            markClientFinished(c);
         c->notifyFinished(this);
+    }
+}
+
+void Resource::markClientFinished(ResourceClient* client)
+{
+    if (m_clients.contains(client)) {
+        m_finishedClients.add(client);
+        m_clients.remove(client);
+    }
 }
 
 void Resource::appendData(const char* data, size_t length)
 {
     TRACE_EVENT0("blink", "Resource::appendData");
     DCHECK(!m_isRevalidating);
     ASSERT(!errorOccurred());
     if (m_options.dataBufferingPolicy == DoNotBufferData)
         return;
     if (m_data)
@@ skipping 12 matching lines @@
     setEncodedSize(m_data->size());
 }
 
 void Resource::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy)
 {
     m_options.dataBufferingPolicy = dataBufferingPolicy;
     m_data.clear();
     setEncodedSize(0);
 }
 
-void Resource::markClientsAndObserversFinished()
-{
-    HashCountedSet<ResourceClient*> clients;
-    m_clients.swap(clients);
-    for (const auto& it : clients)
-        m_finishedClients.add(it.key, it.value);
-}
-
 void Resource::error(const ResourceError& error)
 {
     ASSERT(!error.isNull());
     m_error = error;
     m_isRevalidating = false;
 
     if (m_error.isCancellation() || !isPreloaded())
         memoryCache()->remove(this);
 
     if (!errorOccurred())
         setStatus(LoadError);
     ASSERT(errorOccurred());
     m_data.clear();
     m_loader = nullptr;
-    checkNotify();
-    markClientsAndObserversFinished();
+    checkNotify(MarkFinishedOption::ShouldMarkFinished);
 }
 
 void Resource::finish(double loadFinishTime)
 {
     DCHECK(!m_isRevalidating);
     m_loadFinishTime = loadFinishTime;
     if (!errorOccurred())
         m_status = Cached;
     m_loader = nullptr;
-    checkNotify();
-    markClientsAndObserversFinished();
+    checkNotify(MarkFinishedOption::ShouldMarkFinished);
 }
 
 AtomicString Resource::httpContentType() const
 {
     return extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPNames::Content_Type).lower());
 }
 
 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const
 {
     String ignoredErrorDescription;
@@ skipping 683 matching lines @@
     case Resource::TextTrack:
     case Resource::Media:
     case Resource::Manifest:
         return false;
     }
     ASSERT_NOT_REACHED();
     return false;
 }
 
 } // namespace blink