From 93e1f9722bd32607c30688eebed2f8c6308ddc78 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 20 Jun 2012 19:44:45 +0000
Subject: [PATCH] Allow empty message parameters passed to CefJSDialogHandler.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@699 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/include/cef_jsdialog_handler.h           |  6 +++---
 .../cpptoc/jsdialog_handler_cpptoc.cc         | 19 +++----------------
 .../ctocpp/jsdialog_handler_ctocpp.cc         | 19 +++----------------
 3 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/cef1/include/cef_jsdialog_handler.h b/cef1/include/cef_jsdialog_handler.h
index b34261241..d3067f3c0 100644
--- a/cef1/include/cef_jsdialog_handler.h
+++ b/cef1/include/cef_jsdialog_handler.h
@@ -53,7 +53,7 @@ class CefJSDialogHandler : public virtual CefBase {
   // Called  to run a JavaScript alert message. Return false to display the
   // default alert or true if you displayed a custom alert.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=message)--*/
   virtual bool OnJSAlert(CefRefPtr<CefBrowser> browser,
                          CefRefPtr<CefFrame> frame,
                          const CefString& message) { return false; }
@@ -63,7 +63,7 @@ class CefJSDialogHandler : public virtual CefBase {
   // default alert or true if you displayed a custom alert. If you handled the
   // alert set |retval| to true if the user accepted the confirmation.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=message)--*/
   virtual bool OnJSConfirm(CefRefPtr<CefBrowser> browser,
                            CefRefPtr<CefFrame> frame,
                            const CefString& message,
@@ -75,7 +75,7 @@ class CefJSDialogHandler : public virtual CefBase {
   // the prompt set |retval| to true if the user accepted the prompt and request
   // and |result| to the resulting value.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=message,optional_param=defaultValue)--*/
   virtual bool OnJSPrompt(CefRefPtr<CefBrowser> browser,
                           CefRefPtr<CefFrame> frame,
                           const CefString& message,
diff --git a/cef1/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc b/cef1/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
index d87d94d7e..0de68df23 100644
--- a/cef1/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
+++ b/cef1/libcef_dll/cpptoc/jsdialog_handler_cpptoc.cc
@@ -33,10 +33,7 @@ int CEF_CALLBACK jsdialog_handler_on_jsalert(
   DCHECK(frame);
   if (!frame)
     return 0;
-  // Verify param: message; type: string_byref_const
-  DCHECK(message);
-  if (!message)
-    return 0;
+  // Unverified params: message
 
   // Execute
   bool _retval = CefJSDialogHandlerCppToC::Get(self)->OnJSAlert(
@@ -64,14 +61,11 @@ int CEF_CALLBACK jsdialog_handler_on_jsconfirm(
   DCHECK(frame);
   if (!frame)
     return 0;
-  // Verify param: message; type: string_byref_const
-  DCHECK(message);
-  if (!message)
-    return 0;
   // Verify param: retval; type: bool_byref
   DCHECK(retval);
   if (!retval)
     return 0;
+  // Unverified params: message
 
   // Translate param: retval; type: bool_byref
   bool retvalBool = (retval && *retval)?true:false;
@@ -108,14 +102,6 @@ int CEF_CALLBACK jsdialog_handler_on_jsprompt(
   DCHECK(frame);
   if (!frame)
     return 0;
-  // Verify param: message; type: string_byref_const
-  DCHECK(message);
-  if (!message)
-    return 0;
-  // Verify param: defaultValue; type: string_byref_const
-  DCHECK(defaultValue);
-  if (!defaultValue)
-    return 0;
   // Verify param: retval; type: bool_byref
   DCHECK(retval);
   if (!retval)
@@ -124,6 +110,7 @@ int CEF_CALLBACK jsdialog_handler_on_jsprompt(
   DCHECK(result);
   if (!result)
     return 0;
+  // Unverified params: message, defaultValue
 
   // Translate param: retval; type: bool_byref
   bool retvalBool = (retval && *retval)?true:false;
diff --git a/cef1/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc b/cef1/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc
index 41f45f0ba..f752a6996 100644
--- a/cef1/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc
+++ b/cef1/libcef_dll/ctocpp/jsdialog_handler_ctocpp.cc
@@ -32,10 +32,7 @@ bool CefJSDialogHandlerCToCpp::OnJSAlert(CefRefPtr<CefBrowser> browser,
   DCHECK(frame.get());
   if (!frame.get())
     return false;
-  // Verify param: message; type: string_byref_const
-  DCHECK(!message.empty());
-  if (message.empty())
-    return false;
+  // Unverified params: message
 
   // Execute
   int _retval = struct_->on_jsalert(struct_,
@@ -62,10 +59,7 @@ bool CefJSDialogHandlerCToCpp::OnJSConfirm(CefRefPtr<CefBrowser> browser,
   DCHECK(frame.get());
   if (!frame.get())
     return false;
-  // Verify param: message; type: string_byref_const
-  DCHECK(!message.empty());
-  if (message.empty())
-    return false;
+  // Unverified params: message
 
   // Translate param: retval; type: bool_byref
   int retvalInt = retval;
@@ -100,14 +94,7 @@ bool CefJSDialogHandlerCToCpp::OnJSPrompt(CefRefPtr<CefBrowser> browser,
   DCHECK(frame.get());
   if (!frame.get())
     return false;
-  // Verify param: message; type: string_byref_const
-  DCHECK(!message.empty());
-  if (message.empty())
-    return false;
-  // Verify param: defaultValue; type: string_byref_const
-  DCHECK(!defaultValue.empty());
-  if (defaultValue.empty())
-    return false;
+  // Unverified params: message, defaultValue
 
   // Translate param: retval; type: bool_byref
   int retvalInt = retval;