Title: [222912] branches/safari-604-branch/Tools
- Revision
- 222912
- Author
- matthew_han...@apple.com
- Date
- 2017-10-05 10:11:51 -0700 (Thu, 05 Oct 2017)
Log Message
Revert r222453. rdar://problem/34826998
Modified Paths
Diff
Modified: branches/safari-604-branch/Tools/ChangeLog (222911 => 222912)
--- branches/safari-604-branch/Tools/ChangeLog 2017-10-05 14:04:27 UTC (rev 222911)
+++ branches/safari-604-branch/Tools/ChangeLog 2017-10-05 17:11:51 UTC (rev 222912)
@@ -1,3 +1,7 @@
+2017-10-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Revert r222453. rdar://problem/34826998
+
2017-09-25 Alex Christensen <achristen...@webkit.org>
Fix branch test build after r222431.
Modified: branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm (222911 => 222912)
--- branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm 2017-10-05 14:04:27 UTC (rev 222911)
+++ branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_javascript_DuringNavigation.mm 2017-10-05 17:11:51 UTC (rev 222912)
@@ -50,7 +50,7 @@
- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
{
- if ([navigationAction.request.URL.absoluteString isEqualToString:[secondURL absoluteString]]) {
+ if ([navigationAction.request.URL isEqualTo:secondURL.get()]) {
[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.absoluteString isEqualToString:[secondURL absoluteString]]) {
+ if ([navigationResponse.response.URL isEqualTo:secondURL.get()]) {
[webView evaluateJavaScript:@"alert(document.location);" completionHandler:^(id, NSError *) {
decisionHandler(WKNavigationResponsePolicyAllow);
}];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
