Attachment 360516 Details for Bug 193977 – Patch

[patch] Patch

bug-193977-20190129155032.patch (text/plain), 2.91 KB, created by Chris Dumez on 2019-01-29 15:50:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2019-01-29 15:50:36 PST

Size: 2.91 KB

patch

obsolete

>Subversion Revision: 240676
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 84bed67074218e52d8b734a744f3ff453f748f6e..5b79726236ef2eda43adebd1ab9ba08326b2c9a2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-29  Chris Dumez  <cdumez@apple.com>
>+
>+        REGRESSION: ProcessSwap.DoSameSiteNavigationAfterCrossSiteProvisionalLoadStarted Failing on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=193977
>+        <rdar://problem/47643716>
>+
>+        Reviewed by Geoff Garen.
>+
>+        Update API test to address flakiness on iOS. Instead of doing the last navigation after receiving the
>+        didStartProvisionalLoad, do we right after we answer the navigation policy request. Flakiness was due
>+        to the previous provisional committing *before* we make the last load. 
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
>+
> 2019-01-29  Chris Dumez  <cdumez@apple.com>
> 
>         Regression (r240046): [PSON] Spurious changes to [WKWebView url] and [WKWebView loading] after [WKWebView loadRequest]
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
>index db7c056a14983bec16c1b8cef4a5deead478a960..a632011269edf385e6de7f84ee8e631f66655f3e 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
>@@ -2448,6 +2448,8 @@ TEST(ProcessSwap, DoSameSiteNavigationAfterCrossSiteProvisionalLoadStarted)
>     auto delegate = adoptNS([[PSONNavigationDelegate alloc] init]);
>     [webView setNavigationDelegate:delegate.get()];
> 
>+    [webView configuration].preferences.safeBrowsingEnabled = NO;
>+
>     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"pson://www.webkit.org/main1.html"]];
>     [webView loadRequest:request];
> 
>@@ -2456,14 +2458,14 @@ TEST(ProcessSwap, DoSameSiteNavigationAfterCrossSiteProvisionalLoadStarted)
> 
>     auto webkitPID = [webView _webProcessIdentifier];
> 
>-    didStartProvisionalLoad = false;
>-    request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"pson://www.apple.com/main.html"]];
>-    [webView loadRequest:request];
>+    delegate->decidePolicyForNavigationAction = ^(WKNavigationAction *, void (^decisionHandler)(WKNavigationActionPolicy)) {
>+        decisionHandler(WKNavigationActionPolicyAllow);
> 
>-    TestWebKitAPI::Util::run(&didStartProvisionalLoad);
>-    didStartProvisionalLoad = false;
>+        delegate->decidePolicyForNavigationAction = nil;
>+        [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"pson://www.webkit.org/main2.html"]]];
>+    };
> 
>-    request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"pson://www.webkit.org/main2.html"]];
>+    request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"pson://www.apple.com/main.html"]];
>     [webView loadRequest:request];
> 
>     TestWebKitAPI::Util::run(&done);

Actions: View | Formatted Diff | Diff

Attachments on bug 193977: 360505 | 360516