Remove preload support from the MemoryCache

sky/engine/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 83 matching lines @@
 
 Resource::Resource(const ResourceRequest& request, Type type)
     : m_resourceRequest(request)
     , m_responseTimestamp(currentTime())
     , m_cancelTimer(this, &Resource::cancelTimerFired)
     , m_loadFinishTime(0)
     , m_identifier(0)
     , m_encodedSize(0)
     , m_decodedSize(0)
     , m_handleCount(0)
-    , m_preloadCount(0)
     , m_protectorCount(0)
-    , m_preloadResult(PreloadNotReferenced)
     , m_requestedFromNetworkingLayer(false)
     , m_loading(false)
     , m_switchingClientsToRevalidatedResource(false)
     , m_type(type)
     , m_status(Pending)
     , m_wasPurged(false)
     , m_needsSynchronousCacheHit(false)
 #ifdef ENABLE_RESOURCE_IS_DELETED_CHECK
     , m_deleted(false)
 #endif
@@ skipping 116 matching lines @@
     m_options.dataBufferingPolicy = dataBufferingPolicy;
     m_data.clear();
     setEncodedSize(0);
 }
 
 void Resource::error(Resource::Status status)
 {
     if (m_resourceToRevalidate)
         revalidationFailed();
 
-    if (!m_error.isNull() && (m_error.isCancellation() || !isPreloaded()))

[esprehn, 2014/11/11 17:52:06]

Why don't you need the isCancellation check now?

[abarth-chromium, 2014/11/11 17:54:15]

!isPreloaded() is always true.

+    if (!m_error.isNull())
         memoryCache()->remove(this);
 
     setStatus(status);
     ASSERT(errorOccurred());
     m_data.clear();
 
     setLoading(false);
     checkNotify();
 }
 
@@ skipping 116 matching lines @@
     if (!m_resourceToRevalidate)
         return;
     if (response.httpStatusCode() == 304)
         revalidationSucceeded(response);
     else
         revalidationFailed();
 }
 
 bool Resource::canDelete() const
 {
-    return !hasClients() && !m_loader && !m_preloadCount && hasRightHandleCountApartFromCache(0)
+    return !hasClients() && !m_loader && hasRightHandleCountApartFromCache(0)
         && !m_protectorCount && !m_resourceToRevalidate && !m_proxyResource;
 }
 
 bool Resource::hasOneHandle() const
 {
     return hasRightHandleCountApartFromCache(1);
 }
 
 void Resource::clearLoader()
 {
@@ skipping 24 matching lines @@
         return true;
     if (type == Resource::Font)
         return true;
     return false;
 }
 
 bool Resource::addClientToSet(ResourceClient* client)
 {
     ASSERT(!isPurgeable());
 
-    if (m_preloadResult == PreloadNotReferenced) {
-        if (isLoaded())
-            m_preloadResult = PreloadReferencedWhileComplete;
-        else if (m_requestedFromNetworkingLayer)
-            m_preloadResult = PreloadReferencedWhileLoading;
-        else
-            m_preloadResult = PreloadReferenced;
-    }
     if (!hasClients())
         memoryCache()->makeLive(this);
 
     // If we have existing data to send to the new client and the resource type supprts it, send it asynchronously.
     if (!m_response.isNull() && !m_proxyResource && !shouldSendCachedDataSynchronouslyForType(type()) && !m_needsSynchronousCacheHit) {
         m_clientsAwaitingCallback.add(client);
         ResourceCallback::callbackHandler()->schedule(this);
         return false;
     }
 
@@ skipping 468 matching lines @@
         return "ImportResource";
     case Resource::Media:
         return "Media";
     }
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 #endif // !LOG_DISABLED
 
 }