Add public API for handling Javascript alerts and prompt.

ios/web/web_state/ui/crw_web_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
 
 #include <cmath>
 #include <memory>
 #include <utility>
 
+#include "base/callback.h"
 #include "base/containers/mru_cache.h"
 #include "base/ios/block_types.h"
 #include "base/ios/ios_util.h"
 #import "base/ios/ns_error_util.h"
 #include "base/ios/weak_nsobject.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
@@ skipping 21 matching lines @@
 #import "ios/web/navigation/crw_session_entry.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/net/cert_host_pair.h"
 #import "ios/web/net/crw_cert_verification_controller.h"
 #import "ios/web/net/crw_ssl_status_updater.h"
 #include "ios/web/net/request_group_util.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/cert_store.h"
 #include "ios/web/public/favicon_url.h"
+#include "ios/web/public/javascript_dialog_presenter.h"

[Eugene But (OOO till 7-30), 2016/06/27 21:09:37]

s/include/import

[michaeldo, 2016/06/27 22:25:10]

Done.

+#include "ios/web/public/javascript_dialog_type.h"
 #include "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #import "ios/web/public/origin_util.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/referrer_util.h"
 #include "ios/web/public/ssl_status.h"
 #import "ios/web/public/url_scheme_util.h"
 #include "ios/web/public/url_util.h"
 #include "ios/web/public/user_metrics.h"
 #include "ios/web/public/web_client.h"
@@ skipping 778 matching lines @@
                  completionHandler:
                      (void (^)(NSURLSessionAuthChallengeDisposition,
                                NSURLCredential*))completionHandler;
 // Used in webView:didReceiveAuthenticationChallenge:completionHandler: to reply
 // with NSURLSessionAuthChallengeDisposition and credentials.
 + (void)processHTTPAuthForUser:(NSString*)user
                       password:(NSString*)password
              completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition,
                                          NSURLCredential*))completionHandler;
 
+// Helper to respond to |webView:runJavaScript...| delegate methods.
+// |completionHandler| must not be nil.
+- (void)runJavaScriptDialogOfType:(web::JavaScriptDialogType)type
+                 initiatedByFrame:(WKFrameInfo*)frame
+                          message:(NSString*)message
+                      defaultText:(NSString*)defaultText
+                       completion:(void (^)(BOOL, NSString*))completionHandler;
+
 // Called when WKWebView estimatedProgress has been changed.
 - (void)webViewEstimatedProgressDidChange;
 // Called when WKWebView certificateChain or hasOnlySecureContent property has
 // changed.
 - (void)webViewSecurityFeaturesDidChange;
 // Called when WKWebView loading state has been changed.
 - (void)webViewLoadingStateDidChange;
 // Called when WKWebView title has been changed.
 - (void)webViewTitleDidChange;
 // Called when WKWebView URL has been changed.
@@ skipping 2888 matching lines @@
   }
   completionHandler(
       NSURLSessionAuthChallengeUseCredential,
       [NSURLCredential
           credentialWithUser:user
                     password:password
                  persistence:NSURLCredentialPersistenceForSession]);
 }
 
 #pragma mark -
+#pragma mark JavaScript Dialog
+
+- (void)runJavaScriptDialogOfType:(web::JavaScriptDialogType)type
+                 initiatedByFrame:(WKFrameInfo*)frame
+                          message:(NSString*)message
+                      defaultText:(NSString*)defaultText
+                       completion:(void (^)(BOOL, NSString*))completionHandler {
+  completionHandler = [completionHandler copy];

[Eugene But (OOO till 7-30), 2016/06/27 21:09:37]

Why do you need this? |completionHandler| should be retained by the block and
copied in chrome layer.

[michaeldo, 2016/06/27 22:25:10]

You are correct, I don't need this copy.

+  self.webStateImpl->RunJavaScriptDialog(
+      net::GURLWithNSURL(frame.request.URL), type, message, defaultText,
+      base::BindBlock(^(bool success, NSString* input) {
+        completionHandler(success, input);
+        [completionHandler release];
+      }));
+}
+
+#pragma mark -
 #pragma mark TouchTracking
 
 - (void)touched:(BOOL)touched {
   _clickInProgress = touched;
   if (touched) {
     self.userInteractionRegistered = YES;
     _userInteractedWithWebController = YES;
     if (_isBeingDestroyed)
       return;
     const web::NavigationManagerImpl& navigationManager =
@@ skipping 913 matching lines @@
   [self setDocumentURL:_defaultURL];
 }
 
 - (void)removeWebViewAllowingCachedReconstruction:(BOOL)allowCache {
   if (!_webView)
     return;
 
   SEL cancelDialogsSelector = @selector(cancelDialogsForWebController:);
   if ([self.UIDelegate respondsToSelector:cancelDialogsSelector])
     [self.UIDelegate cancelDialogsForWebController:self];
+  _webStateImpl->CancelActiveAndPendingDialogs();
 
   if (allowCache)
     _expectedReconstructionURL = [self currentNavigationURL];
   else
     _expectedReconstructionURL = GURL();
 
   [self abortLoad];
   [_webView removeFromSuperview];
   [_containerView resetContent];
   [self setWebView:nil];
 }
 
 - (void)webViewWebProcessDidCrash {
   _webProcessIsDead = YES;
 
   SEL cancelDialogsSelector = @selector(cancelDialogsForWebController:);
   if ([self.UIDelegate respondsToSelector:cancelDialogsSelector])
     [self.UIDelegate cancelDialogsForWebController:self];
+  _webStateImpl->CancelActiveAndPendingDialogs();
 
   SEL rendererCrashSelector = @selector(webControllerWebProcessDidCrash:);
   if ([self.delegate respondsToSelector:rendererCrashSelector])
     [self.delegate webControllerWebProcessDidCrash:self];
 }
 
 - (web::WKWebViewConfigurationProvider&)webViewConfigurationProvider {
   web::BrowserState* browserState = self.webStateImpl->GetBrowserState();
   return web::WKWebViewConfigurationProvider::FromBrowserState(browserState);
 }
@@ skipping 107 matching lines @@
     [self.delegate webPageOrderedClose];
   }
 }
 
 - (void)webView:(WKWebView*)webView
     runJavaScriptAlertPanelWithMessage:(NSString*)message
                       initiatedByFrame:(WKFrameInfo*)frame
                      completionHandler:(void (^)())completionHandler {
   if (self.shouldSuppressDialogs) {
     [self didSuppressDialog];
-    completionHandler();
+    if (completionHandler) {

[Eugene But (OOO till 7-30), 2016/06/27 21:09:37]

Optional NIT: We never had crashes here, so I believe we can remove nil checks
for completion handler (we not doing them everywhere anyways).

[michaeldo, 2016/06/27 22:25:10]

The if check was here, I simply moved it from the else if below to here. I do
believe the if check is required. (Ref: Note at bottom of Block Syntax section:
https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/Progra...)

[Eugene But (OOO till 7-30), 2016/06/27 22:33:56]

Right, so if block is nil then we'll crash. But according to
NS_ASSUME_NONNULL_BEGIN in WKNavigationDelegate.h this block will never be nil.

[michaeldo, 2016/06/28 17:44:47]

Yes, you are right! I'll remove the check.

+      completionHandler();
+    }
     return;
   }
 
   SEL alertSelector = @selector(webController:
            runJavaScriptAlertPanelWithMessage:
                                    requestURL:
                             completionHandler:);
   if ([self.UIDelegate respondsToSelector:alertSelector]) {
     [self.UIDelegate webController:self
         runJavaScriptAlertPanelWithMessage:message
                                 requestURL:net::GURLWithNSURL(frame.request.URL)
                          completionHandler:completionHandler];
-  } else if (completionHandler) {
-    completionHandler();
+  } else {
+    [self runJavaScriptDialogOfType:web::JAVASCRIPT_DIALOG_TYPE_ALERT
+                   initiatedByFrame:frame
+                            message:message
+                        defaultText:nil
+                         completion:^(BOOL, NSString*) {
+                           if (completionHandler) {
+                             completionHandler();
+                           }
+                         }];
   }
 }
 
 - (void)webView:(WKWebView*)webView
     runJavaScriptConfirmPanelWithMessage:(NSString*)message
                         initiatedByFrame:(WKFrameInfo*)frame
                        completionHandler:
                            (void (^)(BOOL result))completionHandler {
   if (self.shouldSuppressDialogs) {
     [self didSuppressDialog];
     completionHandler(NO);
     return;
   }
 
   SEL confirmationSelector = @selector(webController:
                 runJavaScriptConfirmPanelWithMessage:
                                           requestURL:
                                    completionHandler:);
   if ([self.UIDelegate respondsToSelector:confirmationSelector]) {
     [self.UIDelegate webController:self
         runJavaScriptConfirmPanelWithMessage:message
                                   requestURL:net::GURLWithNSURL(
                                                  frame.request.URL)
                            completionHandler:completionHandler];
-  } else if (completionHandler) {
-    completionHandler(NO);
+  } else {
+    [self runJavaScriptDialogOfType:web::JAVASCRIPT_DIALOG_TYPE_CONFIRM
+                   initiatedByFrame:frame
+                            message:message
+                        defaultText:nil
+                         completion:^(BOOL success, NSString*) {
+                           if (completionHandler) {
+                             completionHandler(success);
+                           }
+                         }];
   }
 }
 
 - (void)webView:(WKWebView*)webView
     runJavaScriptTextInputPanelWithPrompt:(NSString*)prompt
                               defaultText:(NSString*)defaultText
                          initiatedByFrame:(WKFrameInfo*)frame
                         completionHandler:
                             (void (^)(NSString* result))completionHandler {
   GURL origin(web::GURLOriginWithWKSecurityOrigin(frame.securityOrigin));
@@ skipping 16 matching lines @@
                                       defaultText:
                                        requestURL:
                                 completionHandler:);
   if ([self.UIDelegate respondsToSelector:textInputSelector]) {
     GURL requestURL = net::GURLWithNSURL(frame.request.URL);
     [self.UIDelegate webController:self
         runJavaScriptTextInputPanelWithPrompt:prompt
                                   defaultText:defaultText
                                    requestURL:requestURL
                             completionHandler:completionHandler];
-  } else if (completionHandler) {
-    completionHandler(nil);
+  } else {
+    [self runJavaScriptDialogOfType:web::JAVASCRIPT_DIALOG_TYPE_PROMPT
+                   initiatedByFrame:frame
+                            message:prompt
+                        defaultText:defaultText
+                         completion:^(BOOL, NSString* input) {
+                           if (completionHandler) {
+                             completionHandler(input);
+                           }
+                         }];
   }
 }
 
 #pragma mark -
 #pragma mark WKNavigationDelegate Methods
 
 - (void)webView:(WKWebView*)webView
     decidePolicyForNavigationAction:(WKNavigationAction*)action
                     decisionHandler:
                         (void (^)(WKNavigationActionPolicy))decisionHandler {
@@ skipping 676 matching lines @@
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 @end