Revert "[Tizen] Add WebView's JavascriptMessageHandler callback"

This reverts commit e181317397c6cbdc542d9beee03f1bb802844078.

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
index 8dbd584..7b34419 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h
@@ -127,11 +127,6 @@ public:
   using JavaScriptMessageHandlerCallback = std::function<void(const std::string&)>;
 
   /**
-   * @brief Message result callback when JavaScript is executed with message name and body.
-   */
-  using JavaScriptEntireMessageHandlerCallback = std::function<void(const std::string&, const std::string&)>;
-
-  /**
    * @brief Alert callback when JavaScript alert is called with a message.
    *  It returns true if a pop-up is created successfully, false otherwise.
    */
@@ -495,14 +490,6 @@ public:
   virtual void AddJavaScriptMessageHandler(const std::string& exposedObjectName, JavaScriptMessageHandlerCallback handler) = 0;
 
   /**
-   * @brief Add a message handler into JavaScript.
-   *
-   * @param[in] exposedObjectName The name of exposed object
-   * @param[in] handler The callback function
-   */
-  virtual void AddJavaScriptEntireMessageHandler(const std::string& exposedObjectName, JavaScriptEntireMessageHandlerCallback handler) = 0;
-
-  /**
    * @brief Register a callback for JavaScript alert.
    *
    * @param[in] callback The callback function

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
index 3549b50..4d8fb89 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
@@ -270,11 +270,6 @@ void WebEngine::AddJavaScriptMessageHandler(const std::string& exposedObjectName
   GetImplementation(*this).AddJavaScriptMessageHandler(exposedObjectName, handler);
 }
 
-void WebEngine::AddJavaScriptEntireMessageHandler(const std::string& exposedObjectName, Dali::WebEnginePlugin::JavaScriptEntireMessageHandlerCallback handler)
-{
-  GetImplementation(*this).AddJavaScriptEntireMessageHandler(exposedObjectName, handler);
-}
-
 void WebEngine::RegisterJavaScriptAlertCallback(Dali::WebEnginePlugin::JavaScriptAlertCallback callback)
 {
   GetImplementation(*this).RegisterJavaScriptAlertCallback(callback);

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine.h b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
index 8f8a8fb..bb62795 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
@@ -371,14 +371,6 @@ public:
   void AddJavaScriptMessageHandler(const std::string& exposedObjectName, Dali::WebEnginePlugin::JavaScriptMessageHandlerCallback handler);
 
   /**
-   * @brief Add a message handler into JavaScript.
-   *
-   * @param[in] exposedObjectName The name of exposed object
-   * @param[in] handler The callback function
-   */
-  void AddJavaScriptEntireMessageHandler(const std::string& exposedObjectName, Dali::WebEnginePlugin::JavaScriptEntireMessageHandlerCallback handler);
-
-  /**
    * @brief Register a callback for JavaScript alert.
    *
    * @param[in] callback The callback function

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index a96d227..2b557f1 100644 (file)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -530,11 +530,6 @@ void WebEngine::AddJavaScriptMessageHandler(const std::string& exposedObjectName
   mPlugin->AddJavaScriptMessageHandler(exposedObjectName, handler);
 }
 
-void WebEngine::AddJavaScriptEntireMessageHandler(const std::string& exposedObjectName, Dali::WebEnginePlugin::JavaScriptEntireMessageHandlerCallback handler)
-{
-  mPlugin->AddJavaScriptEntireMessageHandler(exposedObjectName, handler);
-}
-
 void WebEngine::ClearAllTilesResources()
 {
   mPlugin->ClearAllTilesResources();

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
index 3e18f8d..e356133 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -308,11 +308,6 @@ public:
   void AddJavaScriptMessageHandler(const std::string& exposedObjectName, Dali::WebEnginePlugin::JavaScriptMessageHandlerCallback handler);
 
   /**
-   * @copydoc Dali::WebEngine::AddJavaScriptEntireMessageHandler()
-   */
-  void AddJavaScriptEntireMessageHandler(const std::string& exposedObjectName, Dali::WebEnginePlugin::JavaScriptEntireMessageHandlerCallback handler);
-
-  /**
    * @copydoc Dali::WebEngine::ClearAllTilesResources()
    */
   void ClearAllTilesResources();