| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/web/web_state/js/crw_js_post_request_loader.h" | 5 #import "ios/web/web_state/js/crw_js_post_request_loader.h" |
| 6 | 6 |
| 7 #include "base/json/string_escape.h" | 7 #include "base/json/string_escape.h" |
| 8 #import "base/mac/scoped_nsobject.h" | 8 #import "base/mac/scoped_nsobject.h" |
| 9 #import "base/strings/sys_string_conversions.h" | 9 #import "base/strings/sys_string_conversions.h" |
| 10 #import "ios/web/web_state/js/page_script_util.h" | 10 #import "ios/web/web_state/js/page_script_util.h" |
| 11 #import "ios/web/web_state/ui/crw_wk_script_message_router.h" | 11 #import "ios/web/web_state/ui/crw_wk_script_message_router.h" |
| 12 | 12 |
| 13 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 14 #error "This file requires ARC support." |
| 15 #endif |
| 16 |
| 13 namespace { | 17 namespace { |
| 14 | 18 |
| 15 // Escapes characters and encloses given string in quotes for use in JavaScript. | 19 // Escapes characters and encloses given string in quotes for use in JavaScript. |
| 16 NSString* EscapeAndQuoteStringForJavaScript(NSString* unescapedString) { | 20 NSString* EscapeAndQuoteStringForJavaScript(NSString* unescapedString) { |
| 17 std::string string = base::SysNSStringToUTF8(unescapedString); | 21 std::string string = base::SysNSStringToUTF8(unescapedString); |
| 18 return base::SysUTF8ToNSString(base::GetQuotedJSONString(string)); | 22 return base::SysUTF8ToNSString(base::GetQuotedJSONString(string)); |
| 19 } | 23 } |
| 20 | 24 |
| 21 // JavaScript message handler name installed in WKWebView for request errors. | 25 // JavaScript message handler name installed in WKWebView for request errors. |
| 22 NSString* const kErrorHandlerName = @"POSTErrorHandler"; | 26 NSString* const kErrorHandlerName = @"POSTErrorHandler"; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 addObserver:self | 59 addObserver:self |
| 56 selector:@selector(handleMemoryWarning) | 60 selector:@selector(handleMemoryWarning) |
| 57 name:UIApplicationDidReceiveMemoryWarningNotification | 61 name:UIApplicationDidReceiveMemoryWarningNotification |
| 58 object:nil]; | 62 object:nil]; |
| 59 } | 63 } |
| 60 return self; | 64 return self; |
| 61 } | 65 } |
| 62 | 66 |
| 63 - (void)dealloc { | 67 - (void)dealloc { |
| 64 [[NSNotificationCenter defaultCenter] removeObserver:self]; | 68 [[NSNotificationCenter defaultCenter] removeObserver:self]; |
| 65 [super dealloc]; | |
| 66 } | 69 } |
| 67 | 70 |
| 68 - (NSString*)requestScript { | 71 - (NSString*)requestScript { |
| 69 if (!_requestScript) { | 72 if (!_requestScript) { |
| 70 _requestScript.reset([web::GetPageScript(@"post_request") copy]); | 73 _requestScript.reset([web::GetPageScript(@"post_request") copy]); |
| 71 } | 74 } |
| 72 return _requestScript; | 75 return _requestScript; |
| 73 } | 76 } |
| 74 | 77 |
| 75 - (void)loadPOSTRequest:(NSURLRequest*)request | 78 - (void)loadPOSTRequest:(NSURLRequest*)request |
| 76 inWebView:(WKWebView*)webView | 79 inWebView:(WKWebView*)webView |
| 77 messageRouter:(CRWWKScriptMessageRouter*)messageRouter | 80 messageRouter:(CRWWKScriptMessageRouter*)messageRouter |
| 78 completionHandler:(void (^)(NSError*))completionHandler { | 81 completionHandler:(void (^)(NSError*))completionHandler { |
| 79 DCHECK([request.HTTPMethod isEqualToString:@"POST"]); | 82 DCHECK([request.HTTPMethod isEqualToString:@"POST"]); |
| 80 DCHECK(webView); | 83 DCHECK(webView); |
| 81 DCHECK(messageRouter); | 84 DCHECK(messageRouter); |
| 82 DCHECK(completionHandler); | 85 DCHECK(completionHandler); |
| 83 | 86 |
| 84 // Install error handling and success routers. | 87 // Install error handling and success routers. |
| 88 __weak CRWWKScriptMessageRouter* weakRouter = messageRouter; |
| 85 [messageRouter setScriptMessageHandler:^(WKScriptMessage* message) { | 89 [messageRouter setScriptMessageHandler:^(WKScriptMessage* message) { |
| 86 // Cleaning up script handlers. | 90 // Cleaning up script handlers. |
| 87 [messageRouter removeScriptMessageHandlerForName:kErrorHandlerName | 91 [weakRouter removeScriptMessageHandlerForName:kErrorHandlerName |
| 88 webView:webView]; | 92 webView:webView]; |
| 89 [messageRouter removeScriptMessageHandlerForName:kSuccessHandlerName | 93 [weakRouter removeScriptMessageHandlerForName:kSuccessHandlerName |
| 90 webView:webView]; | 94 webView:webView]; |
| 91 completionHandler(nil); | 95 completionHandler(nil); |
| 92 } | 96 } |
| 93 name:kSuccessHandlerName | 97 name:kSuccessHandlerName |
| 94 webView:webView]; | 98 webView:webView]; |
| 95 | 99 |
| 96 [messageRouter setScriptMessageHandler:^(WKScriptMessage* message) { | 100 [messageRouter setScriptMessageHandler:^(WKScriptMessage* message) { |
| 97 NSNumber* statusCode = message.body; | 101 NSNumber* statusCode = message.body; |
| 98 NSError* error = [NSError errorWithDomain:NSURLErrorDomain | 102 NSError* error = [NSError errorWithDomain:NSURLErrorDomain |
| 99 code:statusCode.integerValue | 103 code:statusCode.integerValue |
| 100 userInfo:nil]; | 104 userInfo:nil]; |
| 101 [messageRouter removeScriptMessageHandlerForName:kErrorHandlerName | 105 [weakRouter removeScriptMessageHandlerForName:kErrorHandlerName |
| 102 webView:webView]; | 106 webView:webView]; |
| 103 [messageRouter removeScriptMessageHandlerForName:kSuccessHandlerName | 107 [weakRouter removeScriptMessageHandlerForName:kSuccessHandlerName |
| 104 webView:webView]; | 108 webView:webView]; |
| 105 completionHandler(error); | 109 completionHandler(error); |
| 106 } | 110 } |
| 107 name:kErrorHandlerName | 111 name:kErrorHandlerName |
| 108 webView:webView]; | 112 webView:webView]; |
| 109 | 113 |
| 110 NSString* HTML = | 114 NSString* HTML = |
| 111 [NSString stringWithFormat:@"<html><script>%@%@</script></html>", | 115 [NSString stringWithFormat:@"<html><script>%@%@</script></html>", |
| 112 self.requestScript, | 116 self.requestScript, |
| 113 [self scriptToExecutePOSTRequest:request]]; | 117 [self scriptToExecutePOSTRequest:request]]; |
| 114 [webView loadHTMLString:HTML baseURL:request.URL]; | 118 [webView loadHTMLString:HTML baseURL:request.URL]; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 139 } | 143 } |
| 140 | 144 |
| 141 - (NSString*)JSONForJavaScriptFromRequestHeaders:(NSDictionary*)headers { | 145 - (NSString*)JSONForJavaScriptFromRequestHeaders:(NSDictionary*)headers { |
| 142 if (headers) { | 146 if (headers) { |
| 143 NSData* headerData = | 147 NSData* headerData = |
| 144 [NSJSONSerialization dataWithJSONObject:headers options:0 error:nil]; | 148 [NSJSONSerialization dataWithJSONObject:headers options:0 error:nil]; |
| 145 if (headerData) { | 149 if (headerData) { |
| 146 // This string is properly escaped by NSJSONSerialization. It needs to | 150 // This string is properly escaped by NSJSONSerialization. It needs to |
| 147 // have no quotes since JavaScripts takes this parameter as an | 151 // have no quotes since JavaScripts takes this parameter as an |
| 148 // Object<string, string>. | 152 // Object<string, string>. |
| 149 return [[[NSString alloc] initWithData:headerData | 153 return [[NSString alloc] initWithData:headerData |
| 150 encoding:NSUTF8StringEncoding] autorelease]; | 154 encoding:NSUTF8StringEncoding]; |
| 151 } | 155 } |
| 152 } | 156 } |
| 153 return @"{}"; | 157 return @"{}"; |
| 154 } | 158 } |
| 155 | 159 |
| 156 @end | 160 @end |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2396553002:
[ARC] Converts part of ios/web/ui to ARC.
