Changeset 241005 in webkit

Timestamp:

Feb 5, 2019 5:02:44 PM (5 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r240984.

Revision casued two API timeouts

Reverted changeset:

"Stop using blobRegistry in NetworkProcess"
​https://bugs.webkit.org/show_bug.cgi?id=194027
​https://trac.webkit.org/changeset/240984

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/BlobRegistryImpl.h (modified) (2 diffs)
• WebCore/platform/network/FormData.cpp (modified) (4 diffs)
• WebCore/platform/network/FormData.h (modified) (2 diffs)
• WebCore/platform/network/cf/FormDataStreamCFNet.cpp (modified) (2 diffs)
• WebCore/platform/network/curl/CurlFormDataStream.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/Downloads/DownloadManager.cpp (modified) (2 diffs)
• WebKit/NetworkProcess/Downloads/PendingDownload.cpp (modified) (1 diff)
• WebKit/NetworkProcess/Downloads/PendingDownload.h (modified) (2 diffs)
• WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (modified) (10 diffs)
• WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.h (modified) (3 diffs)
• WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (modified) (7 diffs)
• WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (modified) (2 diffs)
• WebKit/NetworkProcess/NetworkDataTask.cpp (modified) (1 diff)
• WebKit/NetworkProcess/NetworkDataTaskBlob.cpp (modified) (2 diffs)
• WebKit/NetworkProcess/NetworkDataTaskBlob.h (modified) (3 diffs)
• WebKit/NetworkProcess/NetworkLoad.cpp (modified) (2 diffs)
• WebKit/NetworkProcess/NetworkLoad.h (modified) (3 diffs)
• WebKit/NetworkProcess/NetworkProcess.cpp (modified) (3 diffs)
• WebKit/NetworkProcess/NetworkProcess.h (modified) (4 diffs)
• WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp (modified) (2 diffs)
• WebKit/NetworkProcess/NetworkResourceLoader.cpp (modified) (6 diffs)
• WebKit/NetworkProcess/PingLoad.cpp (modified) (3 diffs)
• WebKit/NetworkProcess/PingLoad.h (modified) (2 diffs)
• WebKit/NetworkProcess/PreconnectTask.cpp (modified) (1 diff)
• WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-02-05  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r240984.
+
+        Revision casued two API timeouts
+
+        Reverted changeset:
+
+        "Stop using blobRegistry in NetworkProcess"
+        https://bugs.webkit.org/show_bug.cgi?id=194027
+        https://trac.webkit.org/changeset/240984
+
 2019-02-05  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebCore/platform/network/BlobRegistryImpl.h

@@ -57 +57 @@
     void writeBlobToFilePath(const URL& blobURL, const String& path, Function<void(bool success)>&& completionHandler);
 
+private:
     void appendStorageItems(BlobData*, const BlobDataItemList&, long long offset, long long length);
 
@@ -78 +79 @@
     bool populateBlobsForFileWriting(const Vector<String>& blobURLs, Vector<BlobForFileWriting>&);
 
-private:
     HashMap<String, RefPtr<BlobData>> m_blobs;
 };

trunk/Source/WebCore/platform/network/FormData.cpp

@@ -312 +312 @@
 }
 
-static void appendBlobResolved(BlobRegistry& blobRegistry, FormData& formData, const URL& url)
-{
-    if (!blobRegistry.isBlobRegistryImpl()) {
+static void appendBlobResolved(FormData* formData, const URL& url)
+{
+    if (!blobRegistry().isBlobRegistryImpl()) {
         LOG_ERROR("Tried to resolve a blob without a usable registry");
         return;
     }
 
-    auto* blobData = static_cast<BlobRegistryImpl&>(blobRegistry).getBlobDataFromURL(url);
+    BlobData* blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(url);
     if (!blobData) {
         LOG_ERROR("Could not get blob data from a registry");
@@ -328 +328 @@
         if (blobItem.type() == BlobDataItem::Type::Data) {
             ASSERT(blobItem.data().data());
-            formData.appendData(blobItem.data().data()->data() + static_cast<int>(blobItem.offset()), static_cast<int>(blobItem.length()));
+            formData->appendData(blobItem.data().data()->data() + static_cast<int>(blobItem.offset()), static_cast<int>(blobItem.length()));
         } else if (blobItem.type() == BlobDataItem::Type::File)
-            formData.appendFileRange(blobItem.file()->path(), blobItem.offset(), blobItem.length(), blobItem.file()->expectedModificationTime());
+            formData->appendFileRange(blobItem.file()->path(), blobItem.offset(), blobItem.length(), blobItem.file()->expectedModificationTime());
         else
             ASSERT_NOT_REACHED();
@@ -336 +336 @@
 }
 
-Ref<FormData> FormData::resolveBlobReferences(BlobRegistry& blobRegistry)
+Ref<FormData> FormData::resolveBlobReferences()
 {
     // First check if any blobs needs to be resolved, or we can take the fast path.
@@ -362 +362 @@
                 newFormData->appendFileRange(fileData.filename, fileData.fileStart, fileData.fileLength, fileData.expectedFileModificationTime, fileData.shouldGenerateFile);
             }, [&] (const FormDataElement::EncodedBlobData& blobData) {
-                appendBlobResolved(blobRegistry, newFormData.get(), blobData.url);
+                appendBlobResolved(newFormData.ptr(), blobData.url);
             }
         );

trunk/Source/WebCore/platform/network/FormData.h

@@ -30 +30 @@
 namespace WebCore {
 
-class BlobRegistry;
 class DOMFormData;
 class Document;
@@ -228 +227 @@
     // Resolve all blob references so we only have file and data.
     // If the FormData has no blob references to resolve, this is returned.
-    WEBCORE_EXPORT Ref<FormData> resolveBlobReferences(BlobRegistry&);
+    Ref<FormData> resolveBlobReferences();
 
     bool isEmpty() const { return m_elements.isEmpty(); }

trunk/Source/WebCore/platform/network/cf/FormDataStreamCFNet.cpp

@@ -31 +31 @@
 
 #include "BlobData.h"
-#include "BlobRegistry.h"
 #include "FormData.h"
 #include <sys/stat.h>
@@ -374 +373 @@
 RetainPtr<CFReadStreamRef> createHTTPBodyCFReadStream(FormData& formData)
 {
-    auto resolvedFormData = formData.resolveBlobReferences(blobRegistry());
+    auto resolvedFormData = formData.resolveBlobReferences();
 
     // Precompute the content length so CFNetwork doesn't use chunked mode.

trunk/Source/WebCore/platform/network/curl/CurlFormDataStream.cpp

@@ -35 +35 @@
 #if USE(CURL)
 
-#include "BlobRegistry.h"
 #include "CurlContext.h"
 #include "Logging.h"
@@ -52 +51 @@
 
     // Resolve the blob elements so the formData can correctly report it's size.
-    m_formData = m_formData->resolveBlobReferences(blobRegistry());
+    m_formData = m_formData->resolveBlobReferences();
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-05  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r240984.
+
+        Revision casued two API timeouts
+
+        Reverted changeset:
+
+        "Stop using blobRegistry in NetworkProcess"
+        https://bugs.webkit.org/show_bug.cgi?id=194027
+        https://trac.webkit.org/changeset/240984
+
 2019-02-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Downloads/DownloadManager.cpp

@@ -28 +28 @@
 
 #include "Download.h"
-#include "NetworkConnectionToWebProcess.h"
+#include "NetworkBlobRegistry.h"
 #include "NetworkLoad.h"
 #include "NetworkSession.h"
@@ -55 +55 @@
     parameters.clientCredentialPolicy = ClientCredentialPolicy::MayAskClientForCredentials;
     if (request.url().protocolIsBlob() && connection)
-        parameters.blobFileReferences = connection->filesInBlob(request.url());
+        parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(*connection, request.url());
     parameters.storedCredentialsPolicy = sessionID.isEphemeral() ? StoredCredentialsPolicy::DoNotUse : StoredCredentialsPolicy::Use;
 
-    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(m_client.parentProcessConnectionForDownloads(), WTFMove(parameters), downloadID, *networkSession, connection ? &connection->blobRegistry() : nullptr, suggestedName));
+    m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(m_client.parentProcessConnectionForDownloads(), WTFMove(parameters), downloadID, *networkSession, suggestedName));
 }
 

trunk/Source/WebKit/NetworkProcess/Downloads/PendingDownload.cpp

@@ -37 +37 @@
 using namespace WebCore;
 
-PendingDownload::PendingDownload(IPC::Connection* parentProcessConnection, NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession, WebCore::BlobRegistryImpl* blobRegistry, const String& suggestedName)
-    : m_networkLoad(std::make_unique<NetworkLoad>(*this, blobRegistry, WTFMove(parameters), networkSession))
+PendingDownload::PendingDownload(IPC::Connection* parentProcessConnection, NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession, const String& suggestedName)
+    : m_networkLoad(std::make_unique<NetworkLoad>(*this, WTFMove(parameters), networkSession))
     , m_parentProcessConnection(parentProcessConnection)
 {

trunk/Source/WebKit/NetworkProcess/Downloads/PendingDownload.h

@@ -35 +35 @@
 
 namespace WebCore {
-class BlobRegistryImpl;
 class ResourceResponse;
 }
@@ -50 +49 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    PendingDownload(IPC::Connection*, NetworkLoadParameters&&, DownloadID, NetworkSession&, WebCore::BlobRegistryImpl*, const String& suggestedName);
+    PendingDownload(IPC::Connection*, NetworkLoadParameters&&, DownloadID, NetworkSession&, const String& suggestedName);
     PendingDownload(IPC::Connection*, std::unique_ptr<NetworkLoad>&&, ResponseCompletionHandler&&, DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
 

trunk/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp

@@ -38 +38 @@
 using namespace WebCore;
 
-NetworkBlobRegistry::NetworkBlobRegistry() = default;
-NetworkBlobRegistry::~NetworkBlobRegistry() = default;
+NetworkBlobRegistry& NetworkBlobRegistry::singleton()
+{
+    ASSERT(RunLoop::isMain());
+    static NeverDestroyed<NetworkBlobRegistry> registry;
+    return registry;
+}
+
+NetworkBlobRegistry::NetworkBlobRegistry()
+{
+}
 
 void NetworkBlobRegistry::registerFileBlobURL(NetworkConnectionToWebProcess& connection, const URL& url, const String& path, RefPtr<SandboxExtension>&& sandboxExtension, const String& contentType)
 {
-    m_blobRegistry.registerFileBlobURL(url, BlobDataFileReferenceWithSandboxExtension::create(path, WTFMove(sandboxExtension)), contentType);
+    blobRegistry().registerFileBlobURL(url, BlobDataFileReferenceWithSandboxExtension::create(path, WTFMove(sandboxExtension)), contentType);
 
     ASSERT(!m_blobsForConnection.get(&connection).contains(url));
@@ -54 +62 @@
 void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess& connection, const URL& url, Vector<WebCore::BlobPart>&& blobParts, const String& contentType)
 {
-    m_blobRegistry.registerBlobURL(url, WTFMove(blobParts), contentType);
+    blobRegistry().registerBlobURL(url, WTFMove(blobParts), contentType);
 
     ASSERT(!m_blobsForConnection.get(&connection).contains(url));
@@ -73 +81 @@
     }
 
-    m_blobRegistry.registerBlobURL(url, srcURL);
+    blobRegistry().registerBlobURL(url, srcURL);
 
     ASSERT(shouldBypassConnectionCheck || mapIterator->value.contains(srcURL));
@@ -81 +89 @@
 void NetworkBlobRegistry::registerBlobURLOptionallyFileBacked(NetworkConnectionToWebProcess& connection, const URL& url, const URL& srcURL, const String& fileBackedPath, const String& contentType)
 {
-    m_blobRegistry.registerBlobURLOptionallyFileBacked(url, srcURL, BlobDataFileReferenceWithSandboxExtension::create(fileBackedPath, nullptr), contentType);
+    blobRegistry().registerBlobURLOptionallyFileBacked(url, srcURL, BlobDataFileReferenceWithSandboxExtension::create(fileBackedPath, nullptr), contentType);
 
     ASSERT(!m_blobsForConnection.get(&connection).contains(url));
@@ -97 +105 @@
         return;
 
-    m_blobRegistry.registerBlobURLForSlice(url, srcURL, start, end);
+    blobRegistry().registerBlobURLForSlice(url, srcURL, start, end);
 
     ASSERT(mapIterator->value.contains(srcURL));
@@ -110 +118 @@
         return;
 
-    m_blobRegistry.unregisterBlobURL(url);
+    blobRegistry().unregisterBlobURL(url);
 
     mapIterator->value.remove(url);
@@ -120 +128 @@
         return 0;
 
-    return m_blobRegistry.blobSize(url);
+    return blobRegistry().blobSize(url);
 }
 
 void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&&)>&& completionHandler)
 {
-    m_blobRegistry.writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
+    blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
 }
 
 void NetworkBlobRegistry::writeBlobToFilePath(const URL& blobURL, const String& path, CompletionHandler<void(bool success)>&& completionHandler)
 {
-    if (!m_blobRegistry.isBlobRegistryImpl()) {
+    if (!blobRegistry().isBlobRegistryImpl()) {
         completionHandler(false);
         ASSERT_NOT_REACHED();
@@ -140 +148 @@
         file->prepareForFileAccess();
 
-    m_blobRegistry.writeBlobToFilePath(blobURL, path, [blobFiles = WTFMove(blobFiles), completionHandler = WTFMove(completionHandler)] (bool success) mutable {
+    static_cast<BlobRegistryImpl&>(blobRegistry()).writeBlobToFilePath(blobURL, path, [blobFiles = WTFMove(blobFiles), completionHandler = WTFMove(completionHandler)] (bool success) mutable {
         for (auto& file : blobFiles)
             file->revokeFileAccess();
@@ -154 +162 @@
     HashSet<URL>& blobsForConnection = m_blobsForConnection.find(&connection)->value;
     for (HashSet<URL>::iterator iter = blobsForConnection.begin(), end = blobsForConnection.end(); iter != end; ++iter)
-        m_blobRegistry.unregisterBlobURL(*iter);
+        blobRegistry().unregisterBlobURL(*iter);
 
     m_blobsForConnection.remove(&connection);
@@ -169 +177 @@
 Vector<RefPtr<BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(const URL& url)
 {
-    ASSERT(m_blobRegistry.isBlobRegistryImpl());
-    BlobData* blobData = m_blobRegistry.getBlobDataFromURL(url);
+    ASSERT(blobRegistry().isBlobRegistryImpl());
+    BlobData* blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(url);
     if (!blobData)
         return { };

trunk/Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.h

@@ -26 +26 @@
 #pragma once
 
-#include <WebCore/BlobRegistryImpl.h>
 #include <wtf/Function.h>
 #include <wtf/HashMap.h>
@@ -46 +45 @@
 public:
     NetworkBlobRegistry();
-    ~NetworkBlobRegistry();
+    static NetworkBlobRegistry& singleton();
 
     void registerFileBlobURL(NetworkConnectionToWebProcess&, const URL&, const String& path, RefPtr<SandboxExtension>&&, const String& contentType);
@@ -62 +61 @@
     Vector<RefPtr<WebCore::BlobDataFileReference>> filesInBlob(NetworkConnectionToWebProcess&, const URL&);
     Vector<RefPtr<WebCore::BlobDataFileReference>> filesInBlob(const URL&);
-    
-    WebCore::BlobRegistryImpl& blobRegistry() { return m_blobRegistry; }
 
 private:
+    ~NetworkBlobRegistry();
+
     typedef HashMap<NetworkConnectionToWebProcess*, HashSet<URL>> BlobForConnectionMap;
     BlobForConnectionMap m_blobsForConnection;
-    WebCore::BlobRegistryImpl m_blobRegistry;
 };
 

trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

@@ -27 +27 @@
 #include "NetworkConnectionToWebProcess.h"
 
-#include "BlobDataFileReferenceWithSandboxExtension.h"
 #include "CacheStorageEngineConnectionMessages.h"
 #include "DataReference.h"
+#include "NetworkBlobRegistry.h"
 #include "NetworkCache.h"
 #include "NetworkMDNSRegisterMessages.h"
@@ -250 +250 @@
     stopAllNetworkActivityTracking();
 
-    m_networkProcess->networkBlobRegistry().connectionToWebProcessDidClose(*this);
+    NetworkBlobRegistry::singleton().connectionToWebProcessDidClose(*this);
     m_networkProcess->removeNetworkConnectionToWebProcess(*this);
 
@@ -312 +312 @@
 }
 
-Vector<RefPtr<WebCore::BlobDataFileReference>> NetworkConnectionToWebProcess::resolveBlobReferences(const NetworkResourceLoadParameters& parameters)
-{
-    Vector<RefPtr<WebCore::BlobDataFileReference>> files;
-    if (auto* body = parameters.request.httpBody()) {
-        for (auto& element : body->elements()) {
-            if (auto* blobData = WTF::get_if<FormDataElement::EncodedBlobData>(element.data))
-                files.appendVector(m_networkProcess->networkBlobRegistry().filesInBlob(*this, blobData->url));
-        }
-        const_cast<WebCore::ResourceRequest&>(parameters.request).setHTTPBody(body->resolveBlobReferences(m_networkProcess->networkBlobRegistry().blobRegistry()));
-    }
-
-    return files;
-}
-
 void NetworkConnectionToWebProcess::scheduleResourceLoad(NetworkResourceLoadParameters&& loadParameters)
 {
@@ -357 +343 @@
 
     // PingLoad manages its own lifetime, deleting itself when its purpose has been fulfilled.
-    new PingLoad(*this, networkProcess(), WTFMove(loadParameters), WTFMove(completionHandler));
+    new PingLoad(networkProcess(), WTFMove(loadParameters), WTFMove(completionHandler));
 }
 
@@ -406 +392 @@
 void NetworkConnectionToWebProcess::preconnectTo(uint64_t preconnectionIdentifier, NetworkResourceLoadParameters&& parameters)
 {
-    ASSERT(!parameters.request.httpBody());
-    
 #if ENABLE(SERVER_PRECONNECT)
     new PreconnectTask(networkProcess(), WTFMove(parameters), [this, protectedThis = makeRef(*this), identifier = preconnectionIdentifier] (const ResourceError& error) {
@@ -510 +494 @@
 void NetworkConnectionToWebProcess::registerFileBlobURL(const URL& url, const String& path, SandboxExtension::Handle&& extensionHandle, const String& contentType)
 {
-    m_networkProcess->networkBlobRegistry().registerFileBlobURL(*this, url, path, SandboxExtension::create(WTFMove(extensionHandle)), contentType);
+    RefPtr<SandboxExtension> extension = SandboxExtension::create(WTFMove(extensionHandle));
+
+    NetworkBlobRegistry::singleton().registerFileBlobURL(*this, url, path, WTFMove(extension), contentType);
 }
 
 void NetworkConnectionToWebProcess::registerBlobURL(const URL& url, Vector<BlobPart>&& blobParts, const String& contentType)
 {
-    m_networkProcess->networkBlobRegistry().registerBlobURL(*this, url, WTFMove(blobParts), contentType);
+    NetworkBlobRegistry::singleton().registerBlobURL(*this, url, WTFMove(blobParts), contentType);
 }
 
 void NetworkConnectionToWebProcess::registerBlobURLFromURL(const URL& url, const URL& srcURL, bool shouldBypassConnectionCheck)
 {
-    m_networkProcess->networkBlobRegistry().registerBlobURL(*this, url, srcURL, shouldBypassConnectionCheck);
+    NetworkBlobRegistry::singleton().registerBlobURL(*this, url, srcURL, shouldBypassConnectionCheck);
 }
 
 void NetworkConnectionToWebProcess::registerBlobURLOptionallyFileBacked(const URL& url, const URL& srcURL, const String& fileBackedPath, const String& contentType)
 {
-    m_networkProcess->networkBlobRegistry().registerBlobURLOptionallyFileBacked(*this, url, srcURL, fileBackedPath, contentType);
+    NetworkBlobRegistry::singleton().registerBlobURLOptionallyFileBacked(*this, url, srcURL, fileBackedPath, contentType);
 }
 
 void NetworkConnectionToWebProcess::registerBlobURLForSlice(const URL& url, const URL& srcURL, int64_t start, int64_t end)
 {
-    m_networkProcess->networkBlobRegistry().registerBlobURLForSlice(*this, url, srcURL, start, end);
+    NetworkBlobRegistry::singleton().registerBlobURLForSlice(*this, url, srcURL, start, end);
 }
 
 void NetworkConnectionToWebProcess::unregisterBlobURL(const URL& url)
 {
-    m_networkProcess->networkBlobRegistry().unregisterBlobURL(*this, url);
+    NetworkBlobRegistry::singleton().unregisterBlobURL(*this, url);
 }
 
 void NetworkConnectionToWebProcess::blobSize(const URL& url, uint64_t& resultSize)
 {
-    resultSize = m_networkProcess->networkBlobRegistry().blobSize(*this, url);
+    resultSize = NetworkBlobRegistry::singleton().blobSize(*this, url);
 }
 
@@ -547 +533 @@
     Vector<RefPtr<BlobDataFileReference>> fileReferences;
     for (auto& url : blobURLs)
-        fileReferences.appendVector(m_networkProcess->networkBlobRegistry().filesInBlob(*this, { { }, url }));
+        fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(*this, { { }, url }));
 
     for (auto& file : fileReferences)
         file->prepareForFileAccess();
 
-    m_networkProcess->networkBlobRegistry().writeBlobsToTemporaryFiles(blobURLs, [fileReferences = WTFMove(fileReferences), completionHandler = WTFMove(completionHandler)](auto&& fileNames) mutable {
+    NetworkBlobRegistry::singleton().writeBlobsToTemporaryFiles(blobURLs, [fileReferences = WTFMove(fileReferences), completionHandler = WTFMove(completionHandler)](auto&& fileNames) mutable {
         for (auto& file : fileReferences)
             file->revokeFileAccess();
         completionHandler(WTFMove(fileNames));
     });
-}
-
-Vector<RefPtr<WebCore::BlobDataFileReference>> NetworkConnectionToWebProcess::filesInBlob(const URL& url)
-{
-    return m_networkProcess->networkBlobRegistry().filesInBlob(*this, url);
-}
-
-WebCore::BlobRegistryImpl& NetworkConnectionToWebProcess::blobRegistry()
-{
-    return m_networkProcess->networkBlobRegistry().blobRegistry();
 }
 

trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h

@@ -42 +42 @@
 namespace WebCore {
 class BlobDataFileReference;
-class BlobRegistryImpl;
 class ResourceError;
 class ResourceRequest;
@@ -122 +121 @@
     Optional<NetworkActivityTracker> startTrackingResourceLoad(uint64_t pageID, ResourceLoadIdentifier resourceID, bool isMainResource, const PAL::SessionID&);
     void stopTrackingResourceLoad(ResourceLoadIdentifier resourceID, NetworkActivityTracker::CompletionCode);
-
-    WebCore::BlobRegistryImpl& blobRegistry();
-    Vector<RefPtr<WebCore::BlobDataFileReference>> filesInBlob(const URL&);
-    Vector<RefPtr<WebCore::BlobDataFileReference>> resolveBlobReferences(const NetworkResourceLoadParameters&);
 
 private:

trunk/Source/WebKit/NetworkProcess/NetworkDataTask.cpp

@@ -48 +48 @@
 Ref<NetworkDataTask> NetworkDataTask::create(NetworkSession& session, NetworkDataTaskClient& client, const NetworkLoadParameters& parameters)
 {
-    ASSERT(!parameters.request.url().protocolIsBlob());
+    if (parameters.request.url().protocolIsBlob())
+        return NetworkDataTaskBlob::create(session, client, parameters.request, parameters.contentSniffingPolicy, parameters.blobFileReferences);
+
 #if PLATFORM(COCOA)
     return NetworkDataTaskCocoa::create(session, client, parameters.request, parameters.webFrameID, parameters.webPageID, parameters.storedCredentialsPolicy, parameters.contentSniffingPolicy, parameters.contentEncodingSniffingPolicy, parameters.shouldClearReferrerOnHTTPSToHTTPRedirect, parameters.shouldPreconnectOnly, parameters.isMainFrameNavigation, parameters.networkActivityTracker);

trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.cpp

@@ -66 +66 @@
 static const char* const webKitBlobResourceDomain = "WebKitBlobResource";
 
-NetworkDataTaskBlob::NetworkDataTaskBlob(NetworkSession& session, BlobRegistryImpl& blobRegistry, NetworkDataTaskClient& client, const ResourceRequest& request, ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
+NetworkDataTaskBlob::NetworkDataTaskBlob(NetworkSession& session, NetworkDataTaskClient& client, const ResourceRequest& request, ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
     : NetworkDataTask(session, client, request, StoredCredentialsPolicy::DoNotUse, false, false)
     , m_stream(std::make_unique<AsyncFileStream>(*this))
@@ -75 +75 @@
         fileReference->prepareForFileAccess();
 
-    m_blobData = blobRegistry.getBlobDataFromURL(request.url());
+    m_blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(request.url());
 
     m_session->registerNetworkDataTask(*this);

trunk/Source/WebKit/NetworkProcess/NetworkDataTaskBlob.h

@@ -41 +41 @@
 class BlobData;
 class BlobDataItem;
-class BlobRegistryImpl;
 }
 
@@ -50 +49 @@
 class NetworkDataTaskBlob final : public NetworkDataTask, public WebCore::FileStreamClient {
 public:
-    static Ref<NetworkDataTask> create(NetworkSession& session, WebCore::BlobRegistryImpl& blobRegistry, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
+    static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const WebCore::ResourceRequest& request, WebCore::ContentSniffingPolicy shouldContentSniff, const Vector<RefPtr<WebCore::BlobDataFileReference>>& fileReferences)
     {
-        return adoptRef(*new NetworkDataTaskBlob(session, blobRegistry, client, request, shouldContentSniff, fileReferences));
+        return adoptRef(*new NetworkDataTaskBlob(session, client, request, shouldContentSniff, fileReferences));
     }
 
@@ -58 +57 @@
 
 private:
-    NetworkDataTaskBlob(NetworkSession&, WebCore::BlobRegistryImpl&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::ContentSniffingPolicy, const Vector<RefPtr<WebCore::BlobDataFileReference>>&);
+    NetworkDataTaskBlob(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::ContentSniffingPolicy, const Vector<RefPtr<WebCore::BlobDataFileReference>>&);
 
     void suspend() override;

trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp

@@ -51 +51 @@
 };
 
-NetworkLoad::NetworkLoad(NetworkLoadClient& client, BlobRegistryImpl* blobRegistry, NetworkLoadParameters&& parameters, NetworkSession& networkSession)
+NetworkLoad::NetworkLoad(NetworkLoadClient& client, NetworkLoadParameters&& parameters, NetworkSession& networkSession)
     : m_client(client)
     , m_networkProcess(networkSession.networkProcess())
@@ -58 +58 @@
     , m_currentRequest(m_parameters.request)
 {
-    initialize(networkSession, blobRegistry);
-}
-
-void NetworkLoad::initialize(NetworkSession& networkSession, WebCore::BlobRegistryImpl* blobRegistry)
-{
-    if (blobRegistry && m_parameters.request.url().protocolIsBlob())
-        m_task = NetworkDataTaskBlob::create(networkSession, *blobRegistry, *this, m_parameters.request, m_parameters.contentSniffingPolicy, m_parameters.blobFileReferences);
-    else
-        m_task = NetworkDataTask::create(networkSession, *this, m_parameters);
-
+    initialize(networkSession);
+}
+
+void NetworkLoad::initialize(NetworkSession& networkSession)
+{
+    m_task = NetworkDataTask::create(networkSession, *this, m_parameters);
     if (!m_parameters.defersLoading)
         m_task->resume();

trunk/Source/WebKit/NetworkProcess/NetworkLoad.h

@@ -34 +34 @@
 #include <wtf/text/WTFString.h>
 
-namespace WebCore {
-class BlobRegistryImpl;
-}
-
 namespace WebKit {
 
@@ -45 +41 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    NetworkLoad(NetworkLoadClient&, WebCore::BlobRegistryImpl*, NetworkLoadParameters&&, NetworkSession&);
+    NetworkLoad(NetworkLoadClient&, NetworkLoadParameters&&, NetworkSession&);
     ~NetworkLoad();
 
@@ -70 +66 @@
 
 private:
-    void initialize(NetworkSession&, WebCore::BlobRegistryImpl*);
+    void initialize(NetworkSession&);
 
     // NetworkDataTaskClient

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -38 +38 @@
 #endif
 #include "Logging.h"
+#include "NetworkBlobRegistry.h"
 #include "NetworkConnectionToWebProcess.h"
 #include "NetworkContentRuleListManagerMessages.h"
@@ -150 +151 @@
 #endif
 
-    NetworkStateNotifier::singleton().addListener([weakThis = makeWeakPtr(*this)](bool isOnLine) {
-        if (!weakThis)
-            return;
-        for (auto& webProcessConnection : weakThis->m_webProcessConnections)
+    NetworkStateNotifier::singleton().addListener([this](bool isOnLine) {
+        auto webProcessConnections = m_webProcessConnections;
+        for (auto& webProcessConnection : webProcessConnections)
             webProcessConnection->setOnLineState(isOnLine);
     });
@@ -187 +187 @@
 void NetworkProcess::removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess& connection)
 {
-    auto count = m_webProcessConnections.removeAllMatching([&] (const auto& c) {
-        return c.ptr() == &connection;
-    });
-    ASSERT_UNUSED(count, count == 1);
+    size_t vectorIndex = m_webProcessConnections.find(&connection);
+    ASSERT(vectorIndex != notFound);
+
+    m_webProcessConnections.remove(vectorIndex);
 }
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -29 +29 @@
 #include "CacheModel.h"
 #include "DownloadManager.h"
-#include "NetworkBlobRegistry.h"
 #include "NetworkContentRuleListManager.h"
 #include "NetworkHTTPSUpgradeChecker.h"
@@ -293 +292 @@
     void requestCacheStorageSpace(PAL::SessionID, const WebCore::ClientOrigin&, uint64_t quota, uint64_t currentSize, uint64_t spaceRequired, CompletionHandler<void(Optional<uint64_t>)>&&);
 
-    NetworkBlobRegistry& networkBlobRegistry() { return m_networkBlobRegistry; }
-
 private:
     void platformInitializeNetworkProcess(const NetworkProcessCreationParameters&);
@@ -426 +423 @@
 
     // Connections to WebProcesses.
-    Vector<Ref<NetworkConnectionToWebProcess>> m_webProcessConnections;
+    Vector<RefPtr<NetworkConnectionToWebProcess>> m_webProcessConnections;
 
     String m_diskCacheDirectory;
@@ -449 +446 @@
     HashMap<PAL::SessionID, std::unique_ptr<WebCore::NetworkStorageSession>> m_networkStorageSessions;
     mutable std::unique_ptr<WebCore::NetworkStorageSession> m_defaultNetworkStorageSession;
-    NetworkBlobRegistry m_networkBlobRegistry;
 
 #if PLATFORM(COCOA)

trunk/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp

@@ -27 +27 @@
 #include "NetworkProcessPlatformStrategies.h"
 
-#include <WebCore/BlobRegistry.h>
+#include <WebCore/BlobRegistryImpl.h>
 #include <wtf/NeverDestroyed.h>
 
@@ -51 +51 @@
 BlobRegistry* NetworkProcessPlatformStrategies::createBlobRegistry()
 {
-    using namespace WebCore;
-    class EmptyBlobRegistry : public WebCore::BlobRegistry {
-        void registerFileBlobURL(const URL&, Ref<BlobDataFileReference>&&, const String& contentType) final { ASSERT_NOT_REACHED(); }
-        void registerBlobURL(const URL&, Vector<BlobPart>&&, const String& contentType) final { ASSERT_NOT_REACHED(); }
-        void registerBlobURL(const URL&, const URL& srcURL) final { ASSERT_NOT_REACHED(); }
-        void registerBlobURLOptionallyFileBacked(const URL&, const URL& srcURL, RefPtr<BlobDataFileReference>&&, const String& contentType) final { ASSERT_NOT_REACHED(); }
-        void registerBlobURLForSlice(const URL&, const URL& srcURL, long long start, long long end) final { ASSERT_NOT_REACHED(); }
-        void unregisterBlobURL(const URL&) final { ASSERT_NOT_REACHED(); }
-        unsigned long long blobSize(const URL&) final { ASSERT_NOT_REACHED(); return 0; }
-        void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&& filePaths)>&&) final { ASSERT_NOT_REACHED(); }
-        bool isBlobRegistryImpl() const { return false; }
-    };
-    static NeverDestroyed<EmptyBlobRegistry> blobRegistry;
-    return &blobRegistry.get();
+    return new BlobRegistryImpl;
 }
 

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

@@ -30 +30 @@
 #include "FormDataReference.h"
 #include "Logging.h"
+#include "NetworkBlobRegistry.h"
 #include "NetworkCache.h"
 #include "NetworkConnectionToWebProcess.h"
@@ -92 +93 @@
     : m_parameters { WTFMove(parameters) }
     , m_connection { connection }
-    , m_fileReferences(connection.resolveBlobReferences(m_parameters))
     , m_defersLoading { parameters.defersLoading }
     , m_isAllowedToAskUserForCredentials { m_parameters.clientCredentialPolicy == ClientCredentialPolicy::MayAskClientForCredentials }
@@ -103 +103 @@
     //        Once bug 116233 is resolved, this ASSERT can just be "m_webPageID && m_webFrameID"
     ASSERT((m_parameters.webPageID && m_parameters.webFrameID) || m_parameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials);
+
+    if (originalRequest().httpBody()) {
+        for (const auto& element : originalRequest().httpBody()->elements()) {
+            if (auto* blobData = WTF::get_if<FormDataElement::EncodedBlobData>(element.data))
+                m_fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(connection, blobData->url));
+        }
+    }
 
     if (synchronousReply || parameters.shouldRestrictHTTPResponseAccess) {
@@ -122 +129 @@
     ASSERT(!m_networkLoad);
     ASSERT(!isSynchronous() || !m_synchronousLoadData->delayedReply);
-    ASSERT(m_fileReferences.isEmpty());
     if (m_responseCompletionHandler)
         m_responseCompletionHandler(PolicyAction::Ignore);
@@ -277 +283 @@
 
     if (request.url().protocolIsBlob())
-        parameters.blobFileReferences = m_connection->filesInBlob(originalRequest().url());
+        parameters.blobFileReferences = NetworkBlobRegistry::singleton().filesInBlob(m_connection, originalRequest().url());
 
     auto* networkSession = m_connection->networkProcess().networkSession(parameters.sessionID);
@@ -293 +299 @@
 
     parameters.request = WTFMove(request);
-    m_networkLoad = std::make_unique<NetworkLoad>(*this, &m_connection->blobRegistry(), WTFMove(parameters), *networkSession);
+    m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters), *networkSession);
 
     RELEASE_LOG_IF_ALLOWED("startNetworkLoad: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", description = %{public}s)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, m_networkLoad->description().utf8().data());

trunk/Source/WebKit/NetworkProcess/PingLoad.cpp

@@ -30 +30 @@
 #include "AuthenticationManager.h"
 #include "Logging.h"
-#include "NetworkConnectionToWebProcess.h"
 #include "NetworkLoadChecker.h"
 #include "NetworkProcess.h"
@@ -41 +40 @@
 using namespace WebCore;
 
-PingLoad::PingLoad(NetworkConnectionToWebProcess& connection, NetworkProcess& networkProcess, NetworkResourceLoadParameters&& parameters, CompletionHandler<void(const ResourceError&, const ResourceResponse&)>&& completionHandler)
+PingLoad::PingLoad(NetworkProcess& networkProcess, NetworkResourceLoadParameters&& parameters, CompletionHandler<void(const ResourceError&, const ResourceResponse&)>&& completionHandler)
     : m_parameters(WTFMove(parameters))
     , m_completionHandler(WTFMove(completionHandler))
     , m_timeoutTimer(*this, &PingLoad::timeoutTimerFired)
     , m_networkLoadChecker(makeUniqueRef<NetworkLoadChecker>(networkProcess, FetchOptions { m_parameters.options}, m_parameters.sessionID, m_parameters.webPageID, m_parameters.webFrameID, WTFMove(m_parameters.originalRequestHeaders), URL { m_parameters.request.url() }, m_parameters.sourceOrigin.copyRef(), m_parameters.preflightPolicy, m_parameters.request.httpReferrer()))
-    , m_blobFiles(connection.resolveBlobReferences(m_parameters))
 {
-    for (auto& file : m_blobFiles) {
-        if (file)
-            file->prepareForFileAccess();
-    }
-
     m_networkLoadChecker->enableContentExtensionsCheck();
     if (m_parameters.cspResponseHeaders)
@@ -86 +79 @@
         m_task->clearClient();
         m_task->cancel();
-    }
-    for (auto& file : m_blobFiles) {
-        if (file)
-            file->revokeFileAccess();
     }
 }

trunk/Source/WebKit/NetworkProcess/PingLoad.h

@@ -41 +41 @@
 class PingLoad final : public CanMakeWeakPtr<PingLoad>, private NetworkDataTaskClient {
 public:
-    PingLoad(NetworkConnectionToWebProcess&, NetworkProcess&, NetworkResourceLoadParameters&&, CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)>&&);
+    PingLoad(NetworkProcess&, NetworkResourceLoadParameters&&, CompletionHandler<void(const WebCore::ResourceError&, const WebCore::ResourceResponse&)>&&);
     
 private:
@@ -67 +67 @@
     WebCore::Timer m_timeoutTimer;
     UniqueRef<NetworkLoadChecker> m_networkLoadChecker;
-    Vector<RefPtr<WebCore::BlobDataFileReference>> m_blobFiles;
 };
 

trunk/Source/WebKit/NetworkProcess/PreconnectTask.cpp

@@ -54 +54 @@
 
     ASSERT(parameters.shouldPreconnectOnly == PreconnectOnly::Yes);
-    m_networkLoad = std::make_unique<NetworkLoad>(*this, nullptr, WTFMove(parameters), *networkSession);
+    m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters), *networkSession);
 
     m_timeoutTimer.startOneShot(60000_s);

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp

@@ -61 +61 @@
     parameters.contentEncodingSniffingPolicy = ContentEncodingSniffingPolicy::Sniff;
     parameters.request = m_originalRequest;
-    m_networkLoad = std::make_unique<NetworkLoad>(*this, nullptr, WTFMove(parameters), *cache.networkProcess().networkSession(PAL::SessionID::defaultSessionID()));
+    m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters), *cache.networkProcess().networkSession(PAL::SessionID::defaultSessionID()));
 }