Changeset 238937 in webkit

Timestamp:

Dec 6, 2018 12:07:38 PM (5 years ago)

Author:

david_quesada@apple.com

Message:

-[WKProcessPool _resumeDownloadFromData:path:] should allow specifying the originating web view
​https://bugs.webkit.org/show_bug.cgi?id=192411
rdar://problem/46492487

Reviewed by Alex Christensen.

• UIProcess/API/C/WKContext.cpp:

(WKContextResumeDownload):

• UIProcess/API/Cocoa/WKProcessPool.mm:

(-[WKProcessPool _resumeDownloadFromData:path:originatingWebView:]):
(-[WKProcessPool _resumeDownloadFromData:path:]): Deleted.

• UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::resumeDownload):

• Set the originating page of the DownloadProxy.
• If the originating page is non-null, use its session ID for the download.
• Remove a FIXME. It's possible to do this now by providing the web view whose session should be used for the download.

• UIProcess/WebProcessPool.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPool.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPoolPrivate.h (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• UIProcess/WebProcessPool.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-06  David Quesada  <david_quesada@apple.com>
+
+        -[WKProcessPool _resumeDownloadFromData:path:] should allow specifying the originating web view
+        https://bugs.webkit.org/show_bug.cgi?id=192411
+        rdar://problem/46492487
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextResumeDownload):
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _resumeDownloadFromData:path:originatingWebView:]):
+        (-[WKProcessPool _resumeDownloadFromData:path:]): Deleted.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::resumeDownload):
+         - Set the originating page of the DownloadProxy.
+         - If the originating page is non-null, use its session ID for the download.
+         - Remove a FIXME. It's possible to do this now by providing the web view whose session
+           should be used for the download.
+        * UIProcess/WebProcessPool.h:
+
 2018-12-06  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

@@ -283 +283 @@
 WKDownloadRef WKContextResumeDownload(WKContextRef contextRef, WKDataRef resumeData, WKStringRef path)
 {
-    return toAPI(toImpl(contextRef)->resumeDownload(toImpl(resumeData), toWTFString(path)));
+    return toAPI(toImpl(contextRef)->resumeDownload(nullptr, toImpl(resumeData), toWTFString(path)));
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm

@@ -577 +577 @@
 }
 
-- (_WKDownload *)_resumeDownloadFromData:(NSData *)resumeData path:(NSString *)path
-{
-    return wrapper(_processPool->resumeDownload(API::Data::createWithoutCopying(resumeData).ptr(), path));
+- (_WKDownload *)_resumeDownloadFromData:(NSData *)resumeData path:(NSString *)path originatingWebView:(WKWebView *)webView
+{
+    return wrapper(_processPool->resumeDownload([webView _page], API::Data::createWithoutCopying(resumeData).ptr(), path));
 }
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

@@ -83 +83 @@
 
 - (_WKDownload *)_downloadURLRequest:(NSURLRequest *)request originatingWebView:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
-- (_WKDownload *)_resumeDownloadFromData:(NSData *)resumeData path:(NSString *)path WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (_WKDownload *)_resumeDownloadFromData:(NSData *)resumeData path:(NSString *)path originatingWebView:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 // Test only. Should be called only while no web content processes are running.

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -1262 +1262 @@
 }
 
-DownloadProxy* WebProcessPool::resumeDownload(const API::Data* resumeData, const String& path)
-{
-    auto* downloadProxy = createDownloadProxy(ResourceRequest(), nullptr);
+DownloadProxy* WebProcessPool::resumeDownload(WebPageProxy* initiatingPage, const API::Data* resumeData, const String& path)
+{
+    auto* downloadProxy = createDownloadProxy(ResourceRequest(), initiatingPage);
+    PAL::SessionID sessionID = initiatingPage ? initiatingPage->sessionID() : PAL::SessionID::defaultSessionID();
 
     SandboxExtension::Handle sandboxExtensionHandle;
@@ -1271 +1272 @@
 
     if (networkProcess()) {
-        // FIXME: If we started a download in an ephemeral session and that session still exists, we should find a way to use that same session.
-        networkProcess()->send(Messages::NetworkProcess::ResumeDownload(PAL::SessionID::defaultSessionID(), downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
+        networkProcess()->send(Messages::NetworkProcess::ResumeDownload(sessionID, downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
         return downloadProxy;
     }

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -190 +190 @@
 
     DownloadProxy* download(WebPageProxy* initiatingPage, const WebCore::ResourceRequest&, const String& suggestedFilename = { });
-    DownloadProxy* resumeDownload(const API::Data* resumeData, const String& path);
+    DownloadProxy* resumeDownload(WebPageProxy* initiatingPage, const API::Data* resumeData, const String& path);
 
     void setInjectedBundleInitializationUserData(RefPtr<API::Object>&& userData) { m_injectedBundleInitializationUserData = WTFMove(userData); }