Changeset 239359 in webkit

Timestamp:

Dec 18, 2018 3:59:34 PM (5 years ago)

Author:

david_quesada@apple.com

Message:

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/Download.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm

@@ -42 +42 @@
 #import <WebKit/WKWebView.h>
 #import <WebKit/WKWebViewConfiguration.h>
+#import <wtf/MainThread.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/text/WTFString.h>
@@ -254 +255 @@
 - (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;
+    });
 }