Title: [238742] trunk
Revision
238742
Author
david_ques...@apple.com
Date
2018-11-30 10:50:55 -0800 (Fri, 30 Nov 2018)

Log Message

-[WKProcessPool _downloadURLRequest:] should allow specifying the initiating web view
https://bugs.webkit.org/show_bug.cgi?id=192212
rdar://problem/46363706

Reviewed by Alex Christensen.

Source/WebKit:

* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _downloadURLRequest:originatingWebView:]):
(-[WKProcessPool _downloadURLRequest:]): Deleted.
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm:
(-[DownloadProgressTestRunner startDownload:expectedLength:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (238741 => 238742)


--- trunk/Source/WebKit/ChangeLog	2018-11-30 18:14:52 UTC (rev 238741)
+++ trunk/Source/WebKit/ChangeLog	2018-11-30 18:50:55 UTC (rev 238742)
@@ -1,3 +1,16 @@
+2018-11-30  David Quesada  <david_ques...@apple.com>
+
+        -[WKProcessPool _downloadURLRequest:] should allow specifying the initiating web view
+        https://bugs.webkit.org/show_bug.cgi?id=192212
+        rdar://problem/46363706
+
+        Reviewed by Alex Christensen.
+
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        (-[WKProcessPool _downloadURLRequest:originatingWebView:]):
+        (-[WKProcessPool _downloadURLRequest:]): Deleted.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+
 2018-11-30  Per Arne Vollan  <pvol...@apple.com>
 
         Remove invalid character in sandbox introduced in r238703.

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (238741 => 238742)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm	2018-11-30 18:14:52 UTC (rev 238741)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm	2018-11-30 18:50:55 UTC (rev 238742)
@@ -36,6 +36,7 @@
 #import "SandboxUtilities.h"
 #import "UIGamepadProvider.h"
 #import "WKObject.h"
+#import "WKWebViewInternal.h"
 #import "WebCertificateInfo.h"
 #import "WebCookieManagerProxy.h"
 #import "WebProcessMessages.h"
@@ -570,9 +571,9 @@
 }
 #endif // PLATFORM(IOS_FAMILY)
 
-- (_WKDownload *)_downloadURLRequest:(NSURLRequest *)request
+- (_WKDownload *)_downloadURLRequest:(NSURLRequest *)request originatingWebView:(WKWebView *)webView
 {
-    return (_WKDownload *)_processPool->download(nullptr, request)->wrapper();
+    return (_WKDownload *)_processPool->download([webView _page], request)->wrapper();
 }
 
 - (_WKDownload *)_resumeDownloadFromData:(NSData *)resumeData path:(NSString *)path

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (238741 => 238742)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h	2018-11-30 18:14:52 UTC (rev 238741)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h	2018-11-30 18:50:55 UTC (rev 238742)
@@ -28,6 +28,7 @@
 
 #if WK_API_ENABLED
 
+@class WKWebView;
 @class _WKAutomationSession;
 @class _WKDownload;
 @class _WKProcessPoolConfiguration;
@@ -80,7 +81,7 @@
 
 - (void)_registerURLSchemeAsCanDisplayOnlyIfCanRequest:(NSString *)scheme WK_API_AVAILABLE(macosx(10.14), ios(12.0));
 
-- (_WKDownload *)_downloadURLRequest:(NSURLRequest *)request WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (_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));
 
 // Test only. Should be called only while no web content processes are running.

Modified: trunk/Tools/ChangeLog (238741 => 238742)


--- trunk/Tools/ChangeLog	2018-11-30 18:14:52 UTC (rev 238741)
+++ trunk/Tools/ChangeLog	2018-11-30 18:50:55 UTC (rev 238742)
@@ -1,3 +1,14 @@
+2018-11-30  David Quesada  <david_ques...@apple.com>
+
+        -[WKProcessPool _downloadURLRequest:] should allow specifying the initiating web view
+        https://bugs.webkit.org/show_bug.cgi?id=192212
+        rdar://problem/46363706
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm:
+        (-[DownloadProgressTestRunner startDownload:expectedLength:]):
+
 2018-11-30  Zalan Bujtas  <za...@apple.com>
 
         [LFC][BFC] Compute min/maxHeight margins only when they are needed.

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm (238741 => 238742)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm	2018-11-30 18:14:52 UTC (rev 238741)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm	2018-11-30 18:50:55 UTC (rev 238742)
@@ -250,7 +250,7 @@
         [m_webView loadRequest:request.get()];
         break;
     case DownloadStartType::StartInProcessPool:
-        [m_webView.get().configuration.processPool _downloadURLRequest:request.get()];
+        [m_webView.get().configuration.processPool _downloadURLRequest:request.get() originatingWebView:nullptr];
         break;
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to