Clear Resource::m_loader in Resource::finish() and Resource::error()

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 317 matching lines @@
 {
     if (!m_revalidatingRequest.isNull())
         m_revalidatingRequest = ResourceRequest();
 
     if (!m_error.isNull() && (m_error.isCancellation() || !isPreloaded()))
         memoryCache()->remove(this);
 
     setStatus(status);
     ASSERT(errorOccurred());
     m_data.clear();
+    m_loader = nullptr;
     checkNotify();
     markClientsAndObserversFinished();
 }
 
 void Resource::finish()
 {
     ASSERT(m_revalidatingRequest.isNull());
     if (!errorOccurred())
         m_status = Cached;
+    m_loader = nullptr;
     checkNotify();
     markClientsAndObserversFinished();
 }
 
 AtomicString Resource::httpContentType() const
 {
     return extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPNames::Content_Type).lower());
 }
 
 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const
@@ skipping 226 matching lines @@
     return builder.toString();
 }
 
 CachedMetadata* Resource::cachedMetadata(unsigned dataTypeID) const
 {
     if (!m_cachedMetadata || m_cachedMetadata->dataTypeID() != dataTypeID)
         return nullptr;
     return m_cachedMetadata.get();
 }
 
-void Resource::clearLoader()
-{
-    m_loader = nullptr;
-}
-
 void Resource::didAddClient(ResourceClient* c)
 {
     if (isLoaded()) {
         c->notifyFinished(this);
         if (m_clients.contains(c)) {
             m_finishedClients.add(c);
             m_clients.remove(c);
         }
     }
 }
@@ skipping 98 matching lines @@
         cancelTimerFired(&m_cancelTimer);
     else if (!m_cancelTimer.isActive())
         m_cancelTimer.startOneShot(0, BLINK_FROM_HERE);
 
     unlock();
 }
 
 void Resource::cancelTimerFired(Timer<Resource>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_cancelTimer);
-    if (hasClientsOrObservers() || !m_loader)
-        return;
-    m_loader->cancelIfNotFinishing();

[Nate Chapin, 2016/04/27 19:48:30]

Since m_loader is nulled before sending load completion notifications, it should
now be impossible for m_loader to be non-null while finishing.

-    memoryCache()->remove(this);

[Nate Chapin, 2016/04/27 19:48:30]

This was a dumb hack to work around tests with unstated assumptions. Those tests
are fixed in this patch.

+    if (!hasClientsOrObservers() && m_loader)
+        m_loader->cancel();
 }
 
 void Resource::setDecodedSize(size_t decodedSize)
 {
     if (decodedSize == m_decodedSize)
         return;
     size_t oldSize = size();
     m_decodedSize = decodedSize;
     memoryCache()->update(this, oldSize, size());
     memoryCache()->updateDecodedResource(this, UpdateForPropertyChange);
@@ skipping 344 matching lines @@
     case Resource::Media:
         return "Media";
     case Resource::Manifest:
         return "Manifest";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
 } // namespace blink