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 8dbd584bd575cbf7606a79d6a89911ce15f2dcb3..7b344199632cab46ef2888018f1309506a1b44b6 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
@@ -126,11 +126,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.
@@ -494,14 +489,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.
    *

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 3549b507a699d4d93930b2ef3370ea17ce656e9e..4d8fb89299165588452c18f7f7c5f42508d26b76 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 8f8a8fb351cce2b2944ca267d5146e59430708a0..bb62795db8142a3b8217ae0db6e013595aa2f6fd 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
@@ -370,14 +370,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.
    *

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index a96d227cbadbdce3aa9932b54a6829e6ef0e35a7..2b557f1fae541561c6410c223665f4efa091e835 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 3e18f8d9f3f398b9474f7abe323fc0fbd40a5004..e356133174d2f093985c69c4d4451ffbbfb53e8d 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -307,11 +307,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()
    */