Changeset 222453 in webkit

Timestamp:

Sep 25, 2017 12:03:04 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Fix branch test build after r222431.
​https://bugs.webkit.org/show_bug.cgi?id=177411

• TestWebKitAPI/Tests/WebKit2Cocoa/JavaScriptDuringNavigation.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')

Location:

branches/safari-604-branch/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit2Cocoa/JavaScriptDuringNavigation.mm (modified) (2 diffs)

branches/safari-604-branch/Tools/ChangeLog

@@ +1 @@
+2017-09-25  Alex Christensen  <achristensen@webkit.org>
+
+        Fix branch test build after r222431.
+        https://bugs.webkit.org/show_bug.cgi?id=177411
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/JavaScriptDuringNavigation.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  <achristensen@webkit.org>
 

branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/JavaScriptDuringNavigation.mm

@@ -51 +51 @@
 - (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);
@@ -61 +61 @@
 - (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);