Changeset 199043 in webkit

Timestamp:

Apr 4, 2016, 10:47:32 PM (11 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: Dump blobs to disk before storing them in an object store.
​https://bugs.webkit.org/show_bug.cgi?id=156068
Source/WebCore:

Reviewed by Alex Christensen.

No new tests (Under development, no observable change in behavior yet).

• WebCore.xcodeproj/project.pbxproj:
• CMakeLists.txt:

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::putOrAddOnServer):

• Modules/indexeddb/IDBValue.cpp: Copied from Source/WebCore/platform/ScopeGuard.h.

(WebCore::IDBValue::IDBValue):

• Modules/indexeddb/IDBValue.h: Copied from Source/WebCore/platform/ScopeGuard.h.

• Modules/indexeddb/client/IDBConnectionToServer.cpp:

(WebCore::IDBClient::IDBConnectionToServer::putOrAdd):

• Modules/indexeddb/client/IDBConnectionToServer.h:

• Modules/indexeddb/client/TransactionOperation.h:

• bindings/js/SerializedScriptValue.cpp:

(WebCore::SerializedScriptValue::SerializedScriptValue):
(WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):
(WebCore::SerializedScriptValue::addBlobURL): Deleted.

• bindings/js/SerializedScriptValue.h:

• platform/FileSystem.cpp:

(WebCore::appendFileContentsToFileHandle):

• platform/FileSystem.h:

• platform/ScopeGuard.h:

• platform/network/BlobRegistry.h:
• platform/network/BlobRegistryImpl.cpp:

(WebCore::blobUtilityQueue):
(WebCore::BlobRegistryImpl::writeBlobsToTemporaryFiles):

• platform/network/BlobRegistryImpl.h:

Source/WebKit2:

Reviewed by Alex Christensen.

• NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:

(WebKit::NetworkBlobRegistry::writeBlobsToTemporaryFiles):

• NetworkProcess/FileAPI/NetworkBlobRegistry.h:

• NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):

• NetworkProcess/NetworkConnectionToWebProcess.h:
• NetworkProcess/NetworkConnectionToWebProcess.messages.in:

• WebProcess/FileAPI/BlobRegistryProxy.cpp:

(WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):

• WebProcess/FileAPI/BlobRegistryProxy.h:

• WebProcess/Network/NetworkProcessConnection.cpp:

(WebKit::NetworkProcessConnection::didClose):
(WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
(WebKit::NetworkProcessConnection::didWriteBlobsToTemporaryFiles):

• WebProcess/Network/NetworkProcessConnection.h:
• WebProcess/Network/NetworkProcessConnection.messages.in:

Location:

trunk/Source

Files:

• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/indexeddb/IDBTransaction.cpp (modified) (1 diff)
• WebCore/Modules/indexeddb/IDBValue.cpp (copied) (copied from trunk/Source/WebCore/platform/ScopeGuard.h ) (1 diff)
• WebCore/Modules/indexeddb/IDBValue.h (copied) (copied from trunk/Source/WebCore/platform/ScopeGuard.h ) (1 diff)
• WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp (modified) (1 diff)
• WebCore/Modules/indexeddb/client/IDBConnectionToServer.h (modified) (1 diff)
• WebCore/Modules/indexeddb/client/TransactionOperation.h (modified) (3 diffs)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebCore/bindings/js/SerializedScriptValue.cpp (modified) (7 diffs)
• WebCore/bindings/js/SerializedScriptValue.h (modified) (4 diffs)
• WebCore/platform/FileSystem.cpp (modified) (2 diffs)
• WebCore/platform/FileSystem.h (modified) (1 diff)
• WebCore/platform/ScopeGuard.h (modified) (1 diff)
• WebCore/platform/network/BlobRegistry.h (modified) (2 diffs)
• WebCore/platform/network/BlobRegistryImpl.cpp (modified) (2 diffs)
• WebCore/platform/network/BlobRegistryImpl.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (modified) (1 diff)
• WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (modified) (2 diffs)
• WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (modified) (3 diffs)
• WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (modified) (1 diff)
• WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (modified) (1 diff)
• WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (modified) (1 diff)
• WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (modified) (1 diff)
• WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (modified) (1 diff)
• WebKit2/WebProcess/Network/NetworkProcessConnection.h (modified) (3 diffs)
• WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -851 +851 @@
     Modules/indexeddb/IDBRequestCompletionEvent.cpp
     Modules/indexeddb/IDBTransaction.cpp
+    Modules/indexeddb/IDBValue.cpp
     Modules/indexeddb/IDBVersionChangeEvent.cpp
     Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-04  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Dump blobs to disk before storing them in an object store.
+        https://bugs.webkit.org/show_bug.cgi?id=156068
+        
+        Reviewed by Alex Christensen.
+
+        No new tests (Under development, no observable change in behavior yet).
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * CMakeLists.txt:
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::putOrAddOnServer):
+        
+        * Modules/indexeddb/IDBValue.cpp: Copied from Source/WebCore/platform/ScopeGuard.h.
+        (WebCore::IDBValue::IDBValue):
+        * Modules/indexeddb/IDBValue.h: Copied from Source/WebCore/platform/ScopeGuard.h.
+        
+        * Modules/indexeddb/client/IDBConnectionToServer.cpp:
+        (WebCore::IDBClient::IDBConnectionToServer::putOrAdd):
+        * Modules/indexeddb/client/IDBConnectionToServer.h:
+        
+        * Modules/indexeddb/client/TransactionOperation.h:
+        
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::SerializedScriptValue::SerializedScriptValue):
+        (WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):
+        (WebCore::SerializedScriptValue::addBlobURL): Deleted.
+        * bindings/js/SerializedScriptValue.h:
+        
+        * platform/FileSystem.cpp:
+        (WebCore::appendFileContentsToFileHandle):
+        * platform/FileSystem.h:
+        
+        * platform/ScopeGuard.h:
+        
+        * platform/network/BlobRegistry.h:
+        * platform/network/BlobRegistryImpl.cpp:
+        (WebCore::blobUtilityQueue):
+        (WebCore::BlobRegistryImpl::writeBlobsToTemporaryFiles):
+        * platform/network/BlobRegistryImpl.h:
+
 2016-04-04  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

@@ -868 +868 @@
 
     ASSERT(!isReadOnly());
-
-    serverConnection().putOrAdd(operation, key, value, overwriteMode);
+    ASSERT(value);
+
+    RefPtr<IDBTransaction> protector(this);
+    RefPtr<IDBClient::TransactionOperation> operationRef(&operation);
+    value->writeBlobsToDiskForIndexedDB([protector, this, operationRef, key, value, overwriteMode](const IDBValue&) {
+        // FIXME: Send the passed in IDBValue to the IDB server instead of the SerializedScriptValue.
+        serverConnection().putOrAdd(*operationRef, key.get(), *value, overwriteMode);
+    });
 }
 

trunk/Source/WebCore/Modules/indexeddb/IDBValue.cpp

@@ -23 +23 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef ScopeGuard_h
-#define ScopeGuard_h
+
+#include "config.h"
+#include "IDBValue.h"
+
+#if ENABLE(INDEXED_DATABASE)
 
 namespace WebCore {
 
-class ScopeGuard {
-public:
-    ScopeGuard()
-    {
-    }
-
-    ScopeGuard(std::function<void()> function)
-        : m_function(WTFMove(function))
-    {
-    }
-
-    ~ScopeGuard()
-    {
-        if (m_function)
-            m_function();
-    }
-
-    void enable(std::function<void()> function)
-    {
-        m_function = WTFMove(function);
-    }
-
-    void disable()
-    {
-        m_function = nullptr;
-    }
-
-private:
-    std::function<void()> m_function { nullptr };
-};
+IDBValue::IDBValue()
+{
+}
 
 } // namespace WebCore
 
-#endif // ScopeGuard_h
+#endif // ENABLE(INDEXED_DATABASE)

trunk/Source/WebCore/Modules/indexeddb/IDBValue.h

@@ -23 +23 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef ScopeGuard_h
-#define ScopeGuard_h
+
+#pragma once
+#if ENABLE(INDEXED_DATABASE)
 
 namespace WebCore {
 
-class ScopeGuard {
+class IDBValue {
 public:
-    ScopeGuard()
-    {
-    }
-
-    ScopeGuard(std::function<void()> function)
-        : m_function(WTFMove(function))
-    {
-    }
-
-    ~ScopeGuard()
-    {
-        if (m_function)
-            m_function();
-    }
-
-    void enable(std::function<void()> function)
-    {
-        m_function = WTFMove(function);
-    }
-
-    void disable()
-    {
-        m_function = nullptr;
-    }
-
-private:
-    std::function<void()> m_function { nullptr };
+    IDBValue();
 };
 
 } // namespace WebCore
 
-#endif // ScopeGuard_h
+#endif // ENABLE(INDEXED_DATABASE)

trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.cpp

@@ -172 +172 @@
 }
 
-void IDBConnectionToServer::putOrAdd(TransactionOperation& operation, RefPtr<IDBKey>& key, RefPtr<SerializedScriptValue>& value, const IndexedDB::ObjectStoreOverwriteMode overwriteMode)
+void IDBConnectionToServer::putOrAdd(TransactionOperation& operation, IDBKey* key, SerializedScriptValue& value, const IndexedDB::ObjectStoreOverwriteMode overwriteMode)
 {
     LOG(IndexedDB, "IDBConnectionToServer::putOrAdd");
 
     saveOperation(operation);
-    m_delegate->putOrAdd(IDBRequestData(operation), key.get(), *value, overwriteMode);
+    m_delegate->putOrAdd(IDBRequestData(operation), key, value, overwriteMode);
 }
 

trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionToServer.h

@@ -78 +78 @@
     WEBCORE_EXPORT void didDeleteIndex(const IDBResultData&);
 
-    void putOrAdd(TransactionOperation&, RefPtr<IDBKey>&, RefPtr<SerializedScriptValue>&, const IndexedDB::ObjectStoreOverwriteMode);
+    void putOrAdd(TransactionOperation&, IDBKey*, SerializedScriptValue&, const IndexedDB::ObjectStoreOverwriteMode);
     WEBCORE_EXPORT void didPutOrAdd(const IDBResultData&);
 

trunk/Source/WebCore/Modules/indexeddb/client/TransactionOperation.h

@@ -43 +43 @@
 namespace IDBClient {
 
-class TransactionOperation : public RefCounted<TransactionOperation> {
+class TransactionOperation : public ThreadSafeRefCounted<TransactionOperation> {
 public:
     void perform()
@@ -93 +93 @@
         : TransactionOperation(transaction)
     {
-        relaxAdoptionRequirement();
         RefPtr<TransactionOperation> self(this);
 
@@ -112 +111 @@
         : TransactionOperation(transaction, request)
     {
-        relaxAdoptionRequirement();
         RefPtr<TransactionOperation> self(this);
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -2046 +2046 @@
                 516071321BD8308B00DBC4F2 /* TransactionOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160712B1BD8305300DBC4F2 /* TransactionOperation.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 5160F4980B0AA75F00C1D2AF /* HistoryItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */; };
+                516103AF1CADBA770016B4C7 /* IDBValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 516103AE1CADB9A30016B4C7 /* IDBValue.h */; };
+                516103B01CADBA7A0016B4C7 /* IDBValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516103AD1CADB9A30016B4C7 /* IDBValue.cpp */; };
                 5162C7F411F77EFB00612EFE /* SchemeRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5162C7F211F77EFA00612EFE /* SchemeRegistry.cpp */; };
                 5162C7F511F77EFB00612EFE /* SchemeRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 5162C7F311F77EFB00612EFE /* SchemeRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -9596 +9598 @@
                 5160712D1BD8307200DBC4F2 /* IDBObjectStoreInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBObjectStoreInfo.h; sourceTree = "<group>"; };
                 5160F4970B0AA75F00C1D2AF /* HistoryItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HistoryItemMac.mm; sourceTree = "<group>"; };
+                516103AD1CADB9A30016B4C7 /* IDBValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBValue.cpp; sourceTree = "<group>"; };
+                516103AE1CADB9A30016B4C7 /* IDBValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBValue.h; sourceTree = "<group>"; };
                 5162C7F211F77EFA00612EFE /* SchemeRegistry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchemeRegistry.cpp; sourceTree = "<group>"; };
                 5162C7F311F77EFB00612EFE /* SchemeRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SchemeRegistry.h; sourceTree = "<group>"; };
@@ -19587 +19591 @@
                                 51645B511B9F889B00F789CE /* IDBTransaction.h */,
                                 51D719A6181106E00016DC51 /* IDBTransaction.idl */,
+                                516103AD1CADB9A30016B4C7 /* IDBValue.cpp */,
+                                516103AE1CADB9A30016B4C7 /* IDBValue.h */,
                                 51645B521B9F889B00F789CE /* IDBVersionChangeEvent.cpp */,
                                 51645B531B9F889B00F789CE /* IDBVersionChangeEvent.h */,
@@ -25993 +25999 @@
                                 2E75841E12779ADA0062628B /* FileReaderLoader.h in Headers */,
                                 2E75841F12779ADA0062628B /* FileReaderLoaderClient.h in Headers */,
+                                516103AF1CADBA770016B4C7 /* IDBValue.h in Headers */,
                                 2EDF369D122C94B4002F7D4E /* FileReaderSync.h in Headers */,
                                 2EF1BFEB121C9F4200C27627 /* FileStream.h in Headers */,
@@ -31787 +31794 @@
                                 B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
                                 9759E93F14EF1CF80026A2DD /* TextTrack.cpp in Sources */,
+                                516103B01CADBA7A0016B4C7 /* IDBValue.cpp in Sources */,
                                 9759E94214EF1CF80026A2DD /* TextTrackCue.cpp in Sources */,
                                 071A9EC2168FBC43002629F9 /* TextTrackCueGeneric.cpp in Sources */,

trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2013, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
 
 #include "Blob.h"
+#include "BlobRegistry.h"
 #include "CryptoKeyAES.h"
 #include "CryptoKeyDataOctetSequence.h"
@@ -37 +38 @@
 #include "File.h"
 #include "FileList.h"
+#include "IDBValue.h"
 #include "ImageData.h"
 #include "JSBlob.h"
@@ -76 +78 @@
 #include <runtime/TypedArrays.h>
 #include <wtf/HashTraits.h>
+#include <wtf/MainThread.h>
 #include <wtf/Vector.h>
 
@@ -2583 +2586 @@
 }
 
-void SerializedScriptValue::addBlobURL(const String& string)
-{
-    m_blobURLs.append(Vector<uint16_t>());
-    m_blobURLs.last().reserveCapacity(string.length());
-    for (size_t i = 0; i < string.length(); i++)
-        m_blobURLs.last().append(string.characterAt(i));
-    m_blobURLs.last().resize(m_blobURLs.last().size());
-}
-
 SerializedScriptValue::~SerializedScriptValue()
 {
@@ -2601 +2595 @@
 }
 
-SerializedScriptValue::SerializedScriptValue(Vector<uint8_t>&& buffer, const Vector<String>& blobURLs)
-    : m_data(WTFMove(buffer))
-{
-    for (auto& string : blobURLs)
-        addBlobURL(string);
-}
-
 SerializedScriptValue::SerializedScriptValue(Vector<uint8_t>&& buffer, const Vector<String>& blobURLs, std::unique_ptr<ArrayBufferContentsArray>&& arrayBufferContentsArray)
     : m_data(WTFMove(buffer))
     , m_arrayBufferContentsArray(WTFMove(arrayBufferContentsArray))
 {
-    for (auto& string : blobURLs)
-        addBlobURL(string);
+    // Since this SerializedScriptValue is meant to be passed between threads, its String data members
+    // need to be isolatedCopies so we don't run into thread safety issues for the StringImpls.
+    m_blobURLs.reserveInitialCapacity(blobURLs.size());
+    for (auto& url : blobURLs)
+        m_blobURLs.append(url.isolatedCopy());
 }
 
@@ -2758 +2748 @@
 }
 
+void SerializedScriptValue::writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler)
+{
+    ASSERT(isMainThread());
+
+    if (m_blobURLs.isEmpty()) {
+        completionHandler({ });
+        return;
+    }
+
+    RefPtr<SerializedScriptValue> protector(this);
+    blobRegistry().writeBlobsToTemporaryFiles(m_blobURLs, [completionHandler, this, protector](const Vector<String>&) {
+        // FIXME: Return an IDBValue that contains both the SerializedScriptValue data and all blob file data.
+        completionHandler({ });
+    });
 }
+
+} // namespace WebCore

trunk/Source/WebCore/bindings/js/SerializedScriptValue.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2009, 2013, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42 +42 @@
 namespace WebCore {
 
+class IDBValue;
 class MessagePort;
 typedef Vector<RefPtr<MessagePort>, 1> MessagePortArray;
@@ -84 +85 @@
     const Vector<uint8_t>& data() const { return m_data; }
     bool hasBlobURLs() const { return !m_blobURLs.isEmpty(); }
-    void blobURLs(Vector<String>&) const;
+    void writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler);
 
     static Ref<SerializedScriptValue> createFromWireBytes(Vector<uint8_t>&& data)
@@ -99 +100 @@
     static bool serializationDidCompleteSuccessfully(SerializationReturnCode);
     static std::unique_ptr<ArrayBufferContentsArray> transferArrayBuffers(JSC::ExecState*, ArrayBufferArray&, SerializationReturnCode&);
-    void addBlobURL(const String&);
 
     WEBCORE_EXPORT SerializedScriptValue(Vector<unsigned char>&&);
-    SerializedScriptValue(Vector<unsigned char>&&, const Vector<String>& blobURLs);
     SerializedScriptValue(Vector<unsigned char>&&, const Vector<String>& blobURLs, std::unique_ptr<ArrayBufferContentsArray>&&);
 
     Vector<unsigned char> m_data;
     std::unique_ptr<ArrayBufferContentsArray> m_arrayBufferContentsArray;
-    Vector<Vector<uint16_t>> m_blobURLs;
+
+    Vector<String> m_blobURLs;
 };
 

trunk/Source/WebCore/platform/FileSystem.cpp

@@ -28 +28 @@
 #include "FileSystem.h"
 
+#include "ScopeGuard.h"
 #include <wtf/HexNumber.h>
 #include <wtf/text/CString.h>
@@ -130 +131 @@
 }
 
+bool appendFileContentsToFileHandle(const String& path, PlatformFileHandle& target)
+{
+    auto source = openFile(path, OpenForRead);
+
+    if (!isHandleValid(source))
+        return false;
+
+    static int bufferSize = 1 << 19;
+    Vector<char> buffer(bufferSize);
+
+    ScopeGuard fileCloser([source]() {
+        PlatformFileHandle handle = source;
+        closeFile(handle);
+    });
+
+    do {
+        int readBytes = readFromFile(source, buffer.data(), bufferSize);
+        
+        if (readBytes < 0)
+            return false;
+
+        if (writeToFile(target, buffer.data(), readBytes) != readBytes)
+            return false;
+
+        if (readBytes < bufferSize)
+            return true;
+    } while (true);
+
+    ASSERT_NOT_REACHED();
+}
+
 #if !PLATFORM(MAC)
 

trunk/Source/WebCore/platform/FileSystem.h

@@ -177 +177 @@
 // Returns number of bytes actually written if successful, -1 otherwise.
 int readFromFile(PlatformFileHandle, char* data, int length);
+
+// Appends the contents of the file found at 'path' to the open PlatformFileHandle.
+// Returns true if the write was successful, false if it was not.
+bool appendFileContentsToFileHandle(const String& path, PlatformFileHandle&);
+
 #if USE(FILE_LOCK)
 bool lockFile(PlatformFileHandle, FileLockMode);

trunk/Source/WebCore/platform/ScopeGuard.h

@@ -25 +25 @@
 #ifndef ScopeGuard_h
 #define ScopeGuard_h
+
+#include <functional>
 
 namespace WebCore {

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

@@ -32 +32 @@
 #define BlobRegistry_h
 
+#include <functional>
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
@@ -64 +65 @@
     virtual unsigned long long blobSize(const URL&) = 0;
 
+    virtual void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) = 0;
+
     virtual bool isBlobRegistryImpl() const { return false; }
 

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

@@ -42 +42 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
+#include "ScopeGuard.h"
 #include <wtf/MainThread.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
+#include <wtf/WorkQueue.h>
 
 namespace WebCore {
@@ -229 +232 @@
 }
 
+static WorkQueue& blobUtilityQueue()
+{
+    static NeverDestroyed<Ref<WorkQueue>> queue(WorkQueue::create("org.webkit.BlobUtility", WorkQueue::Type::Serial, WorkQueue::QOS::Background));
+    return queue.get();
+}
+
+struct BlobForFileWriting {
+    String blobURL;
+    Vector<std::pair<String, ThreadSafeDataBuffer>> filePathsOrDataBuffers;
+};
+
+void BlobRegistryImpl::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
+{
+    Vector<BlobForFileWriting> blobsForWriting;
+    for (auto& url : blobURLs) {
+        blobsForWriting.append({ });
+        blobsForWriting.last().blobURL = url.isolatedCopy();
+
+        auto* blobData = getBlobDataFromURL({ ParsedURLString, url });
+        if (!blobData) {
+            Vector<String> filePaths;
+            completionHandler(filePaths);
+        }
+
+        for (auto& item : blobData->items()) {
+            switch (item.type()) {
+            case BlobDataItem::Type::Data:
+                blobsForWriting.last().filePathsOrDataBuffers.append({ { }, item.data() });
+                break;
+            case BlobDataItem::Type::File:
+                blobsForWriting.last().filePathsOrDataBuffers.append({ item.file()->path().isolatedCopy(), { } });
+
+            }
+        }
+    }
+
+    blobUtilityQueue().dispatch([blobsForWriting, completionHandler]() {
+        Vector<String> filePaths;
+
+        ScopeGuard completionCaller([completionHandler]() {
+            callOnMainThread([completionHandler]() {
+                Vector<String> filePaths;
+                completionHandler(filePaths);
+            });
+        });
+
+        for (auto& blob : blobsForWriting) {
+            PlatformFileHandle file;
+            String tempFilePath = openTemporaryFile(ASCIILiteral("Blob"), file);
+
+            ScopeGuard fileCloser([file, completionHandler]() {
+                PlatformFileHandle handle = file;
+                closeFile(handle);
+            });
+            
+            if (tempFilePath.isEmpty() || !isHandleValid(file)) {
+                LOG_ERROR("Failed to open temporary file for writing a Blob to IndexedDB");
+                return;
+            }
+
+            for (auto& part : blob.filePathsOrDataBuffers) {
+                if (part.second.data()) {
+                    int length = part.second.data()->size();
+                    if (writeToFile(file, reinterpret_cast<const char*>(part.second.data()->data()), length) != length) {
+                        LOG_ERROR("Failed writing a Blob to temporary file for storage in IndexedDB");
+                        return;
+                    }
+                } else {
+                    ASSERT(!part.first.isEmpty());
+                    if (!appendFileContentsToFileHandle(part.first, file)) {
+                        LOG_ERROR("Failed copying File contents to a Blob temporary file for storage in IndexedDB");
+                        return;
+                    }
+                }
+            }
+
+            filePaths.append(tempFilePath.isolatedCopy());
+        }
+
+        completionCaller.disable();
+        callOnMainThread([completionHandler, filePaths]() {
+            completionHandler(filePaths);
+        });
+    });
+}
+
 } // namespace WebCore

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

@@ -68 +68 @@
     unsigned long long blobSize(const URL&) override;
 
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
+
     HashMap<String, RefPtr<BlobData>> m_blobs;
 };

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-04-04  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Dump blobs to disk before storing them in an object store.
+        https://bugs.webkit.org/show_bug.cgi?id=156068
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+        (WebKit::NetworkBlobRegistry::writeBlobsToTemporaryFiles):
+        * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+
+        * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+        (WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):
+        * WebProcess/FileAPI/BlobRegistryProxy.h:
+
+        * WebProcess/Network/NetworkProcessConnection.cpp:
+        (WebKit::NetworkProcessConnection::didClose):
+        (WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
+        (WebKit::NetworkProcessConnection::didWriteBlobsToTemporaryFiles):
+        * WebProcess/Network/NetworkProcessConnection.h:
+        * WebProcess/Network/NetworkProcessConnection.messages.in:
+
 2016-04-04  Chelsea Pugh  <cpugh@apple.com>
 

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

@@ -118 +118 @@
 }
 
+void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler)
+{
+    blobRegistry().writeBlobsToTemporaryFiles(blobURLs, completionHandler);
+}
+
 void NetworkBlobRegistry::connectionToWebProcessDidClose(NetworkConnectionToWebProcess* connection)
 {

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

@@ -28 +28 @@
 
 #include <WebCore/URLHash.h>
+#include <functional>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -53 +54 @@
     void unregisterBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&);
     uint64_t blobSize(NetworkConnectionToWebProcess*, const WebCore::URL&);
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler);
 
     void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*);

trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

@@ -31 +31 @@
 #include "NetworkLoad.h"
 #include "NetworkProcess.h"
+#include "NetworkProcessConnectionMessages.h"
 #include "NetworkResourceLoadParameters.h"
 #include "NetworkResourceLoader.h"
@@ -36 +37 @@
 #include "RemoteNetworkingContext.h"
 #include "SessionTracker.h"
+#include "WebCoreArgumentCoders.h"
 #include <WebCore/NotImplemented.h>
 #include <WebCore/PingHandle.h>
@@ -280 +282 @@
 }
 
+void NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, uint64_t requestIdentifier)
+{
+    RefPtr<NetworkConnectionToWebProcess> protector(this);
+
+    Vector<RefPtr<WebCore::BlobDataFileReference>> fileReferences;
+    for (auto& url : blobURLs)
+        fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(*this, { ParsedURLString, url }));
+
+    for (auto& file : fileReferences)
+        file->prepareForFileAccess();
+
+    NetworkBlobRegistry::singleton().writeBlobsToTemporaryFiles(blobURLs, [this, protector, requestIdentifier, fileReferences](const Vector<String>& fileNames) {
+        for (auto& file : fileReferences)
+            file->revokeFileAccess();
+
+        if (!m_connection || !m_connection->isValid())
+            return;
+
+        m_connection->send(Messages::NetworkProcessConnection::DidWriteBlobsToTemporaryFiles(requestIdentifier, fileNames), 0);
+    });
+}
+
 void NetworkConnectionToWebProcess::ensureLegacyPrivateBrowsingSession()
 {

trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h

@@ -94 +94 @@
     void blobSize(const WebCore::URL&, uint64_t& resultSize);
     void unregisterBlobURL(const WebCore::URL&);
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, uint64_t requestIdentifier);
+
     void ensureLegacyPrivateBrowsingSession();
 

trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in

@@ -46 +46 @@
     UnregisterBlobURL(WebCore::URL url)
     BlobSize(WebCore::URL url) -> (uint64_t resultSize)
+    WriteBlobsToTemporaryFiles(Vector<String> blobURLs, uint64_t requestIdentifier)
+
     EnsureLegacyPrivateBrowsingSession()
 }

trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp

@@ -76 +76 @@
 }
 
+void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
+{
+    WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, completionHandler);
 }
+
+}

trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h

@@ -39 +39 @@
     void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, long long start, long long end) override;
     unsigned long long blobSize(const WebCore::URL&) override;
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
 };
 

trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp

@@ -73 +73 @@
     // The NetworkProcess probably crashed.
     WebProcess::singleton().networkProcessConnectionClosed(this);
+
+    Vector<String> dummyFilenames;
+    for (auto handler : m_writeBlobToFileCompletionHandlers.values())
+        handler(dummyFilenames);
+
+    m_writeBlobToFileCompletionHandlers.clear();
 }
 
 void NetworkProcessConnection::didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference, IPC::StringReference)
 {
+}
+
+void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
+{
+    static uint64_t writeBlobToFileIdentifier;
+    uint64_t requestIdentifier = ++writeBlobToFileIdentifier;
+
+    m_writeBlobToFileCompletionHandlers.set(requestIdentifier, completionHandler);
+
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs, requestIdentifier), 0);
+}
+
+void NetworkProcessConnection::didWriteBlobsToTemporaryFiles(uint64_t requestIdentifier, const Vector<String>& filenames)
+{
+    auto handler = m_writeBlobToFileCompletionHandlers.take(requestIdentifier);
+    if (handler)
+        handler(filenames);
 }
 

trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h

@@ -59 +59 @@
     void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
 
+    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler);
+
 private:
     NetworkProcessConnection(IPC::Connection::Identifier);
@@ -70 +72 @@
     IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::Network; }
 
+    void didWriteBlobsToTemporaryFiles(uint64_t requestIdentifier, const Vector<String>& filenames);
+
 #if ENABLE(SHAREABLE_RESOURCE)
     // Message handlers.
@@ -77 +81 @@
     // The connection from the web process to the network process.
     RefPtr<IPC::Connection> m_connection;
+
+    HashMap<uint64_t, std::function<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
 };
 

trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in

@@ -27 +27 @@
 #endif
 
+    DidWriteBlobsToTemporaryFiles(uint64_t requestIdentifier, Vector<String> filenames)
 }