Remove unused LoaderStrategy::storeDerivedDataToCache and associated dead code

achristensen07 · achristensen07 · commit f51efda25b84 · 2018-12-06T16:55:45.000Z
https://bugs.webkit.org/show_bug.cgi?id=192452 Reviewed by Anders Carlsson. Source/WebCore: * loader/LoaderStrategy.h: * loader/ResourceLoader.cpp: (WebCore::ResourceLoader::didRetrieveDerivedDataFromCache): Deleted. * loader/ResourceLoader.h: * loader/ResourceLoaderOptions.h: * loader/SubresourceLoader.cpp: (WebCore::SubresourceLoader::didRetrieveDerivedDataFromCache): Deleted. * loader/SubresourceLoader.h: * loader/ThreadableLoader.cpp: (WebCore::ThreadableLoaderOptions::isolatedCopy const): * loader/cache/CachedResource.h: (WebCore::CachedResource::didRetrieveDerivedDataFromCache): Deleted. Source/WebKit: This was introduced in r210835 but never used. It's preventing me from making the disk cache associated with a SessionID/NetworkSession. * NetworkProcess/NetworkConnectionToWebProcess.cpp: (WebKit::NetworkConnectionToWebProcess::storeDerivedDataToCache): Deleted. * NetworkProcess/NetworkConnectionToWebProcess.h: * NetworkProcess/NetworkConnectionToWebProcess.messages.in: * NetworkProcess/NetworkResourceLoadParameters.cpp: (WebKit::NetworkResourceLoadParameters::encode const): (WebKit::NetworkResourceLoadParameters::decode): * NetworkProcess/NetworkResourceLoadParameters.h: * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::continueDidReceiveResponse): (WebKit::NetworkResourceLoader::didRetrieveCacheEntry): (WebKit::NetworkResourceLoader::continueProcessingCachedEntryAfterDidReceiveResponse): Deleted. * NetworkProcess/NetworkResourceLoader.h: * WebProcess/Network/WebLoaderStrategy.cpp: (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess): (WebKit::WebLoaderStrategy::storeDerivedDataToCache): Deleted. * WebProcess/Network/WebLoaderStrategy.h: * WebProcess/Network/WebResourceLoader.cpp: (WebKit::WebResourceLoader::didRetrieveDerivedData): Deleted. * WebProcess/Network/WebResourceLoader.messages.in: Source/WebKitLegacy: * WebCoreSupport/WebResourceLoadScheduler.h: Canonical link: https://commits.webkit.org/207058@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238933 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2018-12-06  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused LoaderStrategy::storeDerivedDataToCache and associated dead code
+        https://bugs.webkit.org/show_bug.cgi?id=192452
+
+        Reviewed by Anders Carlsson.
+
+        * loader/LoaderStrategy.h:
+        * loader/ResourceLoader.cpp:
+        (WebCore::ResourceLoader::didRetrieveDerivedDataFromCache): Deleted.
+        * loader/ResourceLoader.h:
+        * loader/ResourceLoaderOptions.h:
+        * loader/SubresourceLoader.cpp:
+        (WebCore::SubresourceLoader::didRetrieveDerivedDataFromCache): Deleted.
+        * loader/SubresourceLoader.h:
+        * loader/ThreadableLoader.cpp:
+        (WebCore::ThreadableLoaderOptions::isolatedCopy const):
+        * loader/cache/CachedResource.h:
+        (WebCore::CachedResource::didRetrieveDerivedDataFromCache): Deleted.
+
 2018-12-06  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][BFC][MarginCollapsing] HeightAndMargin::margin is always the non-collapsed margin value.
diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h
@@ -31,7 +31,6 @@
 #include "StoredCredentialsPolicy.h"
 #include <pal/SessionID.h>
 #include <wtf/Forward.h>
-#include <wtf/SHA1.h>
 
 namespace WebCore {
 
@@ -74,8 +73,6 @@ class WEBCORE_EXPORT LoaderStrategy {
     using PreconnectCompletionHandler = WTF::Function<void(const ResourceError&)>;
     virtual void preconnectTo(FrameLoader&, const URL&, StoredCredentialsPolicy, PreconnectCompletionHandler&&) = 0;
 
-    virtual void storeDerivedDataToCache(const SHA1::Digest& bodyKey, const String& type, const String& partition, WebCore::SharedBuffer&) = 0;
-
     virtual void setCaptureExtraNetworkLoadMetricsEnabled(bool) = 0;
 
     virtual bool isOnLine() const = 0;
diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp
@@ -802,8 +802,4 @@ bool ResourceLoader::isAlwaysOnLoggingAllowed() const
     return frameLoader() && frameLoader()->isAlwaysOnLoggingAllowed();
 }
 
-void ResourceLoader::didRetrieveDerivedDataFromCache(const String&, SharedBuffer&)
-{
-}
-
 }
diff --git a/Source/WebCore/loader/ResourceLoader.h b/Source/WebCore/loader/ResourceLoader.h
@@ -105,7 +105,6 @@ class ResourceLoader : public RefCounted<ResourceLoader>, protected ResourceHand
     virtual void didReceiveBuffer(Ref<SharedBuffer>&&, long long encodedDataLength, DataPayloadType);
     virtual void didFinishLoading(const NetworkLoadMetrics&);
     virtual void didFail(const ResourceError&);
-    virtual void didRetrieveDerivedDataFromCache(const String& type, SharedBuffer&);
 
     WEBCORE_EXPORT void didBlockAuthenticationChallenge();
 
diff --git a/Source/WebCore/loader/ResourceLoaderOptions.h b/Source/WebCore/loader/ResourceLoaderOptions.h
@@ -152,7 +152,6 @@ struct ResourceLoaderOptions : public FetchOptions {
     std::optional<ServiceWorkerRegistrationIdentifier> serviceWorkerRegistrationIdentifier;
 #endif
     HashSet<HTTPHeaderName, WTF::IntHash<HTTPHeaderName>, WTF::StrongEnumHashTraits<HTTPHeaderName>> httpHeadersToKeep;
-    Vector<String> derivedCachedDataTypesToRetrieve;
     std::optional<ContentSecurityPolicyResponseHeaders> cspResponseHeaders;
     unsigned maxRedirectCount { 20 };
 
diff --git a/Source/WebCore/loader/SubresourceLoader.cpp b/Source/WebCore/loader/SubresourceLoader.cpp
@@ -721,13 +721,6 @@ void SubresourceLoader::didCancel(const ResourceError&)
     notifyDone(LoadCompletionType::Cancel);
 }
 
-void SubresourceLoader::didRetrieveDerivedDataFromCache(const String& type, SharedBuffer& buffer)
-{
-    if (m_state != Initialized)
-        return;
-    m_resource->didRetrieveDerivedDataFromCache(type, buffer);
-}
-
 void SubresourceLoader::notifyDone(LoadCompletionType type)
 {
     if (reachedTerminalState())
diff --git a/Source/WebCore/loader/SubresourceLoader.h b/Source/WebCore/loader/SubresourceLoader.h
@@ -79,7 +79,6 @@ class SubresourceLoader final : public ResourceLoader {
     void didFail(const ResourceError&) override;
     void willCancel(const ResourceError&) override;
     void didCancel(const ResourceError&) override;
-    void didRetrieveDerivedDataFromCache(const String& type, SharedBuffer&) override;
     
     void updateReferrerPolicy(const String&);
 
diff --git a/Source/WebCore/loader/ThreadableLoader.cpp b/Source/WebCore/loader/ThreadableLoader.cpp
@@ -89,9 +89,6 @@ ThreadableLoaderOptions ThreadableLoaderOptions::isolatedCopy() const
     copy.initiatorContext = this->initiatorContext;
     copy.clientCredentialPolicy = this->clientCredentialPolicy;
     copy.maxRedirectCount = this->maxRedirectCount;
-    copy.derivedCachedDataTypesToRetrieve.reserveInitialCapacity(this->derivedCachedDataTypesToRetrieve.size());
-    for (auto& derivedCachedDataType : this->derivedCachedDataTypesToRetrieve)
-        copy.derivedCachedDataTypesToRetrieve.uncheckedAppend(derivedCachedDataType.isolatedCopy());
     copy.preflightPolicy = this->preflightPolicy;
 
     // ThreadableLoaderOptions
diff --git a/Source/WebCore/loader/cache/CachedResource.h b/Source/WebCore/loader/cache/CachedResource.h
@@ -267,8 +267,6 @@ class CachedResource {
 
     virtual void didSendData(unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
 
-    virtual void didRetrieveDerivedDataFromCache(const String& /* type */, SharedBuffer&) { }
-
 #if USE(FOUNDATION) || USE(SOUP)
     WEBCORE_EXPORT void tryReplaceEncodedData(SharedBuffer&);
 #endif
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,34 @@
+2018-12-06  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused LoaderStrategy::storeDerivedDataToCache and associated dead code
+        https://bugs.webkit.org/show_bug.cgi?id=192452
+
+        Reviewed by Anders Carlsson.
+
+        This was introduced in r210835 but never used.
+        It's preventing me from making the disk cache associated with a SessionID/NetworkSession.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::storeDerivedDataToCache): Deleted.
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+        * NetworkProcess/NetworkResourceLoadParameters.cpp:
+        (WebKit::NetworkResourceLoadParameters::encode const):
+        (WebKit::NetworkResourceLoadParameters::decode):
+        * NetworkProcess/NetworkResourceLoadParameters.h:
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::continueDidReceiveResponse):
+        (WebKit::NetworkResourceLoader::didRetrieveCacheEntry):
+        (WebKit::NetworkResourceLoader::continueProcessingCachedEntryAfterDidReceiveResponse): Deleted.
+        * NetworkProcess/NetworkResourceLoader.h:
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
+        (WebKit::WebLoaderStrategy::storeDerivedDataToCache): Deleted.
+        * WebProcess/Network/WebLoaderStrategy.h:
+        * WebProcess/Network/WebResourceLoader.cpp:
+        (WebKit::WebResourceLoader::didRetrieveDerivedData): Deleted.
+        * WebProcess/Network/WebResourceLoader.messages.in:
+
 2018-12-06  Carlos Eduardo Ramalho  <cadubentzen@gmail.com>
 
         REGRESSION(r231043): [GTK] Undefined references to WebCore::LayerRepresentation::* with -DENABLE_OPENGL=OFF builds
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
@@ -548,12 +548,6 @@ void NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles(const Vector<Stri
     });
 }
 
-void NetworkConnectionToWebProcess::storeDerivedDataToCache(const WebKit::NetworkCache::DataKey& dataKey, const IPC::DataReference& data)
-{
-    if (auto* cache = NetworkProcess::singleton().cache())
-        cache->storeData(dataKey, data.data(), data.size());
-}
-
 void NetworkConnectionToWebProcess::setCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
 {
     m_captureExtraNetworkLoadMetricsEnabled = enabled;
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
@@ -170,8 +170,6 @@ class NetworkConnectionToWebProcess : public RefCounted<NetworkConnectionToWebPr
     void unregisterBlobURL(const URL&);
     void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&&)>&&);
 
-    void storeDerivedDataToCache(const WebKit::NetworkCache::DataKey&, const IPC::DataReference&);
-
     void setCaptureExtraNetworkLoadMetricsEnabled(bool);
 
     void createSocketStream(URL&&, PAL::SessionID, String cachePartition, uint64_t);
diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
@@ -50,8 +50,6 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver {
     BlobSize(URL url) -> (uint64_t resultSize) LegacySync
     WriteBlobsToTemporaryFiles(Vector<String> blobURLs) -> (Vector<String> fileNames) Async
 
-    StoreDerivedDataToCache(WebKit::NetworkCache::DataKey key, IPC::SharedBufferDataReference data)
-
     SetCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
 
     CreateSocketStream(URL url, PAL::SessionID sessionID, String cachePartition, uint64_t identifier)
diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
@@ -83,7 +83,6 @@ void NetworkResourceLoadParameters::encode(IPC::Encoder& encoder) const
     encoder << needsCertificateInfo;
     encoder << isMainFrameNavigation;
     encoder << maximumBufferingTime;
-    encoder << derivedCachedDataTypesToRetrieve;
 
     encoder << static_cast<bool>(sourceOrigin);
     if (sourceOrigin)
@@ -173,8 +172,6 @@ bool NetworkResourceLoadParameters::decode(IPC::Decoder& decoder, NetworkResourc
         return false;
     if (!decoder.decode(result.maximumBufferingTime))
         return false;
-    if (!decoder.decode(result.derivedCachedDataTypesToRetrieve))
-        return false;
 
     bool hasSourceOrigin;
     if (!decoder.decode(hasSourceOrigin))
diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h b/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h
@@ -54,7 +54,6 @@ class NetworkResourceLoadParameters : public NetworkLoadParameters {
     Vector<RefPtr<SandboxExtension>> requestBodySandboxExtensions; // Created automatically for the sender.
     RefPtr<SandboxExtension> resourceSandboxExtension; // Created automatically for the sender.
     Seconds maximumBufferingTime;
-    Vector<String> derivedCachedDataTypesToRetrieve;
     RefPtr<WebCore::SecurityOrigin> sourceOrigin;
     WebCore::FetchOptions options;
     std::optional<WebCore::ContentSecurityPolicyResponseHeaders> cspResponseHeaders;
diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
@@ -749,7 +749,8 @@ void NetworkResourceLoader::continueWillSendRequest(ResourceRequest&& newRequest
 void NetworkResourceLoader::continueDidReceiveResponse()
 {
     if (m_cacheEntryWaitingForContinueDidReceiveResponse) {
-        continueProcessingCachedEntryAfterDidReceiveResponse(WTFMove(m_cacheEntryWaitingForContinueDidReceiveResponse));
+        sendResultForCacheEntry(WTFMove(m_cacheEntryWaitingForContinueDidReceiveResponse));
+        cleanup(LoadResult::Success);
         return;
     }
 
@@ -840,41 +841,10 @@ void NetworkResourceLoader::didRetrieveCacheEntry(std::unique_ptr<NetworkCache::
 
     if (needsContinueDidReceiveResponseMessage)
         m_cacheEntryWaitingForContinueDidReceiveResponse = WTFMove(entry);
-    else
-        continueProcessingCachedEntryAfterDidReceiveResponse(WTFMove(entry));
-}
-
-void NetworkResourceLoader::continueProcessingCachedEntryAfterDidReceiveResponse(std::unique_ptr<NetworkCache::Entry> entry)
-{
-    if (entry->sourceStorageRecord().bodyHash && !m_parameters.derivedCachedDataTypesToRetrieve.isEmpty()) {
-        auto bodyHash = *entry->sourceStorageRecord().bodyHash;
-        auto* entryPtr = entry.release();
-        auto retrieveCount = m_parameters.derivedCachedDataTypesToRetrieve.size();
-
-        for (auto& type : m_parameters.derivedCachedDataTypesToRetrieve) {
-            NetworkCache::DataKey key { originalRequest().cachePartition(), type, bodyHash };
-            m_cache->retrieveData(key, [loader = makeRef(*this), entryPtr, type, retrieveCount] (const uint8_t* data, size_t size) mutable {
-                loader->m_retrievedDerivedDataCount++;
-                bool retrievedAll = loader->m_retrievedDerivedDataCount == retrieveCount;
-                std::unique_ptr<NetworkCache::Entry> entry(retrievedAll ? entryPtr : nullptr);
-                if (loader->hasOneRef())
-                    return;
-                if (data) {
-                    IPC::DataReference dataReference(data, size);
-                    loader->send(Messages::WebResourceLoader::DidRetrieveDerivedData(type, dataReference));
-                }
-                if (retrievedAll) {
-                    loader->sendResultForCacheEntry(WTFMove(entry));
-                    loader->cleanup(LoadResult::Success);
-                }
-            });
-        }
-        return;
+    else {
+        sendResultForCacheEntry(WTFMove(entry));
+        cleanup(LoadResult::Success);
     }
-
-    sendResultForCacheEntry(WTFMove(entry));
-
-    cleanup(LoadResult::Success);
 }
 
 void NetworkResourceLoader::sendResultForCacheEntry(std::unique_ptr<NetworkCache::Entry> entry)
diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h
@@ -23,11 +23,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NetworkResourceLoader_h
-#define NetworkResourceLoader_h
+#pragma once
 
 #include "DownloadID.h"
 #include "MessageSender.h"
+#include "NetworkCache.h"
 #include "NetworkConnectionToWebProcessMessages.h"
 #include "NetworkLoadClient.h"
 #include "NetworkResourceLoadParameters.h"
@@ -132,7 +132,6 @@ class NetworkResourceLoader final
     void sendResultForCacheEntry(std::unique_ptr<NetworkCache::Entry>);
     void validateCacheEntry(std::unique_ptr<NetworkCache::Entry>);
     void dispatchWillSendRequestForCacheEntry(WebCore::ResourceRequest&&, std::unique_ptr<NetworkCache::Entry>&&);
-    void continueProcessingCachedEntryAfterDidReceiveResponse(std::unique_ptr<NetworkCache::Entry>);
 
     bool shouldInterruptLoadForXFrameOptions(const String&, const URL&);
     bool shouldInterruptLoadForCSPFrameAncestorsOrXFrameOptions(const WebCore::ResourceResponse&);
@@ -215,5 +214,3 @@ class NetworkResourceLoader final
 };
 
 } // namespace WebKit
-
-#endif // NetworkResourceLoader_h
diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
@@ -273,7 +273,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
     loadParameters.defersLoading = resourceLoader.defersLoading();
     loadParameters.needsCertificateInfo = resourceLoader.shouldIncludeCertificateInfo();
     loadParameters.maximumBufferingTime = maximumBufferingTime;
-    loadParameters.derivedCachedDataTypesToRetrieve = resourceLoader.options().derivedCachedDataTypesToRetrieve;
     loadParameters.options = resourceLoader.options();
     loadParameters.preflightPolicy = resourceLoader.options().preflightPolicy;
 
@@ -647,12 +646,6 @@ void WebLoaderStrategy::didFinishPreconnection(uint64_t preconnectionIdentifier,
         completionHandler(WTFMove(error));
 }
 
-void WebLoaderStrategy::storeDerivedDataToCache(const SHA1::Digest& bodyHash, const String& type, const String& partition, WebCore::SharedBuffer& data)
-{
-    NetworkCache::DataKey key { partition, type, bodyHash };
-    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::StoreDerivedDataToCache(key, { data }), 0);
-}
-
 bool WebLoaderStrategy::isOnLine() const
 {
     return m_isOnLine;
diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
@@ -68,8 +68,6 @@ class WebLoaderStrategy final : public WebCore::LoaderStrategy {
     void preconnectTo(WebCore::FrameLoader&, const URL&, WebCore::StoredCredentialsPolicy, PreconnectCompletionHandler&&) final;
     void didFinishPreconnection(uint64_t preconnectionIdentifier, WebCore::ResourceError&&);
 
-    void storeDerivedDataToCache(const SHA1::Digest& bodyHash, const String& type, const String& partition, WebCore::SharedBuffer&) final;
-
     void setCaptureExtraNetworkLoadMetricsEnabled(bool) final;
 
     WebResourceLoader* webResourceLoaderForIdentifier(ResourceLoadIdentifier identifier) const { return m_webResourceLoaders.get(identifier); }
diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
@@ -145,14 +145,6 @@ void WebResourceLoader::didReceiveData(const IPC::DataReference& data, int64_t e
     m_coreLoader->didReceiveData(reinterpret_cast<const char*>(data.data()), data.size(), encodedDataLength, DataPayloadBytes);
 }
 
-void WebResourceLoader::didRetrieveDerivedData(const String& type, const IPC::DataReference& data)
-{
-    LOG(Network, "(WebProcess) WebResourceLoader::didRetrieveDerivedData of size %lu for '%s'", data.size(), m_coreLoader->url().string().latin1().data());
-
-    auto buffer = SharedBuffer::create(data.data(), data.size());
-    m_coreLoader->didRetrieveDerivedDataFromCache(type, buffer.get());
-}
-
 void WebResourceLoader::didFinishResourceLoad(const NetworkLoadMetrics& networkLoadMetrics)
 {
     LOG(Network, "(WebProcess) WebResourceLoader::didFinishResourceLoad for '%s'", m_coreLoader->url().string().latin1().data());
diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.messages.in b/Source/WebKit/WebProcess/Network/WebResourceLoader.messages.in
@@ -26,7 +26,6 @@ messages -> WebResourceLoader LegacyReceiver {
     DidReceiveResponse(WebCore::ResourceResponse response, bool needsContinueDidReceiveResponseMessage)
     DidReceiveData(IPC::SharedBufferDataReference data, int64_t encodedDataLength)
     DidFinishResourceLoad(WebCore::NetworkLoadMetrics networkLoadMetrics)
-    DidRetrieveDerivedData(String type, IPC::DataReference data)
     DidFailResourceLoad(WebCore::ResourceError error)
     DidBlockAuthenticationChallenge()
 
diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
@@ -1,3 +1,12 @@
+2018-12-06  Alex Christensen  <achristensen@webkit.org>
+
+        Remove unused LoaderStrategy::storeDerivedDataToCache and associated dead code
+        https://bugs.webkit.org/show_bug.cgi?id=192452
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/WebResourceLoadScheduler.h:
+
 2018-12-03  Jer Noble  <jer.noble@apple.com>
 
         Get rid of old, dead Mac video fullscreen code.
diff --git a/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.h b/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.h
@@ -65,8 +65,6 @@ class WebResourceLoadScheduler final : public WebCore::LoaderStrategy {
 
     void preconnectTo(WebCore::FrameLoader&, const URL&, WebCore::StoredCredentialsPolicy, PreconnectCompletionHandler&&) final;
 
-    void storeDerivedDataToCache(const SHA1::Digest&, const String&, const String&, WebCore::SharedBuffer&) final { }
-
     void setCaptureExtraNetworkLoadMetricsEnabled(bool) final { }
 
     bool isSerialLoadingEnabled() const { return m_isSerialLoadingEnabled; }

Original file line number	Diff line number	Diff line change
`@@ -802,8 +802,4 @@ bool ResourceLoader::isAlwaysOnLoggingAllowed() const`
`802`	`802`	`return frameLoader() && frameLoader()->isAlwaysOnLoggingAllowed();`
`803`	`803`	`}`
`804`	`804`
`805`		`-void ResourceLoader::didRetrieveDerivedDataFromCache(const String&, SharedBuffer&)`
`806`		`-{`
`807`		`-}`
`808`		`-`
`809`	`805`	`}`
Original file line number	Diff line number	Diff line change
`@@ -721,13 +721,6 @@ void SubresourceLoader::didCancel(const ResourceError&)`
`721`	`721`	`notifyDone(LoadCompletionType::Cancel);`
`722`	`722`	`}`
`723`	`723`
`724`		`-void SubresourceLoader::didRetrieveDerivedDataFromCache(const String& type, SharedBuffer& buffer)`
`725`		`-{`
`726`		`- if (m_state != Initialized)`
`727`		`- return;`
`728`		`- m_resource->didRetrieveDerivedDataFromCache(type, buffer);`
`729`		`-}`
`730`		`-`
`731`	`724`	`void SubresourceLoader::notifyDone(LoadCompletionType type)`
`732`	`725`	`{`
`733`	`726`	`if (reachedTerminalState())`