[Tizen] Change API AddJavaScriptInterface to AddJavaScriptMessageHandler for LWE accepted/tizen/unified/20190130.151720 submit/tizen/20190129.092718 submit/tizen/20190130.054421
authorJiyun Yang <ji.yang@samsung.com>
Tue, 29 Jan 2019 06:22:07 +0000 (15:22 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Tue, 29 Jan 2019 06:22:07 +0000 (15:22 +0900)
This reverts commit f48481faf36eb314df170984a6ac5b5d996126b3.

dali-extension/web-engine-lite/tizen-web-engine-lite.cpp
dali-extension/web-engine-lite/tizen-web-engine-lite.h

index 0ef0afd..f3cd281 100644 (file)
@@ -558,16 +558,13 @@ void TizenWebEngineLite::EvaluateJavaScript( const std::string& script )
   mWebContainer->EvaluateJavaScript( script );
 }
 
-void TizenWebEngineLite::AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > callback )
+void TizenWebEngineLite::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void(const std::string&) > callback )
 {
   DALI_ASSERT_ALWAYS( mWebContainer );
-  mWebContainer->AddJavaScriptInterface( exposedObjectName, jsFunctionName, callback );
-}
-
-void TizenWebEngineLite::RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName )
-{
-  DALI_ASSERT_ALWAYS( mWebContainer );
-  mWebContainer->RemoveJavascriptInterface( exposedObjectName, jsFunctionName );
+  mWebContainer->AddJavaScriptInterface( exposedObjectName, "postMessage", [callback]( const std::string& data )->std::string {
+    callback( data );
+    return "";
+  } );
 }
 
 void TizenWebEngineLite::ClearHistory()
index 44143a3..736a54b 100644 (file)
@@ -125,9 +125,9 @@ public:
   virtual bool CanGoForward();
 
   /**
-   * @copydoc Dali::WebEnginePlugin::AddJavaScriptInterface()
+   * @copydoc Dali::WebEnginePlugin::AddJavaScriptMessageHandler()
    */
-  virtual void AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb );
+  virtual void AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler );
 
   /**
    * @copydoc Dali::WebEnginePlugin::EvaluateJavaScript()
@@ -135,11 +135,6 @@ 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();