Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 27 insertions, 14 deletions

diff --git a/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp b/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp
index d5f8cf5bb..f78c990d1 100644
--- a/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp
+++ b/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp
@@ -26,40 +26,53 @@
 #include "config.h"
 #include "BlobRegistryProxy.h"
 
-#if ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
-
-#include "BlobRegistrationData.h"
 #include "NetworkConnectionToWebProcessMessages.h"
 #include "NetworkProcessConnection.h"
 #include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
-#include <WebCore/BlobData.h>
+#include <WebCore/BlobDataFileReference.h>
 
 using namespace WebCore;
 
 namespace WebKit {
 
-void BlobRegistryProxy::registerBlobURL(const KURL& url, PassOwnPtr<BlobData> blobData)
+void BlobRegistryProxy::registerFileBlobURL(const WebCore::URL& url, RefPtr<BlobDataFileReference>&& file, const String& contentType)
 {
-    ASSERT(WebProcess::shared().usesNetworkProcess());
+    SandboxExtension::Handle extensionHandle;
+
+    // File path can be empty when submitting a form file input without a file, see bug 111778.
+    if (!file->path().isEmpty())
+        SandboxExtension::createHandle(file->path(), SandboxExtension::ReadOnly, extensionHandle);
 
-    WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, BlobRegistrationData(blobData)), 0);
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, file->path(), extensionHandle, contentType), 0);
 }
 
-void BlobRegistryProxy::registerBlobURL(const KURL& url, const KURL& srcURL)
+void BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
 {
-    ASSERT(WebProcess::shared().usesNetworkProcess());
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
+}
 
-    WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
+void BlobRegistryProxy::registerBlobURL(const URL& url, const URL& srcURL)
+{
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
 }
 
-void BlobRegistryProxy::unregisterBlobURL(const KURL& url)
+void BlobRegistryProxy::unregisterBlobURL(const URL& url)
 {
-    ASSERT(WebProcess::shared().usesNetworkProcess());
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
+}
 
-    WebProcess::shared().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
+void BlobRegistryProxy::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
+{
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
 }
 
+unsigned long long BlobRegistryProxy::blobSize(const URL& url)
+{
+    uint64_t resultSize;
+    if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
+        return 0;
+    return resultSize;
 }
 
-#endif // ENABLE(BLOB) && ENABLE(NETWORK_PROCESS)
+}