Title: [233963] branches/safari-606-branch/Tools
- Revision
- 233963
- Author
- [email protected]
- Date
- 2018-07-18 19:00:32 -0700 (Wed, 18 Jul 2018)
Log Message
Cherry-pick r233899. rdar://problem/42345370
REGRESSION: [macOS Sierra] TestWebKitAPI.WebKit.WebsiteDataStoreCustomPaths is a flaky failure
https://bugs.webkit.org/show_bug.cgi?id=187066
<rdar://problem/41609065>
Reviewed by Chris Dumez.
In r232668 we started to do reload if web process crashes by default. As we killed the web
process explicitly in this test, if web page got reloaded, messages would be sent again,
and flag set in message handler could keep the test continue to evaluate the expectation
without waiting for removeDataOfTypes to finish.
* TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
(-[WebsiteDataStoreCustomPathsMessageHandler webViewWebContentProcessDidTerminate:]):
(TEST):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Tools/ChangeLog (233962 => 233963)
--- branches/safari-606-branch/Tools/ChangeLog 2018-07-19 02:00:29 UTC (rev 233962)
+++ branches/safari-606-branch/Tools/ChangeLog 2018-07-19 02:00:32 UTC (rev 233963)
@@ -1,5 +1,44 @@
2018-07-18 Babak Shafiei <[email protected]>
+ Cherry-pick r233899. rdar://problem/42345370
+
+ REGRESSION: [macOS Sierra] TestWebKitAPI.WebKit.WebsiteDataStoreCustomPaths is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=187066
+ <rdar://problem/41609065>
+
+ Reviewed by Chris Dumez.
+
+ In r232668 we started to do reload if web process crashes by default. As we killed the web
+ process explicitly in this test, if web page got reloaded, messages would be sent again,
+ and flag set in message handler could keep the test continue to evaluate the expectation
+ without waiting for removeDataOfTypes to finish.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+ (-[WebsiteDataStoreCustomPathsMessageHandler webViewWebContentProcessDidTerminate:]):
+ (TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233899 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-17 Sihui Liu <[email protected]>
+
+ REGRESSION: [macOS Sierra] TestWebKitAPI.WebKit.WebsiteDataStoreCustomPaths is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=187066
+ <rdar://problem/41609065>
+
+ Reviewed by Chris Dumez.
+
+ In r232668 we started to do reload if web process crashes by default. As we killed the web
+ process explicitly in this test, if web page got reloaded, messages would be sent again,
+ and flag set in message handler could keep the test continue to evaluate the expectation
+ without waiting for removeDataOfTypes to finish.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
+ (-[WebsiteDataStoreCustomPathsMessageHandler webViewWebContentProcessDidTerminate:]):
+ (TEST):
+
+2018-07-18 Babak Shafiei <[email protected]>
+
Cherry-pick r233889. rdar://problem/42343023
[macOS] TestWebKitAPI.PictureInPicture.WKUIDelegate is timing out
Modified: branches/safari-606-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm (233962 => 233963)
--- branches/safari-606-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2018-07-19 02:00:29 UTC (rev 233962)
+++ branches/safari-606-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm 2018-07-19 02:00:32 UTC (rev 233963)
@@ -45,7 +45,7 @@
static bool receivedScriptMessage;
static Deque<RetainPtr<WKScriptMessage>> scriptMessages;
-@interface WebsiteDataStoreCustomPathsMessageHandler : NSObject <WKScriptMessageHandler>
+@interface WebsiteDataStoreCustomPathsMessageHandler : NSObject <WKScriptMessageHandler, WKNavigationDelegate>
@end
@implementation WebsiteDataStoreCustomPathsMessageHandler
@@ -56,6 +56,11 @@
scriptMessages.append(message);
}
+- (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView
+{
+ // Overwrite the default policy which launches a new web process and reload page on crash.
+}
+
@end
static WKScriptMessage *getNextMessage()
@@ -115,6 +120,7 @@
configuration.get().websiteDataStore = [[[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()] autorelease];
RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+ [webView setNavigationDelegate:handler.get()];
NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"WebsiteDataStoreCustomPaths" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
[webView loadRequest:request];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
