Revert "[Tizen] Change API AddJavaScriptInterface to AddJavaScriptMessageHandler...

This reverts commit a4910c1a611084b665c37fe51603c69f5eccd312.

diff --git a/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp b/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp
index f3cd281..0ef0afd 100644 (file)
--- a/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp
+++ b/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp
@@ -558,13 +558,16 @@ void TizenWebEngineLite::EvaluateJavaScript( const std::string& script )
   mWebContainer->EvaluateJavaScript( script );
 }
 
-void TizenWebEngineLite::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void(const std::string&) > callback )
+void TizenWebEngineLite::AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > callback )
 {
   DALI_ASSERT_ALWAYS( mWebContainer );
-  mWebContainer->AddJavaScriptInterface( exposedObjectName, "postMessage", [callback]( const std::string& data )->std::string {
-    callback( data );
-    return "";
-  } );
+  mWebContainer->AddJavaScriptInterface( exposedObjectName, jsFunctionName, callback );
+}
+
+void TizenWebEngineLite::RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName )
+{
+  DALI_ASSERT_ALWAYS( mWebContainer );
+  mWebContainer->RemoveJavascriptInterface( exposedObjectName, jsFunctionName );
 }
 
 void TizenWebEngineLite::ClearHistory()

diff --git a/dali-extension/web-engine-lite/tizen-web-engine-lite.h b/dali-extension/web-engine-lite/tizen-web-engine-lite.h
index 736a54b..44143a3 100644 (file)
--- a/dali-extension/web-engine-lite/tizen-web-engine-lite.h
+++ b/dali-extension/web-engine-lite/tizen-web-engine-lite.h
@@ -125,9 +125,9 @@ public:
   virtual bool CanGoForward();
 
   /**
-   * @copydoc Dali::WebEnginePlugin::AddJavaScriptMessageHandler()
+   * @copydoc Dali::WebEnginePlugin::AddJavaScriptInterface()
    */
-  virtual void AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler );
+  virtual void AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb );
 
   /**
    * @copydoc Dali::WebEnginePlugin::EvaluateJavaScript()
@@ -135,6 +135,11 @@ public:
   virtual void EvaluateJavaScript( const std::string& script );
 
   /**
+   * @copydoc Dali::WebEnginePlugin::RemoveJavascriptInterface()
+   */
+  virtual void RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName );
+
+  /**
    * @copydoc Dali::WebEnginePlugin::ClearHistory()
    */
   virtual void ClearHistory();