Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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 420 matching lines @@
 }
 
 bool Resource::unlock()
 {
     if (!m_data)
         return false;
 
     if (!m_data->isLocked())
         return true;
 
-    if (!memoryCache()->contains(this) || hasClients() || !m_revalidatingRequest.isNull() || !m_loadFinishTime || !isSafeToUnlock())
+    if (!memoryCache()->contains(this) || hasClientsOrObservers() || !m_revalidatingRequest.isNull() || !m_loadFinishTime || !isSafeToUnlock())
         return false;
 
     m_data->unlock();
     return true;
 }
 
 void Resource::responseReceived(const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle>)
 {
     m_responseTimestamp = currentTime();
 
@@ skipping 59 matching lines @@
 #if ENABLE(OILPAN)
     return this;
 #else
     return m_weakPtrFactory.createWeakPtr();
 #endif
 }
 
 String Resource::reasonNotDeletable() const
 {
     StringBuilder builder;
-    if (hasClients()) {
+    if (hasClientsOrObservers()) {
         builder.append("hasClients(");
         builder.appendNumber(m_clients.size());
         if (!m_clientsAwaitingCallback.isEmpty()) {
             builder.append(", AwaitingCallback=");
             builder.appendNumber(m_clientsAwaitingCallback.size());
         }
         if (!m_finishedClients.isEmpty()) {
             builder.append(", Finished=");
             builder.appendNumber(m_finishedClients.size());
         }
@@ skipping 54 matching lines @@
         return true;
     if (type == Resource::CSSStyleSheet)
         return true;
     if (type == Resource::Script)
         return true;
     if (type == Resource::Font)
         return true;
     return false;
 }
 
-void Resource::addClient(ResourceClient* client)
+void Resource::willAddClientOrObserver()
 {
     ASSERT(!isPurgeable());
-
     if (m_preloadResult == PreloadNotReferenced) {
         if (isLoaded())
             m_preloadResult = PreloadReferencedWhileComplete;
         else if (m_requestedFromNetworkingLayer)
             m_preloadResult = PreloadReferencedWhileLoading;
         else
             m_preloadResult = PreloadReferenced;
     }
-    if (!hasClients())
+    if (!hasClientsOrObservers())
         memoryCache()->makeLive(this);
+}
+
+void Resource::addClient(ResourceClient* client)
+{
+    willAddClientOrObserver();
 
     if (!m_revalidatingRequest.isNull()) {
         m_clients.add(client);
         return;
     }
 
     // If we have existing data to send to the new client and the resource type supprts it, send it asynchronously.
     if (!m_response.isNull() && !shouldSendCachedDataSynchronouslyForType(getType()) && !m_needsSynchronousCacheHit) {
         m_clientsAwaitingCallback.add(client);
         ResourceCallback::callbackHandler()->schedule(this);
         return;
     }
 
     m_clients.add(client);
     didAddClient(client);
     return;
 }
 
 void Resource::removeClient(ResourceClient* client)
 {
     ASSERT(hasClient(client));
     if (m_finishedClients.contains(client))
         m_finishedClients.remove(client);
     else if (m_clientsAwaitingCallback.contains(client))
         m_clientsAwaitingCallback.remove(client);
     else
         m_clients.remove(client);
 
-    didRemoveClient(client);
-
     if (m_clientsAwaitingCallback.isEmpty())
         ResourceCallback::callbackHandler()->cancel(this);
 
-    if (!hasClients()) {
+    didRemoveClientOrObserver();
+    // This object may be dead here.
+}
+
+void Resource::didRemoveClientOrObserver()
+{
+    if (!hasClientsOrObservers()) {
         RefPtrWillBeRawPtr<Resource> protect(this);
         memoryCache()->makeDead(this);
-        allClientsRemoved();
+        allClientsAndObserversRemoved();
 
         // RFC2616 14.9.2:
         // "no-store: ... MUST make a best-effort attempt to remove the information from volatile storage as promptly as possible"
         // "... History buffers MAY store such responses as part of their normal operation."
         // We allow non-secure content to be reused in history, but we do not allow secure content to be reused.
         if (hasCacheControlNoStoreHeader() && url().protocolIs("https")) {
             memoryCache()->remove(this);
             memoryCache()->prune();
         } else {
             memoryCache()->prune(this);
         }
     }
     // This object may be dead here.
 }
 
-void Resource::allClientsRemoved()
+void Resource::allClientsAndObserversRemoved()
 {
     if (!m_loader)
         return;
     if (m_type == MainResource || m_type == Raw || !memoryCache()->contains(this))
         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 (hasClients() || !m_loader)
+    if (hasClientsOrObservers() || !m_loader)
         return;
     RefPtrWillBeRawPtr<Resource> protect(this);
     m_loader->cancelIfNotFinishing();
     if (m_status != Cached)
         memoryCache()->remove(this);
 }
 
 void Resource::setDecodedSize(size_t decodedSize)
 {
     if (decodedSize == m_decodedSize)
@@ skipping 194 matching lines @@
     return m_data && !m_data->isLocked();
 }
 
 bool Resource::lock()
 {
     if (!m_data)
         return true;
     if (m_data->isLocked())
         return true;
 
-    ASSERT(!hasClients());
+    ASSERT(!hasClientsOrObservers());
 
     // If locking fails, our buffer has been purged. There's no point
     // in leaving a purged resource in MemoryCache.
     if (!m_data->lock()) {
         memoryCache()->remove(this);
         return false;
     }
     return true;
 }
 
 size_t Resource::overheadSize() const
 {
     static const int kAverageClientsHashMapSize = 384;
     return sizeof(Resource) + m_response.memoryUsage() + kAverageClientsHashMapSize + m_resourceRequest.url().string().length() * 2;
 }
 
 void Resource::didChangePriority(ResourceLoadPriority loadPriority, int intraPriorityValue)
 {
     m_resourceRequest.setPriority(loadPriority, intraPriorityValue);
     if (m_loader)
         m_loader->didChangePriority(loadPriority, intraPriorityValue);
 }
 
-ResourcePriority Resource::priorityFromClients()
-{
-    ResourcePriority priority;
-    ResourceClientWalker<ResourceClient> walker(m_clients);
-    while (ResourceClient* c = walker.next()) {
-        ResourcePriority nextPriority = c->computeResourcePriority();
-        if (nextPriority.visibility == ResourcePriority::NotVisible)
-            continue;
-        priority.visibility = ResourcePriority::Visible;
-        priority.intraPriorityValue += nextPriority.intraPriorityValue;
-    }
-    return priority;
-}
-
 Resource::ResourceCallback* Resource::ResourceCallback::callbackHandler()
 {
     // Oilpan + LSan: as the callbackHandler() singleton is used by Resource
     // and ResourcePtr finalizers, it cannot be released upon shutdown in
     // preparation for leak detection.
     //
     // Keep it out of LSan's reach instead.
     LEAK_SANITIZER_DISABLED_SCOPE;
     DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ResourceCallback>, callbackHandler, (adoptPtrWillBeNoop(new ResourceCallback)));
     return callbackHandler.get();
@@ skipping 170 matching lines @@
     case Resource::Media:
         return "Media";
     case Resource::Manifest:
         return "Manifest";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 
 } // namespace blink