break dependency to ewk_view.h callbacks

callback declarations moved to tw_callbacks.h

Issue: CBEFL-92
Change-Id: I78950c69a8d95e2fe37d22e6c78cde4d3ce867cd
Signed-off-by: SeungSeop Park <sns.park@samsung.com>

diff --git a/tizen_src/ewk_api_headers/public/ewk_view.h b/tizen_src/ewk_api_headers/public/ewk_view.h
index 7fcd29f..83d4461 100644 (file)
--- a/tizen_src/ewk_api_headers/public/ewk_view.h
+++ b/tizen_src/ewk_api_headers/public/ewk_view.h
@@ -161,32 +161,6 @@ struct Ewk_View_Smart_Class {
     Eina_Bool (*window_geometry_get)(Ewk_View_Smart_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *width, Evas_Coord *height)  __attribute__((deprecated));
 };
 
-// #if PLATFORM(TIZEN)
-/**
- * Callback for ewk_view_web_app_capable_get
- *
- * @param capable web application capable
- * @param user_data user_data will be passsed when ewk_view_web_app_capable_get is called
- */
-typedef void (*Ewk_Web_App_Capable_Get_Callback)(Eina_Bool capable, void* user_data);
-
-/**
- * Callback for ewk_view_web_app_icon_get
- *
- * @param icon_url web application icon
- * @param user_data user_data will be passsed when ewk_view_web_app_icon_get is called
- */
-typedef void (*Ewk_Web_App_Icon_URL_Get_Callback)(const char* icon_url, void* user_data);
-
-/**
- * Callback for ewk_view_web_app_icon_urls_get.
- *
- * @param icon_urls list of Ewk_Web_App_Icon_Data for web app
- * @param user_data user_data will be passsed when ewk_view_web_app_icon_urls_get is called
- */
-typedef void (*Ewk_Web_App_Icon_URLs_Get_Callback)(Eina_List *icon_urls, void *user_data);
-// #endif
-
 /**
  * The version you have to put into the version field
  * in the @a Ewk_View_Smart_Class structure.
@@ -258,68 +232,6 @@ struct Ewk_View_Smart_Data {
     } changed;
 };
 
-/**
- * Callback for ewk_view_script_execute
- *
- * @param o the view object
- * @param result_value value returned by script
- * @param user_data user data
- */
-typedef void (*Ewk_View_Script_Execute_Callback)(Evas_Object* o, const char* result_value, void* user_data);
-
-/**
- * Callback for ewk_view_plain_text_get
- *
- * @param o the view object
- * @param plain_text the contents of the given frame converted to plain text
- * @param user_data user data
- */
-typedef void (*Ewk_View_Plain_Text_Get_Callback)(Evas_Object* o, const char* plain_text, void* user_data);
-
-/**
- * Creates a type name for the callback function used to get the page contents.
- *
- * @param o view object
- * @param data mhtml data of the page contents
- * @param user_data user data will be passed when ewk_view_mhtml_data_get is called
- */
-typedef void (*Ewk_View_MHTML_Data_Get_Callback)(Evas_Object *o, const char *data, void *user_data);
-
-
-
-typedef Eina_Bool (*Ewk_View_Password_Confirm_Popup_Callback)(Evas_Object* o, const char* message, void* user_data);
-
-typedef Eina_Bool (*Ewk_View_JavaScript_Alert_Callback)(Evas_Object* o, const char* alert_text, void* user_data);
-
-
-typedef Eina_Bool (*Ewk_View_JavaScript_Confirm_Callback)(Evas_Object* o, const char* message, void* user_data);
-/**
- * Callback for ewk_view_javascript_prompt_callback_set
- *
- * @param o the view object
- * @param message the text to be displayed on the prompt popup
- * @param default_value default text to be entered in the prompt dialog
- * @param user_data user data
- */
-typedef Eina_Bool (*Ewk_View_JavaScript_Prompt_Callback)(Evas_Object* o, const char* message, const char* default_value, void* user_data);
-
-
-//#if ENABLE(TIZEN_SUPPORT_BEFORE_UNLOAD_CONFIRM_PANEL)
-typedef Eina_Bool (*Ewk_View_Before_Unload_Confirm_Panel_Callback)(Evas_Object* o, const char* message, void* user_data);
-
-//#if ENABLE(TIZEN_APPLICATION_CACHE)
-typedef Eina_Bool (*Ewk_View_Applicacion_Cache_Permission_Callback)(Evas_Object* o, Ewk_Security_Origin* origin,  void* user_data);
-
-typedef Eina_Bool (*Ewk_View_Exceeded_Indexed_Database_Quota_Callback)(Evas_Object* o, Ewk_Security_Origin* origin, long long currentQuota, void* user_data);
-
-
-typedef Eina_Bool (*Ewk_View_Exceeded_Database_Quota_Callback)(Evas_Object* o, Ewk_Security_Origin* origin, const char* database_name, unsigned long long expectedQuota, void* user_data);
-
-typedef Eina_Bool (*Ewk_View_Exceeded_Local_File_System_Quota_Callback)(Evas_Object* o, Ewk_Security_Origin* origin, long long currentQuota, void* user_data);
-
-
-typedef Eina_Bool (*Ewk_Orientation_Lock_Cb)(Evas_Object* o, Eina_Bool need_lock, int orientation, void* user_data);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/tizen_src/impl/browser/javascript_dialog_manager_efl.cc b/tizen_src/impl/browser/javascript_dialog_manager_efl.cc
old mode 100755 (executable)
new mode 100644 (file)
index b3d52c2..6b6a720
--- a/tizen_src/impl/browser/javascript_dialog_manager_efl.cc
+++ b/tizen_src/impl/browser/javascript_dialog_manager_efl.cc
@@ -36,7 +36,7 @@ bool JavaScriptModalCallbacksData::Run(Evas_Object* obj, const char* message_tex
 }
 
 JavaScriptModalCallbacksData* JavaScriptModalCallbacksData::CreateWithAlertDialogData(
-    Ewk_View_JavaScript_Alert_Callback callback,
+    tizen_webview::View_JavaScript_Alert_Callback callback,
     void* user_data)
 {
   JavaScriptModalCallbacksData* callback_data = new JavaScriptModalCallbacksData(
@@ -46,7 +46,7 @@ JavaScriptModalCallbacksData* JavaScriptModalCallbacksData::CreateWithAlertDialo
 }
 
 JavaScriptModalCallbacksData* JavaScriptModalCallbacksData::CreateWithConfirmDialogData(
-    Ewk_View_JavaScript_Confirm_Callback callback,
+    tizen_webview::View_JavaScript_Confirm_Callback callback,
     void* user_data)
 {
   JavaScriptModalCallbacksData* callback_data = new JavaScriptModalCallbacksData(
@@ -56,7 +56,7 @@ JavaScriptModalCallbacksData* JavaScriptModalCallbacksData::CreateWithConfirmDia
 }
 
 JavaScriptModalCallbacksData* JavaScriptModalCallbacksData::CreateWithPromptDialogData(
-    Ewk_View_JavaScript_Prompt_Callback callback,
+    tizen_webview::View_JavaScript_Prompt_Callback callback,
     void* user_data)
 {
   JavaScriptModalCallbacksData* callback_data = new JavaScriptModalCallbacksData(
@@ -115,17 +115,17 @@ void JavaScriptDialogManagerEfl::RunJavaScriptDialog(content::WebContents* web_c
   dialog_ = JavaScriptModalDialogEfl::CreateDialog(web_contents, origin_url, accept_lang, javascript_message_type, message_text, default_prompt_text, callback);
 }
 
-void JavaScriptDialogManagerEfl::SetAlertCallback(Ewk_View_JavaScript_Alert_Callback callback, void* user_data)
+void JavaScriptDialogManagerEfl::SetAlertCallback(tizen_webview::View_JavaScript_Alert_Callback callback, void* user_data)
 {
   alert_callback_data_.reset(JavaScriptModalCallbacksData::CreateWithAlertDialogData(callback, user_data));
 }
 
-void JavaScriptDialogManagerEfl::SetConfirmCallback(Ewk_View_JavaScript_Confirm_Callback callback, void* user_data)
+void JavaScriptDialogManagerEfl::SetConfirmCallback(tizen_webview::View_JavaScript_Confirm_Callback callback, void* user_data)
 {
   confirm_callback_data_.reset(JavaScriptModalCallbacksData::CreateWithConfirmDialogData(callback, user_data));
 }
 
-void JavaScriptDialogManagerEfl::SetPromptCallback(Ewk_View_JavaScript_Prompt_Callback callback, void* user_data)
+void JavaScriptDialogManagerEfl::SetPromptCallback(tizen_webview::View_JavaScript_Prompt_Callback callback, void* user_data)
 {
   prompt_callback_data_.reset(JavaScriptModalCallbacksData::CreateWithPromptDialogData(callback, user_data));
 }

diff --git a/tizen_src/impl/browser/javascript_dialog_manager_efl.h b/tizen_src/impl/browser/javascript_dialog_manager_efl.h
index a9da516..ef3085b 100644 (file)
--- a/tizen_src/impl/browser/javascript_dialog_manager_efl.h
+++ b/tizen_src/impl/browser/javascript_dialog_manager_efl.h
@@ -9,6 +9,8 @@
 #include "public/ewk_view.h"
 #include "url/gurl.h"
 
+#include "tizen_webview/public/tw_content_security_policy.h"
+
 namespace content{
 class WebContents;
 }
@@ -17,20 +19,20 @@ class JavaScriptModalDialogEfl;
 class JavaScriptModalCallbacksData {
  public:
   bool Run(Evas_Object* obj, const char* content_text, const char* default_text);
-  static JavaScriptModalCallbacksData* CreateWithAlertDialogData(Ewk_View_JavaScript_Alert_Callback callback,
+  static JavaScriptModalCallbacksData* CreateWithAlertDialogData(tizen_webview::View_JavaScript_Alert_Callback callback,
                                                           void* user_data);
-  static JavaScriptModalCallbacksData* CreateWithConfirmDialogData(Ewk_View_JavaScript_Confirm_Callback callback,
+  static JavaScriptModalCallbacksData* CreateWithConfirmDialogData(tizen_webview::View_JavaScript_Confirm_Callback callback,
                                                             void* user_data);
-  static JavaScriptModalCallbacksData* CreateWithPromptDialogData(Ewk_View_JavaScript_Prompt_Callback callback,
+  static JavaScriptModalCallbacksData* CreateWithPromptDialogData(tizen_webview::View_JavaScript_Prompt_Callback callback,
                                                            void* user_data);
   ~JavaScriptModalCallbacksData() { }
 
  private:
   JavaScriptModalCallbacksData(content::JavaScriptMessageType javascript_message_type, void* user_data);
   union {
-    Ewk_View_JavaScript_Alert_Callback alert_callback_;
-    Ewk_View_JavaScript_Confirm_Callback confirm_callback_;
-    Ewk_View_JavaScript_Prompt_Callback prompt_callback_;
+    tizen_webview::View_JavaScript_Alert_Callback alert_callback_;
+    tizen_webview::View_JavaScript_Confirm_Callback confirm_callback_;
+    tizen_webview::View_JavaScript_Prompt_Callback prompt_callback_;
   };
   void* user_data_;
   content::JavaScriptMessageType javascript_message_type_;
@@ -74,9 +76,9 @@ class JavaScriptDialogManagerEfl: public content::JavaScriptDialogManager {
     NOTIMPLEMENTED();
   }
 
-  void SetAlertCallback(Ewk_View_JavaScript_Alert_Callback callback, void* user_data);
-  void SetConfirmCallback(Ewk_View_JavaScript_Confirm_Callback callback, void* user_data);
-  void SetPromptCallback(Ewk_View_JavaScript_Prompt_Callback callback, void* user_data);
+  void SetAlertCallback(tizen_webview::View_JavaScript_Alert_Callback callback, void* user_data);
+  void SetConfirmCallback(tizen_webview::View_JavaScript_Confirm_Callback callback, void* user_data);
+  void SetPromptCallback(tizen_webview::View_JavaScript_Prompt_Callback callback, void* user_data);
   void ExecuteDialogClosedCallBack(bool result, const std::string prompt_data);
 
  private:

diff --git a/tizen_src/impl/eweb_view.cc b/tizen_src/impl/eweb_view.cc
index 28c5cdd..1dcb741 100644 (file)
--- a/tizen_src/impl/eweb_view.cc
+++ b/tizen_src/impl/eweb_view.cc
@@ -575,7 +575,7 @@ void EWebView::SendOrientationChangeEventIfNeeded(int orientation) {
 #endif
 }
 
-void EWebView::SetOrientationLockCallback(Ewk_Orientation_Lock_Cb func, void* data) {
+void EWebView::SetOrientationLockCallback(tizen_webview::Orientation_Lock_Cb func, void* data) {
   orientation_lock_callback_.reset(new OrientationLockCallback(func, data));
 }
 
@@ -1042,12 +1042,12 @@ namespace {
 
 class JavaScriptCallbackDetails {
  public:
-  JavaScriptCallbackDetails(Ewk_View_Script_Execute_Callback callback_func, void *user_data, Evas_Object* view)
+  JavaScriptCallbackDetails(tizen_webview::View_Script_Execute_Callback callback_func, void *user_data, Evas_Object* view)
     : callback_func_(callback_func)
     , user_data_(user_data)
     , view_(view) {}
 
-  Ewk_View_Script_Execute_Callback callback_func_;
+  tizen_webview::View_Script_Execute_Callback callback_func_;
   void *user_data_;
   Evas_Object* view_;
 };
@@ -1063,7 +1063,7 @@ void JavaScriptComplete(JavaScriptCallbackDetails* script_callback_data, const b
 
 } //namespace
 
-bool EWebView::ExecuteJavaScript(const char* script, Ewk_View_Script_Execute_Callback callback, void* userdata) {
+bool EWebView::ExecuteJavaScript(const char* script, tizen_webview::View_Script_Execute_Callback callback, void* userdata) {
   if (!script)
     return false;
 
@@ -1569,7 +1569,7 @@ void EWebView::InvokeBackForwardListChangedCallback() {
   SmartCallback<EWebViewCallbacks::BackForwardListChange>().call();
 }
 
-bool EWebView::WebAppCapableGet(Ewk_Web_App_Capable_Get_Callback callback, void *userData) {
+bool EWebView::WebAppCapableGet(tizen_webview::Web_App_Capable_Get_Callback callback, void *userData) {
   RenderViewHost *renderViewHost = web_contents_delegate()->web_contents()->GetRenderViewHost();
   if (!renderViewHost) {
     return false;
@@ -1579,7 +1579,7 @@ bool EWebView::WebAppCapableGet(Ewk_Web_App_Capable_Get_Callback callback, void
   return renderViewHost->Send(new EwkViewMsg_WebAppCapableGet(renderViewHost->GetRoutingID(), callbackId));
 }
 
-bool EWebView::WebAppIconUrlGet(Ewk_Web_App_Icon_URL_Get_Callback callback, void* userData) {
+bool EWebView::WebAppIconUrlGet(tizen_webview::Web_App_Icon_URL_Get_Callback callback, void *userData) {
   RenderViewHost* renderViewHost = web_contents_delegate()->web_contents()->GetRenderViewHost();
   if (!renderViewHost) {
     return false;
@@ -1589,7 +1589,7 @@ bool EWebView::WebAppIconUrlGet(Ewk_Web_App_Icon_URL_Get_Callback callback, void
   return renderViewHost->Send(new EwkViewMsg_WebAppIconUrlGet(renderViewHost->GetRoutingID(), callbackId));
 }
 
-bool EWebView::WebAppIconUrlsGet(Ewk_Web_App_Icon_URLs_Get_Callback callback, void *userData) {
+bool EWebView::WebAppIconUrlsGet(tizen_webview::Web_App_Icon_URLs_Get_Callback callback, void *userData) {
   RenderViewHost* renderViewHost = web_contents_delegate()->web_contents()->GetRenderViewHost();
   if (!renderViewHost) {
     return false;
@@ -1661,12 +1661,12 @@ void EwkViewPlainTextGetCallback::TriggerCallback(Evas_Object* obj, const std::s
     (callback_)(obj, content_text.c_str(), user_data_);
 }
 
-int EWebView::SetEwkViewPlainTextGetCallback(Ewk_View_Plain_Text_Get_Callback callback, void* user_data) {
+int EWebView::SetEwkViewPlainTextGetCallback(tizen_webview::View_Plain_Text_Get_Callback callback, void* user_data) {
   EwkViewPlainTextGetCallback* view_plain_text_callback_ptr = new EwkViewPlainTextGetCallback(callback, user_data);
   return plain_text_get_callback_map_.Add(view_plain_text_callback_ptr);
 }
 
-bool EWebView::PlainTextGet(Ewk_View_Plain_Text_Get_Callback callback, void* user_data) {
+bool EWebView::PlainTextGet(tizen_webview::View_Plain_Text_Get_Callback callback, void* user_data) {
   RenderViewHost* render_view_host = web_contents_delegate()->web_contents()->GetRenderViewHost();
   if (!render_view_host)
     return false;
@@ -1706,7 +1706,7 @@ bool EWebView::SaveAsPdf(int width, int height, const std::string& filename) {
       width, height, base::FilePath(filename)));
 }
 
-bool EWebView::GetMHTMLData(Ewk_View_MHTML_Data_Get_Callback callback, void* user_data) {
+bool EWebView::GetMHTMLData(tizen_webview::View_MHTML_Data_Get_Callback callback, void* user_data) {
   RenderViewHost* render_view_host = web_contents_delegate()->web_contents()->GetRenderViewHost();
   if (!render_view_host)
     return false;
@@ -1752,7 +1752,7 @@ inline JavaScriptDialogManagerEfl* EWebView::GetJavaScriptDialogManagerEfl() {
   return static_cast<JavaScriptDialogManagerEfl*>(web_contents_delegate()->GetJavaScriptDialogManager());
 }
 
-void EWebView::SetJavaScriptAlertCallback(Ewk_View_JavaScript_Alert_Callback callback, void* user_data) {
+void EWebView::SetJavaScriptAlertCallback(tizen_webview::View_JavaScript_Alert_Callback callback, void* user_data) {
   GetJavaScriptDialogManagerEfl()->SetAlertCallback(callback, user_data);
 }
 
@@ -1767,7 +1767,7 @@ void EWebView::JavaScriptAlertReply() {
   SmartCallback<EWebViewCallbacks::PopupReplyWaitFinish>().call(0);
 }
 
-void EWebView::SetJavaScriptConfirmCallback(Ewk_View_JavaScript_Confirm_Callback callback, void* user_data) {
+void EWebView::SetJavaScriptConfirmCallback(tizen_webview::View_JavaScript_Confirm_Callback callback, void* user_data) {
   GetJavaScriptDialogManagerEfl()->SetConfirmCallback(callback, user_data);
 }
 
@@ -1776,7 +1776,7 @@ void EWebView::JavaScriptConfirmReply(bool result) {
   SmartCallback<EWebViewCallbacks::PopupReplyWaitFinish>().call(0);
 }
 
-void EWebView::SetJavaScriptPromptCallback(Ewk_View_JavaScript_Prompt_Callback callback, void* user_data) {
+void EWebView::SetJavaScriptPromptCallback(tizen_webview::View_JavaScript_Prompt_Callback callback, void* user_data) {
   GetJavaScriptDialogManagerEfl()->SetPromptCallback(callback, user_data);
 }
 

diff --git a/tizen_src/impl/eweb_view.h b/tizen_src/impl/eweb_view.h
index 6950040..0768738 100644 (file)
--- a/tizen_src/impl/eweb_view.h
+++ b/tizen_src/impl/eweb_view.h
@@ -73,6 +73,7 @@
 
 #include "tizen_webview/public/tw_hit_test.h"
 #include "tizen_webview/public/tw_touch_event.h"
+#include "tizen_webview/public/tw_callbacks.h"
 #include "tizen_webview/public/tw_content_security_policy.h"
 #include "tizen_webview/public/tw_input_type.h"
 #include "tizen_webview/public/tw_find_options.h"
@@ -101,44 +102,44 @@ class Hit_Test;
 
 class EwkViewPlainTextGetCallback {
  public:
-  EwkViewPlainTextGetCallback(Ewk_View_Plain_Text_Get_Callback callback,
+  EwkViewPlainTextGetCallback(tizen_webview::View_Plain_Text_Get_Callback callback,
                               void* user_data)
     : callback_(callback), user_data_(user_data)
     { }
   void TriggerCallback(Evas_Object* obj, const std::string& content_text);
 
  private:
-  Ewk_View_Plain_Text_Get_Callback callback_;
+  tizen_webview::View_Plain_Text_Get_Callback callback_;
   void* user_data_;
 };
 
 class OrientationLockCallback {
  public:
-  OrientationLockCallback(Ewk_Orientation_Lock_Cb lock,
+  OrientationLockCallback(tizen_webview::Orientation_Lock_Cb lock,
                           void* user_data)
     : lock_(lock),
       user_data_(user_data)
     {}
   private:
-    Ewk_Orientation_Lock_Cb lock_;
+    tizen_webview::Orientation_Lock_Cb lock_;
     void* user_data_;
 };
 
 class MHTMLCallbackDetails {
  public:
-  MHTMLCallbackDetails(Ewk_View_MHTML_Data_Get_Callback callback_func, void *user_data)
+  MHTMLCallbackDetails(tizen_webview::View_MHTML_Data_Get_Callback callback_func, void *user_data)
     : callback_func_(callback_func),
       user_data_(user_data)
   {}
   void Run(Evas_Object* obj, const std::string& mhtml_content);
 
-  Ewk_View_MHTML_Data_Get_Callback callback_func_;
+  tizen_webview::View_MHTML_Data_Get_Callback callback_func_;
   void *user_data_;
 };
 
 class WebApplicationIconUrlGetCallback {
  public:
-  WebApplicationIconUrlGetCallback(Ewk_Web_App_Icon_URL_Get_Callback func, void *user_data)
+  WebApplicationIconUrlGetCallback(tizen_webview::Web_App_Icon_URL_Get_Callback func, void *user_data)
     : func_(func), user_data_(user_data)
   {}
   void Run(const std::string &url) {
@@ -148,13 +149,13 @@ class WebApplicationIconUrlGetCallback {
   }
 
  private:
-  Ewk_Web_App_Icon_URL_Get_Callback func_;
+  tizen_webview::Web_App_Icon_URL_Get_Callback func_;
   void *user_data_;
 };
 
 class WebApplicationIconUrlsGetCallback {
  public:
-  WebApplicationIconUrlsGetCallback(Ewk_Web_App_Icon_URLs_Get_Callback func, void *user_data)
+  WebApplicationIconUrlsGetCallback(tizen_webview::Web_App_Icon_URLs_Get_Callback func, void *user_data)
     : func_(func), user_data_(user_data)
   {}
   void Run(const std::map<std::string, std::string> &urls) {
@@ -169,13 +170,13 @@ class WebApplicationIconUrlsGetCallback {
   }
 
  private:
-  Ewk_Web_App_Icon_URLs_Get_Callback func_;
+  tizen_webview::Web_App_Icon_URLs_Get_Callback func_;
   void *user_data_;
 };
 
 class WebApplicationCapableGetCallback {
  public:
-  WebApplicationCapableGetCallback(Ewk_Web_App_Capable_Get_Callback func, void *user_data)
+  WebApplicationCapableGetCallback(tizen_webview::Web_App_Capable_Get_Callback func, void *user_data)
     : func_(func), user_data_(user_data)
   {}
   void Run(bool capable) {
@@ -185,7 +186,7 @@ class WebApplicationCapableGetCallback {
   }
 
  private:
-  Ewk_Web_App_Capable_Get_Callback func_;
+  tizen_webview::Web_App_Capable_Get_Callback func_;
   void *user_data_;
 };
 
@@ -238,7 +239,7 @@ class EWebView
   void SetTextZoomFactor(double text_zoom_factor);
   void ExecuteEditCommand(const char* command, const char* value);
   void SendOrientationChangeEventIfNeeded(int orientation);
-  void SetOrientationLockCallback(Ewk_Orientation_Lock_Cb func, void* data);
+  void SetOrientationLockCallback(tizen_webview::Orientation_Lock_Cb func, void* data);
   bool TouchEventsEnabled() const;
   void SetTouchEventsEnabled(bool enabled);
   bool MouseEventsEnabled() const;
@@ -246,7 +247,7 @@ class EWebView
   void HandleTouchEvents(tizen_webview::Touch_Event_Type type, const Eina_List *points, const Evas_Modifier *modifiers);
   void Show();
   void Hide();
-  bool ExecuteJavaScript(const char* script, Ewk_View_Script_Execute_Callback callback, void* userdata);
+  bool ExecuteJavaScript(const char* script, tizen_webview::View_Script_Execute_Callback callback, void* userdata);
   bool SetUserAgent(const char* userAgent);
   bool SetUserAgentAppName(const char* application_name);
   const char* GetUserAgent() const;
@@ -306,9 +307,9 @@ class EWebView
   void UpdateHitTestData(const _Ewk_Hit_Test& hit_test_data, const NodeAttributesMap& node_attributes);
 
   int current_find_request_id() const { return current_find_request_id_; }
-  bool PlainTextGet(Ewk_View_Plain_Text_Get_Callback callback, void* user_data);
+  bool PlainTextGet(tizen_webview::View_Plain_Text_Get_Callback callback, void* user_data);
   void InvokePlainTextGetCallback(const std::string& content_text, int plain_text_get_callback_id);
-  int SetEwkViewPlainTextGetCallback(Ewk_View_Plain_Text_Get_Callback callback, void* user_data);
+  int SetEwkViewPlainTextGetCallback(tizen_webview::View_Plain_Text_Get_Callback callback, void* user_data);
   void DidChangeContentsSize(int width, int height);
   const Eina_Rectangle GetContentsSize() const;
   void GetScrollSize(int* w, int* h);
@@ -319,24 +320,24 @@ class EWebView
   bool SaveAsPdf(int width, int height, const std::string& file_name);
   void BackForwardListClear();
   void InvokeBackForwardListChangedCallback();
-  bool WebAppCapableGet(Ewk_Web_App_Capable_Get_Callback callback, void *userData);
-  bool WebAppIconUrlGet(Ewk_Web_App_Icon_URL_Get_Callback callback, void *userData);
-  bool WebAppIconUrlsGet(Ewk_Web_App_Icon_URLs_Get_Callback callback, void *userData);
+  bool WebAppCapableGet(tizen_webview::Web_App_Capable_Get_Callback callback, void *userData);
+  bool WebAppIconUrlGet(tizen_webview::Web_App_Icon_URL_Get_Callback callback, void *userData);
+  bool WebAppIconUrlsGet(tizen_webview::Web_App_Icon_URLs_Get_Callback callback, void *userData);
   void InvokeWebAppCapableGetCallback(bool capable, int callbackId);
   void InvokeWebAppIconUrlGetCallback(const std::string &iconUrl, int callbackId);
   void InvokeWebAppIconUrlsGetCallback(const std::map<std::string, std::string> &iconUrls, int callbackId);
 
-  bool GetMHTMLData(Ewk_View_MHTML_Data_Get_Callback callback, void* user_data);
+  bool GetMHTMLData(tizen_webview::View_MHTML_Data_Get_Callback callback, void* user_data);
   void OnMHTMLContentGet(const std::string& mhtml_content, int callback_id);
   bool IsFullscreen();
   void ExitFullscreen();
   double GetScale();
   void DidChangePageScaleFactor(double scale_factor);
-  void SetJavaScriptAlertCallback(Ewk_View_JavaScript_Alert_Callback callback, void* user_data);
+  void SetJavaScriptAlertCallback(tizen_webview::View_JavaScript_Alert_Callback callback, void* user_data);
   void JavaScriptAlertReply();
-  void SetJavaScriptConfirmCallback(Ewk_View_JavaScript_Confirm_Callback callback, void* user_data);
+  void SetJavaScriptConfirmCallback(tizen_webview::View_JavaScript_Confirm_Callback callback, void* user_data);
   void JavaScriptConfirmReply(bool result);
-  void SetJavaScriptPromptCallback(Ewk_View_JavaScript_Prompt_Callback callback, void* user_data);
+  void SetJavaScriptPromptCallback(tizen_webview::View_JavaScript_Prompt_Callback callback, void* user_data);
   void JavaScriptPromptReply(const char* result);
   void set_renderer_crashed();
   void GetPageScaleRange(double *min_scale, double *max_scale);

diff --git a/tizen_src/impl/tizen_webview/public/tw_callbacks.h b/tizen_src/impl/tizen_webview/public/tw_callbacks.h
index 09651ba..37a8eec 100644 (file)
--- a/tizen_src/impl/tizen_webview/public/tw_callbacks.h
+++ b/tizen_src/impl/tizen_webview/public/tw_callbacks.h
@@ -9,6 +9,8 @@
 
 namespace tizen_webview {
 
+class Security_Origin;
+
 // from ewk_context.h
 typedef void (*Local_File_System_Origins_Get_Callback)(Eina_List *origins, void *user_data);
 typedef void (*Web_Application_Cache_Origins_Get_Callback)(Eina_List* origins, void* user_data);
@@ -19,6 +21,76 @@ typedef void (*Context_Did_Start_Download_Callback)(const char* download_url, vo
 typedef void (*Vibration_Client_Vibrate_Cb)(uint64_t vibration_time, void *user_data);
 typedef void (*Vibration_Client_Vibration_Cancel_Cb)(void *user_data);
 
+/**
+ * Callback for ewk_view_web_app_capable_get
+ *
+ * @param capable web application capable
+ * @param user_data user_data will be passsed when ewk_view_web_app_capable_get is called
+ */
+typedef void (*Web_App_Capable_Get_Callback)(Eina_Bool capable, void* user_data);
+
+/**
+ * Callback for ewk_view_web_app_icon_get
+ *
+ * @param icon_url web application icon
+ * @param user_data user_data will be passsed when ewk_view_web_app_icon_get is called
+ */
+typedef void (*Web_App_Icon_URL_Get_Callback)(const char* icon_url, void* user_data);
+
+/**
+ * Callback for ewk_view_web_app_icon_urls_get.
+ *
+ * @param icon_urls list of Ewk_Web_App_Icon_Data for web app
+ * @param user_data user_data will be passsed when ewk_view_web_app_icon_urls_get is called
+ */
+typedef void (*Web_App_Icon_URLs_Get_Callback)(Eina_List *icon_urls, void *user_data);
+
+/**
+ * Callback for ewk_view_script_execute
+ *
+ * @param o the view object
+ * @param result_value value returned by script
+ * @param user_data user data
+ */
+typedef void (*View_Script_Execute_Callback)(Evas_Object* o, const char* result_value, void* user_data);
+
+/**
+ * Callback for ewk_view_plain_text_get
+ *
+ * @param o the view object
+ * @param plain_text the contents of the given frame converted to plain text
+ * @param user_data user data
+ */
+typedef void (*View_Plain_Text_Get_Callback)(Evas_Object* o, const char* plain_text, void* user_data);
+
+/**
+ * Creates a type name for the callback function used to get the page contents.
+ *
+ * @param o view object
+ * @param data mhtml data of the page contents
+ * @param user_data user data will be passed when ewk_view_mhtml_data_get is called
+ */
+typedef void (*View_MHTML_Data_Get_Callback)(Evas_Object *o, const char *data, void *user_data);
+
+
+//typedef Eina_Bool (*View_Password_Confirm_Popup_Callback)(Evas_Object* o, const char* message, void* user_data);
+typedef Eina_Bool (*View_JavaScript_Alert_Callback)(Evas_Object* o, const char* alert_text, void* user_data);
+typedef Eina_Bool (*View_JavaScript_Confirm_Callback)(Evas_Object* o, const char* message, void* user_data);
+/**
+ * Callback for ewk_view_javascript_prompt_callback_set
+ *
+ * @param o the view object
+ * @param message the text to be displayed on the prompt popup
+ * @param default_value default text to be entered in the prompt dialog
+ * @param user_data user data
+ */
+typedef Eina_Bool (*View_JavaScript_Prompt_Callback)(Evas_Object* o, const char* message, const char* default_value, void* user_data);
+//typedef Eina_Bool (*View_Before_Unload_Confirm_Panel_Callback)(Evas_Object* o, const char* message, void* user_data);
+//typedef Eina_Bool (*View_Applicacion_Cache_Permission_Callback)(Evas_Object* o, Security_Origin* origin,  void* user_data);
+//typedef Eina_Bool (*View_Exceeded_Indexed_Database_Quota_Callback)(Evas_Object* o, Security_Origin* origin, long long currentQuota, void* user_data);
+//typedef Eina_Bool (*View_Exceeded_Database_Quota_Callback)(Evas_Object* o, Security_Origin* origin, const char* database_name, unsigned long long expectedQuota, void* user_data);
+//typedef Eina_Bool (*View_Exceeded_Local_File_System_Quota_Callback)(Evas_Object* o, Security_Origin* origin, long long currentQuota, void* user_data);
+typedef Eina_Bool (*Orientation_Lock_Cb)(Evas_Object* o, Eina_Bool need_lock, int orientation, void* user_data);
 } // namespace tizen_webview
 
 #endif  // TIZEN_WEBVIEW_PUBLIC_TW_CALLBACKS_H_