Attachment 372328 Details for Bug 198954 – Patch

[patch] Patch

file_198954.txt (text/plain), 2.64 KB, created by David Quesada on 2019-06-17 22:35:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Quesada

Created: 2019-06-17 22:35:20 PDT

Size: 2.64 KB

patch

obsolete

>commit 0333b7446b548a41494769a38522a38d431b6ed4
>Author: David Quesada <david_quesada@apple.com>
>Date:   Mon Jun 17 22:33:05 2019 -0700
>
>    REGRESSION: _WKDownload.OriginatingWebView and _WKDownload.CrashAfterDownloadDidFinishWhenDownloadProxyHoldsTheLastRefOnWebProcessPool failing
>    https://bugs.webkit.org/show_bug.cgi?id=198954
>    rdar://problem/51711556
>    
>    Reviewed by NOBODY (OOPS!).
>    
>    For these tests, kill the web process after the download starts. This makes the deallocation
>    of the download-originating web views, which these tests depend on, more reliable.
>    
>    * TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
>    (-[OriginatingWebViewDownloadDelegate _downloadDidStart:]):
>    (-[WaitUntilDownloadCanceledDelegate _downloadDidStart:]):
>
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c13be679802..988dd3ed423 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-17  David Quesada  <david_quesada@apple.com>
>+
>+        REGRESSION: _WKDownload.OriginatingWebView and _WKDownload.CrashAfterDownloadDidFinishWhenDownloadProxyHoldsTheLastRefOnWebProcessPool failing
>+        https://bugs.webkit.org/show_bug.cgi?id=198954
>+        rdar://problem/51711556
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        For these tests, kill the web process after the download starts. This makes the deallocation
>+        of the download-originating web views, which these tests depend on, more reliable.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
>+        (-[OriginatingWebViewDownloadDelegate _downloadDidStart:]):
>+        (-[WaitUntilDownloadCanceledDelegate _downloadDidStart:]):
>+
> 2019-06-17  Brent Fulgham  <bfulgham@apple.com>
> 
>         Ensure ITP state is relayed to Network Process on restart
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
>index 5817727b73f..88ed5d6369a 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
>@@ -259,6 +259,7 @@ - (instancetype)initWithWebView:(WKWebView *)webView
> - (void)_downloadDidStart:(_WKDownload *)download
> {
>     EXPECT_EQ([download originatingWebView], _webView);
>+    [_webView _killWebContentProcessAndResetState];
>     _webView = nullptr;
> 
>     WTF::callOnMainThread([download = retainPtr(download)] {
>@@ -750,6 +751,7 @@ @implementation WaitUntilDownloadCanceledDelegate
> - (void)_downloadDidStart:(_WKDownload *)download
> {
>     didDownloadStart = true;
>+    [download.originatingWebView _killWebContentProcessAndResetState];
> }
> 
> - (void)_downloadDidCancel:(_WKDownload *)download

Actions: View | Formatted Diff | Diff

Attachments on bug 198954: 372328