Title: [206439] trunk
Revision
206439
Author
[email protected]
Date
2016-09-27 09:58:41 -0700 (Tue, 27 Sep 2016)

Log Message

[WK2] Navigating to a Blob URL does not trigger a download
https://bugs.webkit.org/show_bug.cgi?id=162574

Reviewed by Darin Adler.

Source/WebKit2:

Add support for converting Blob URL loads into downloads.

* NetworkProcess/Downloads/BlobDownloadClient.cpp:
(WebKit::BlobDownloadClient::didReceiveResponseAsync):
Make sure we return a valid suggested filename because the client side (Safari)
does not deal with empty suggested filenames. Use "unknown" by default to
match the default suggested filename of non-Blob downloads.

* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::startWithHandle):
* NetworkProcess/Downloads/Download.h:
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::convertHandleToDownload):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/Downloads/ios/DownloadIOS.mm:
(WebKit::Download::startNetworkLoadWithHandle):
* NetworkProcess/Downloads/mac/DownloadMac.mm:
(WebKit::Download::startNetworkLoadWithHandle):
* NetworkProcess/Downloads/soup/DownloadSoup.cpp:
(WebKit::Download::startNetworkLoadWithHandle):
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
* NetworkProcess/NetworkLoad.h:
(WebKit::NetworkLoad::handle):

Tools:

Add API that tests navigating to a Blob URL and checks that that the load
properly gets converted into a download.

* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
(-[BlobDownloadDelegate _downloadDidStart:]):
(-[BlobDownloadDelegate _download:didReceiveResponse:]):
(-[BlobDownloadDelegate _download:didReceiveData:]):
(-[BlobDownloadDelegate _download:decideDestinationWithSuggestedFilename:allowOverwrite:]):
(-[BlobDownloadDelegate _downloadDidFinish:]):
(-[DownloadBlobURLNavigationDelegate webView:decidePolicyForNavigationAction:decisionHandler:]):
(TEST):
* TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html: Added.

LayoutTests:

Rebaseline now that the suggested download name is "unknown" by default
for blob downloads as well.

* fast/dom/HTMLAnchorElement/anchor-download-expected.txt:
* fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt:

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (206438 => 206439)


--- trunk/LayoutTests/ChangeLog	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/LayoutTests/ChangeLog	2016-09-27 16:58:41 UTC (rev 206439)
@@ -1,3 +1,16 @@
+2016-09-27  Chris Dumez  <[email protected]>
+
+        [WK2] Navigating to a Blob URL does not trigger a download
+        https://bugs.webkit.org/show_bug.cgi?id=162574
+
+        Reviewed by Darin Adler.
+
+        Rebaseline now that the suggested download name is "unknown" by default
+        for blob downloads as well.
+
+        * fast/dom/HTMLAnchorElement/anchor-download-expected.txt:
+        * fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt:
+
 2016-09-27  Myles C. Maxfield  <[email protected]>
 
         REGRESSION(r205883): Letterpressed text is invisible

Modified: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-download-expected.txt (206438 => 206439)


--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-download-expected.txt	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-download-expected.txt	2016-09-27 16:58:41 UTC (rev 206439)
@@ -1,4 +1,4 @@
 Download started.
-Downloading URL with suggested filename ""
+Downloading URL with suggested filename "unknown"
 Download completed.
 Blob URL

Modified: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt (206438 => 206439)


--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-nodownload-set-expected.txt	2016-09-27 16:58:41 UTC (rev 206439)
@@ -1,4 +1,4 @@
 Download started.
-Downloading URL with suggested filename ""
+Downloading URL with suggested filename "unknown"
 Download completed.
 Blob URL

Modified: trunk/Source/WebKit2/ChangeLog (206438 => 206439)


--- trunk/Source/WebKit2/ChangeLog	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/ChangeLog	2016-09-27 16:58:41 UTC (rev 206439)
@@ -1,3 +1,35 @@
+2016-09-27  Chris Dumez  <[email protected]>
+
+        [WK2] Navigating to a Blob URL does not trigger a download
+        https://bugs.webkit.org/show_bug.cgi?id=162574
+
+        Reviewed by Darin Adler.
+
+        Add support for converting Blob URL loads into downloads.
+
+        * NetworkProcess/Downloads/BlobDownloadClient.cpp:
+        (WebKit::BlobDownloadClient::didReceiveResponseAsync):
+        Make sure we return a valid suggested filename because the client side (Safari)
+        does not deal with empty suggested filenames. Use "unknown" by default to
+        match the default suggested filename of non-Blob downloads.
+
+        * NetworkProcess/Downloads/Download.cpp:
+        (WebKit::Download::startWithHandle):
+        * NetworkProcess/Downloads/Download.h:
+        * NetworkProcess/Downloads/DownloadManager.cpp:
+        (WebKit::DownloadManager::convertHandleToDownload):
+        * NetworkProcess/Downloads/DownloadManager.h:
+        * NetworkProcess/Downloads/ios/DownloadIOS.mm:
+        (WebKit::Download::startNetworkLoadWithHandle):
+        * NetworkProcess/Downloads/mac/DownloadMac.mm:
+        (WebKit::Download::startNetworkLoadWithHandle):
+        * NetworkProcess/Downloads/soup/DownloadSoup.cpp:
+        (WebKit::Download::startNetworkLoadWithHandle):
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::convertMainResourceLoadToDownload):
+        * NetworkProcess/NetworkLoad.h:
+        (WebKit::NetworkLoad::handle):
+
 2016-09-27  Michael Catanzaro  <[email protected]>
 
         [GTK] Unreviewed typo fix

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/BlobDownloadClient.cpp	2016-09-27 16:58:41 UTC (rev 206439)
@@ -44,7 +44,7 @@
 void BlobDownloadClient::didReceiveResponseAsync(ResourceHandle*, ResourceResponse&& response)
 {
     m_download.didReceiveResponse(WTFMove(response));
-    m_download.decideDestinationWithSuggestedFilenameAsync(m_download.suggestedName());
+    m_download.decideDestinationWithSuggestedFilenameAsync(m_download.suggestedName().isEmpty() ? "unknown" : m_download.suggestedName());
 }
 
 void BlobDownloadClient::didDecideDownloadDestination(const String& destinationPath, bool allowOverwrite)

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp	2016-09-27 16:58:41 UTC (rev 206439)
@@ -97,6 +97,24 @@
 #endif
 }
 
+void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
+{
+    if (m_request.url().protocolIsBlob()) {
+        m_downloadClient = std::make_unique<BlobDownloadClient>(*this);
+        m_resourceHandle = ResourceHandle::create(nullptr, m_request, m_downloadClient.get(), false, false);
+        didStart();
+        return;
+    }
+
+#if USE(NETWORK_SESSION)
+    UNUSED_PARAM(handle);
+    UNUSED_PARAM(response);
+    ASSERT_NOT_REACHED();
+#else
+    startNetworkLoadWithHandle(handle, response);
+#endif
+}
+
 void Download::cancel()
 {
     if (m_request.url().protocolIsBlob()) {

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h	2016-09-27 16:58:41 UTC (rev 206439)
@@ -80,10 +80,7 @@
     ~Download();
 
     void start();
-
-#if !USE(NETWORK_SESSION)
     void startWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
-#endif
     void resume(const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);
     void cancel();
 
@@ -119,6 +116,7 @@
 
 #if !USE(NETWORK_SESSION)
     void startNetworkLoad();
+    void startNetworkLoadWithHandle(WebCore::ResourceHandle*, const WebCore::ResourceResponse&);
 #endif
     void cancelNetworkLoad();
 

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp	2016-09-27 16:58:41 UTC (rev 206439)
@@ -105,7 +105,8 @@
     auto addResult = m_downloadsWaitingForDestination.set(downloadID, std::make_pair<RefPtr<NetworkDataTask>, ResponseCompletionHandler>(&networkDataTask, WTFMove(completionHandler)));
     ASSERT_UNUSED(addResult, addResult.isNewEntry);
 }
-#else
+#endif
+
 void DownloadManager::convertHandleToDownload(DownloadID downloadID, ResourceHandle* handle, const ResourceRequest& request, const ResourceResponse& response)
 {
     auto download = std::make_unique<Download>(*this, downloadID, request);
@@ -114,7 +115,6 @@
     ASSERT(!m_downloads.contains(downloadID));
     m_downloads.add(downloadID, WTFMove(download));
 }
-#endif
 
 void DownloadManager::continueDecidePendingDownloadDestination(DownloadID downloadID, String destination, const SandboxExtension::Handle& sandboxExtensionHandle, bool allowOverwrite)
 {

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h	2016-09-27 16:58:41 UTC (rev 206439)
@@ -36,9 +36,7 @@
 #include <wtf/Noncopyable.h>
 
 namespace WebCore {
-#if !USE(NETWORK_SESSION)
 class ResourceHandle;
-#endif
 class ResourceRequest;
 class ResourceResponse;
 class SessionID;
@@ -80,9 +78,8 @@
     void continueCanAuthenticateAgainstProtectionSpace(DownloadID, bool canAuthenticate);
     void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
     void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler&&);
-#else
+#endif
     void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
-#endif
     void continueDecidePendingDownloadDestination(DownloadID, String destination, const SandboxExtension::Handle&, bool allowOverwrite);
 
     void resumeDownload(WebCore::SessionID, DownloadID, const IPC::DataReference& resumeData, const String& path, const SandboxExtension::Handle&);

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm	2016-09-27 16:58:41 UTC (rev 206439)
@@ -132,7 +132,7 @@
     notImplemented();
 }
 
-void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
+void Download::startNetworkLoadWithHandle(ResourceHandle* handle, const ResourceResponse& response)
 {
     CFURLDownloadClient client;
     setUpDownloadClient(client, *this);

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm	2016-09-27 16:58:41 UTC (rev 206439)
@@ -64,7 +64,7 @@
     [m_nsURLDownload setDeletesFileUponFailure:NO];
 }
 
-void Download::startWithHandle(ResourceHandle* handle, const ResourceResponse& response)
+void Download::startNetworkLoadWithHandle(ResourceHandle* handle, const ResourceResponse& response)
 {
     ASSERT(!m_nsURLDownload);
     ASSERT(!m_delegate);

Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp	2016-09-27 16:58:41 UTC (rev 206439)
@@ -216,7 +216,7 @@
     didStart();
 }
 
-void Download::startWithHandle(ResourceHandle* resourceHandle, const ResourceResponse& response)
+void Download::startNetworkLoadWithHandle(ResourceHandle* resourceHandle, const ResourceResponse& response)
 {
     ASSERT(!m_downloadClient);
     ASSERT(!m_resourceHandle);

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp	2016-09-27 16:58:41 UTC (rev 206439)
@@ -207,14 +207,17 @@
     }
 
 #if USE(NETWORK_SESSION)
-    loader->networkLoad()->convertTaskToDownload(downloadID, request, response);
-#else
+    if (!request.url().protocolIsBlob()) {
+        loader->networkLoad()->convertTaskToDownload(downloadID, request, response);
+        loader->didConvertToDownload();
+        return;
+    }
+#endif
     networkProcess.downloadManager().convertHandleToDownload(downloadID, loader->networkLoad()->handle(), request, response);
 
     // Unblock the URL connection operation queue.
     loader->networkLoad()->handle()->continueDidReceiveResponse();
-    
-#endif
+
     loader->didConvertToDownload();
 }
 

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (206438 => 206439)


--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h	2016-09-27 16:58:41 UTC (rev 206439)
@@ -116,9 +116,7 @@
     void continueCanAuthenticateAgainstProtectionSpace(bool);
 #endif
 
-#if !USE(NETWORK_SESSION)
     WebCore::ResourceHandle* handle() const { return m_handle.get(); }
-#endif
 
 private:
     NetworkLoadClient::ShouldContinueDidReceiveResponse sharedDidReceiveResponse(WebCore::ResourceResponse&&);

Modified: trunk/Tools/ChangeLog (206438 => 206439)


--- trunk/Tools/ChangeLog	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Tools/ChangeLog	2016-09-27 16:58:41 UTC (rev 206439)
@@ -1,3 +1,24 @@
+2016-09-27  Chris Dumez  <[email protected]>
+
+        [WK2] Navigating to a Blob URL does not trigger a download
+        https://bugs.webkit.org/show_bug.cgi?id=162574
+
+        Reviewed by Darin Adler.
+
+        Add API that tests navigating to a Blob URL and checks that that the load
+        properly gets converted into a download.
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm:
+        (-[BlobDownloadDelegate _downloadDidStart:]):
+        (-[BlobDownloadDelegate _download:didReceiveResponse:]):
+        (-[BlobDownloadDelegate _download:didReceiveData:]):
+        (-[BlobDownloadDelegate _download:decideDestinationWithSuggestedFilename:allowOverwrite:]):
+        (-[BlobDownloadDelegate _downloadDidFinish:]):
+        (-[DownloadBlobURLNavigationDelegate webView:decidePolicyForNavigationAction:decisionHandler:]):
+        (TEST):
+        * TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html: Added.
+
 2016-09-27  Michael Catanzaro  <[email protected]>
 
         [GTK] Install binaries to pkglibexecdir rather than bindir

Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (206438 => 206439)


--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2016-09-27 16:58:41 UTC (rev 206439)
@@ -396,6 +396,7 @@
 		7CEFA9661AC0B9E200B910FD /* _WKUserContentExtensionStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */; };
 		7CFBCAE51743238F00B2BFCF /* WillLoad_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */; };
 		835CF9671D25FCD6001A65D4 /* RestoreSessionStateWithoutNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 835CF9661D25FCD6001A65D4 /* RestoreSessionStateWithoutNavigation.cpp */; };
+		837A35F11D9A1E7D00663C57 /* DownloadRequestBlobURL.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 837A35F01D9A1E6400663C57 /* DownloadRequestBlobURL.html */; };
 		83CF1C301C4F1B8B00688447 /* StringUtilities.mm in Sources */ = {isa = PBXBuildFile; fileRef = 83CF1C2C1C4F19AE00688447 /* StringUtilities.mm */; };
 		930AD402150698D00067970F /* lots-of-text.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 930AD401150698B30067970F /* lots-of-text.html */; };
 		932AE53D1D371047005DFFAF /* focus-inputs.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93575C551D30366E000D604D /* focus-inputs.html */; };
@@ -546,6 +547,7 @@
 			dstPath = TestWebKitAPI.resources;
 			dstSubfolderSpec = 7;
 			files = (
+				837A35F11D9A1E7D00663C57 /* DownloadRequestBlobURL.html in Copy Resources */,
 				2E9896151D8F093800739892 /* text-and-password-inputs.html in Copy Resources */,
 				F42DA5161D8CEFE400336F40 /* large-input-field-focus-onload.html in Copy Resources */,
 				2EFF06CD1D8A429A0004BB30 /* input-field-in-scrollable-document.html in Copy Resources */,
@@ -980,6 +982,7 @@
 		7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WillLoad_Bundle.cpp; sourceTree = "<group>"; };
 		81B50192140F232300D9EB58 /* StringBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuilder.cpp; sourceTree = "<group>"; };
 		835CF9661D25FCD6001A65D4 /* RestoreSessionStateWithoutNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RestoreSessionStateWithoutNavigation.cpp; sourceTree = "<group>"; };
+		837A35F01D9A1E6400663C57 /* DownloadRequestBlobURL.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DownloadRequestBlobURL.html; sourceTree = "<group>"; };
 		83B88A331C80056D00BB2418 /* HTMLParserIdioms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLParserIdioms.cpp; sourceTree = "<group>"; };
 		83CF1C2C1C4F19AE00688447 /* StringUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StringUtilities.mm; sourceTree = "<group>"; };
 		86BD19971A2DB05B006DCF0A /* RefCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RefCounter.cpp; sourceTree = "<group>"; };
@@ -1500,6 +1503,7 @@
 				2DE71AFF1D49C2F000904094 /* blinking-div.html */,
 				A16F66B91C40EA2000BD4D24 /* ContentFiltering.html */,
 				5C2936941D5BFD1900DEAB1E /* CookieMessage.html */,
+				837A35F01D9A1E6400663C57 /* DownloadRequestBlobURL.html */,
 				5714ECB81CA8B58800051AC8 /* DownloadRequestOriginalURL.html */,
 				5714ECBC1CA8C21800051AC8 /* DownloadRequestOriginalURL2.html */,
 				5714ECBA1CA8BFD100051AC8 /* DownloadRequestOriginalURLFrame.html */,

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm (206438 => 206439)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm	2016-09-27 16:47:49 UTC (rev 206438)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm	2016-09-27 16:58:41 UTC (rev 206439)
@@ -342,5 +342,85 @@
     TestWebKitAPI::Util::run(&isDone);
 }
 
+@interface BlobDownloadDelegate : NSObject <_WKDownloadDelegate>
+@end
+
+@implementation BlobDownloadDelegate {
+    RetainPtr<_WKDownload> _download;
+    String _destinationPath;
+    long long _expectedContentLength;
+    uint64_t _receivedContentLength;
+}
+
+- (void)_downloadDidStart:(_WKDownload *)download
+{
+    EXPECT_NULL(_download);
+    EXPECT_NOT_NULL(download);
+    EXPECT_TRUE([[[[download request] URL] scheme] isEqualToString:@"blob"]);
+    _download = download;
+}
+
+- (void)_download:(_WKDownload *)download didReceiveResponse:(NSURLResponse *)response
+{
+    hasReceivedResponse = true;
+    EXPECT_EQ(_download, download);
+    EXPECT_EQ(_expectedContentLength, 0U);
+    EXPECT_EQ(_receivedContentLength, 0U);
+    EXPECT_TRUE([[[response URL] scheme] isEqualToString:@"blob"]);
+    _expectedContentLength = [response expectedContentLength];
+}
+
+- (void)_download:(_WKDownload *)download didReceiveData:(uint64_t)length
+{
+    EXPECT_EQ(_download, download);
+    _receivedContentLength += length;
+}
+
+- (NSString *)_download:(_WKDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename allowOverwrite:(BOOL *)allowOverwrite
+{
+    EXPECT_TRUE(hasReceivedResponse);
+    EXPECT_EQ(_download, download);
+
+    WebCore::PlatformFileHandle fileHandle;
+    _destinationPath = WebCore::openTemporaryFile("TestWebKitAPI", fileHandle);
+    EXPECT_TRUE(fileHandle != WebCore::invalidPlatformFileHandle);
+    WebCore::closeFile(fileHandle);
+
+    *allowOverwrite = YES;
+    return _destinationPath;
+}
+
+- (void)_downloadDidFinish:(_WKDownload *)download
+{
+    EXPECT_EQ(_download, download);
+    EXPECT_TRUE(_expectedContentLength == NSURLResponseUnknownLength || static_cast<uint64_t>(_expectedContentLength) == _receivedContentLength);
+    NSString* expectedContent = @"{\"x\":42,\"s\":\"hello, world\"}";
+    NSData* expectedData = [expectedContent dataUsingEncoding:NSUTF8StringEncoding];
+    EXPECT_TRUE([[[NSFileManager defaultManager] contentsAtPath:_destinationPath] isEqualToData:expectedData]);
+    WebCore::deleteFile(_destinationPath);
+    isDone = true;
+}
+
+@end
+
+@interface DownloadBlobURLNavigationDelegate : NSObject <WKNavigationDelegate>
+@end
+
+@implementation DownloadBlobURLNavigationDelegate
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+    if ([navigationAction.request.URL.scheme isEqualToString:@"blob"])
+        decisionHandler(_WKNavigationActionPolicyDownload);
+    else
+        decisionHandler(WKNavigationActionPolicyAllow);
+}
+@end
+
+TEST(_WKDownload, DownloadRequestBlobURL)
+{
+    NSURL *originalURL = [[NSBundle mainBundle] URLForResource:@"DownloadRequestBlobURL" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"];
+    runTest(adoptNS([[DownloadBlobURLNavigationDelegate alloc] init]).get(), adoptNS([[BlobDownloadDelegate alloc] init]).get(), originalURL);
+}
+
 #endif
 #endif

Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html (0 => 206439)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html	                        (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DownloadRequestBlobURL.html	2016-09-27 16:58:41 UTC (rev 206439)
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<body>
+<a id="href" href=""
+<script>
+    var element = document.getElementById("href");
+    var data = { x: 42, s: "hello, world" };
+    var json = JSON.stringify(data);
+    var blob = new Blob([json], {type: "octet/stream"});
+    var url = ""
+
+    element.href = ""
+    element.click();
+</script>
+</body>
+</html>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to