Attachment 357621 Details for Bug 192810 – Patch for landing

[patch] Patch for landing

file_192810.txt (text/plain), 3.07 KB, created by David Quesada on 2018-12-18 15:21:29 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Quesada

Created: 2018-12-18 15:21:29 PST

Size: 3.07 KB

patch

obsolete

>commit e7293870ea49ca7a8e08ec63fb467616c4eff477
>Author: David Quesada <david_quesada@apple.com>
>Date:   Tue Dec 18 15:20:39 2018 -0800
>
>    REGRESSION: [iOS] API test TestWebKitAPI._WKDownload.OriginatingWebView is a flaky failure
>    https://bugs.webkit.org/show_bug.cgi?id=192810
>    <rdar://problem/46812536>
>    
>    Reviewed by Alex Christensen.
>    
>    * TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
>    (-[OriginatingWebViewDownloadDelegate _downloadDidStart:]):
>        After releasing our reference to the web view, wait until the next turn of the runloop
>        before checking that the originatingWebView has been zeroed, since the web view might
>        still be referenced in the autorelease pool. This _WKDownload unit test isn't about
>        testing general memory management of WKWebViews, only that _WKDownload does not retain
>        its web view via the 'originatingWebView' property.
>
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cf5a6af1c5e..a6fcaa64505 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-12-18  David Quesada  <david_quesada@apple.com>
>+
>+        REGRESSION: [iOS] API test TestWebKitAPI._WKDownload.OriginatingWebView is a flaky failure
>+        https://bugs.webkit.org/show_bug.cgi?id=192810
>+        <rdar://problem/46812536>
>+
>+        Reviewed by Alex Christensen.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
>+        (-[OriginatingWebViewDownloadDelegate _downloadDidStart:]):
>+            After releasing our reference to the web view, wait until the next turn of the runloop
>+            before checking that the originatingWebView has been zeroed, since the web view might
>+            still be referenced in the autorelease pool. This _WKDownload unit test isn't about
>+            testing general memory management of WKWebViews, only that _WKDownload does not retain
>+            its web view via the 'originatingWebView' property.
>+
> 2018-12-18  Jonathan Bedard  <jbedard@apple.com>
> 
>         webkitpy: Ignore device type for test when using --force
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
>index dae0d2710c8..21b35ce1c86 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
>@@ -41,6 +41,7 @@
> #import <WebKit/WKUIDelegatePrivate.h>
> #import <WebKit/WKWebView.h>
> #import <WebKit/WKWebViewConfiguration.h>
>+#import <wtf/MainThread.h>
> #import <wtf/RetainPtr.h>
> #import <wtf/text/WTFString.h>
> 
>@@ -253,13 +254,13 @@ - (instancetype)initWithWebView:(WKWebView *)webView
> 
> - (void)_downloadDidStart:(_WKDownload *)download
> {
>-    @autoreleasepool {
>-        EXPECT_EQ([download originatingWebView], _webView);
>-    }
>-
>+    EXPECT_EQ([download originatingWebView], _webView);
>     _webView = nullptr;
>-    EXPECT_NULL([download originatingWebView]);
>-    isDone = true;
>+
>+    WTF::callOnMainThread([download = retainPtr(download)] {
>+        EXPECT_NULL([download originatingWebView]);
>+        isDone = true;
>+    });
> }
> 
> @end

Actions: View | Formatted Diff | Diff

Attachments on bug 192810: 357614 | 357621