From 6a563a6d1993cd342afdccb66b1db093c56cd068 Mon Sep 17 00:00:00 2001 From: Jiyun Yang Date: Wed, 21 Nov 2018 19:49:41 +0900 Subject: [PATCH] Change WebEngine API * Rename AddJavaScriptInterface to AddJavaScriptMessageHandler * Change arguments of AddJavaScriptMessageHandler * Remove RemoveJavascriptInterface Change-Id: I53f2527b47087d93506c1b38563ad5dc0bdc3d64 Signed-off-by: Jiyun Yang --- .../adaptor-framework/web-engine-plugin.h | 29 ++++++++-------------- dali/devel-api/adaptor-framework/web-engine.cpp | 9 ++----- dali/devel-api/adaptor-framework/web-engine.h | 29 ++++++++-------------- .../internal/web-engine/common/web-engine-impl.cpp | 12 ++------- dali/internal/web-engine/common/web-engine-impl.h | 9 ++----- 5 files changed, 26 insertions(+), 62 deletions(-) diff --git a/dali/devel-api/adaptor-framework/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine-plugin.h index 215ea0d..68cdd90 100644 --- a/dali/devel-api/adaptor-framework/web-engine-plugin.h +++ b/dali/devel-api/adaptor-framework/web-engine-plugin.h @@ -129,28 +129,19 @@ public: virtual void GoBack() = 0; /** - * @brief Evaluates JavaScript code represented as a string. - * - * @param[in] script The JavaScript code - */ + * @brief Evaluates JavaScript code represented as a string. + * + * @param[in] script The JavaScript code + */ virtual void EvaluateJavaScript( const std::string& script ) = 0; /** - * @brief Adds a JavaScript interface. - * - * @param[in] exposedObjectName The name of exposed object - * @param[in] jsFunctionName The name of JavaScript function - * @param[in] cb The callback function - */ - virtual void AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb ) = 0; - - /** - * @brief Removes a JavaScript interface. - * - * @param[in] exposedObjectName The name of exposed object - * @param[in] jsFunctionName The name of JavaScript function - */ - virtual void RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName ) = 0; + * @brief Add a message handler into JavaScript. + * + * @param[in] exposedObjectName The name of exposed object + * @param[in] handler The callback function + */ + virtual void AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler ) = 0; /** * @brief Clears the history of Web. diff --git a/dali/devel-api/adaptor-framework/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine.cpp index b8921c0..9233f28 100644 --- a/dali/devel-api/adaptor-framework/web-engine.cpp +++ b/dali/devel-api/adaptor-framework/web-engine.cpp @@ -128,14 +128,9 @@ void WebEngine::EvaluateJavaScript( const std::string& script ) GetImplementation( *this ).EvaluateJavaScript( script ); } -void WebEngine::AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb ) +void WebEngine::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler ) { - GetImplementation( *this ).AddJavaScriptInterface( exposedObjectName, jsFunctionName, cb ); -} - -void WebEngine::RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName ) -{ - GetImplementation( *this ).RemoveJavascriptInterface( exposedObjectName, jsFunctionName ); + GetImplementation( *this ).AddJavaScriptMessageHandler( exposedObjectName, handler ); } void WebEngine::ClearHistory() diff --git a/dali/devel-api/adaptor-framework/web-engine.h b/dali/devel-api/adaptor-framework/web-engine.h index 12fdf73..ca0e686 100644 --- a/dali/devel-api/adaptor-framework/web-engine.h +++ b/dali/devel-api/adaptor-framework/web-engine.h @@ -163,28 +163,19 @@ public: void GoBack(); /** - * @brief Evaluates JavaScript code represented as a string. - * - * @param[in] script The JavaScript code - */ + * @brief Evaluates JavaScript code represented as a string. + * + * @param[in] script The JavaScript code + */ void EvaluateJavaScript( const std::string& script ); /** - * @brief Adds a JavaScript interface. - * - * @param[in] exposedObjectName The name of exposed object - * @param[in] jsFunctionName The name of JavaScript function - * @param[in] cb The callback function - */ - void AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb ); - - /** - * @brief Removes a JavaScript interface. - * - * @param[in] exposedObjectName The name of exposed object - * @param[in] jsFunctionName The name of JavaScript function - */ - void RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName ); + * @brief Add a message handler into JavaScript. + * + * @param[in] exposedObjectName The name of exposed object + * @param[in] handler The callback function + */ + void AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler ); /** * @brief Clears the history of Web. diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp index b727a48..526926a 100644 --- a/dali/internal/web-engine/common/web-engine-impl.cpp +++ b/dali/internal/web-engine/common/web-engine-impl.cpp @@ -259,19 +259,11 @@ void WebEngine::EvaluateJavaScript( const std::string& script ) } } -void WebEngine::AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb ) +void WebEngine::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void(const std::string&) > handler ) { if( mPlugin != NULL ) { - mPlugin->AddJavaScriptInterface( exposedObjectName, jsFunctionName, cb ); - } -} - -void WebEngine::RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName ) -{ - if( mPlugin != NULL ) - { - mPlugin->RemoveJavascriptInterface( exposedObjectName, jsFunctionName ); + mPlugin->AddJavaScriptMessageHandler( exposedObjectName, handler ); } } diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h index 90616ad..6f0a933 100644 --- a/dali/internal/web-engine/common/web-engine-impl.h +++ b/dali/internal/web-engine/common/web-engine-impl.h @@ -118,14 +118,9 @@ public: void EvaluateJavaScript( const std::string& script ); /** - * @copydoc Dali::WebEngine::AddJavaScriptInterface() + * @copydoc Dali::WebEngine::AddJavaScriptMessageHandler() */ - void AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb ); - - /** - * @copydoc Dali::WebEngine::RemoveJavascriptInterface() - */ - void RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName ); + void AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void(const std::string&) > handler ); /** * @copydoc Dali::WebEngine::ClearHistory() -- 2.7.4