Title: [222453] branches/safari-604-branch/Tools
- Revision
- 222453
- Author
- [email protected]
- Date
- 2017-09-25 12:03:04 -0700 (Mon, 25 Sep 2017)
Log Message
Fix branch test build after r222431.
https://bugs.webkit.org/show_bug.cgi?id=177411
* TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm:
(-[JSNavigationDelegate webView:decidePolicyForNavigationAction:decisionHandler:]):
(-[JSNavigationDelegate webView:decidePolicyForNavigationResponse:decisionHandler:]):
Just do string comparison to avoid this error on some OSes:
error: instance method '-isEqualTo:' not found (return type defaults to 'id')
Modified Paths
Diff
Modified: branches/safari-604-branch/Tools/ChangeLog (222452 => 222453)
--- branches/safari-604-branch/Tools/ChangeLog 2017-09-25 19:03:00 UTC (rev 222452)
+++ branches/safari-604-branch/Tools/ChangeLog 2017-09-25 19:03:04 UTC (rev 222453)
@@ -1,3 +1,15 @@
+2017-09-25 Alex Christensen <[email protected]>
+
+ Fix branch test build after r222431.
+ https://bugs.webkit.org/show_bug.cgi?id=177411
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm:
+ (-[JSNavigationDelegate webView:decidePolicyForNavigationAction:decisionHandler:]):
+ (-[JSNavigationDelegate webView:decidePolicyForNavigationResponse:decisionHandler:]):
+ Just do string comparison to avoid this error on some OSes:
+ error: instance method '-isEqualTo:' not found (return type defaults to 'id')
+
+
2017-09-23 Alex Christensen <[email protected]>
REGRESSION(r214201): WebProcess hangs during policy decisions
Modified: branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm (222452 => 222453)
--- branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm 2017-09-25 19:03:00 UTC (rev 222452)
+++ branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm 2017-09-25 19:03:04 UTC (rev 222453)
@@ -50,7 +50,7 @@
- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
{
- if ([navigationAction.request.URL isEqualTo:secondURL.get()]) {
+ if ([navigationAction.request.URL.absoluteString isEqualToString:[secondURL absoluteString]]) {
[webView evaluateJavaScript:@"alert(document.location);" completionHandler:^(id, NSError *) {
decisionHandler(WKNavigationActionPolicyAllow);
}];
@@ -60,7 +60,7 @@
- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
{
- if ([navigationResponse.response.URL isEqualTo:secondURL.get()]) {
+ if ([navigationResponse.response.URL.absoluteString isEqualToString:[secondURL absoluteString]]) {
[webView evaluateJavaScript:@"alert(document.location);" completionHandler:^(id, NSError *) {
decisionHandler(WKNavigationResponsePolicyAllow);
}];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
