Revert "[Tizen] Add WebView APIs for fullscreen, text found, etc."

This reverts commit 11179ef4ebb064e05994820bbba51eeec390e27a.

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 6d900cb..4c631bf 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
@@ -166,11 +166,6 @@ public:
   using WebEngineNavigationPolicyDecidedCallback = std::function<void(std::unique_ptr<Dali::WebEnginePolicyDecision>)>;
 
   /**
-   * @brief WebView callback related with new window policy would be decided.
-   */
-  using WebEngineNewWindowPolicyDecidedCallback = std::function<void(std::unique_ptr<Dali::WebEnginePolicyDecision>)>;
-
-  /**
    * @brief WebView callback related with a new window would be created.
    */
   using WebEngineNewWindowCreatedCallback = std::function<void(Dali::WebEnginePlugin*&)>;
@@ -181,21 +176,6 @@ public:
   using WebEngineHitTestCreatedCallback = std::function<bool(std::unique_ptr<Dali::WebEngineHitTest>)>;
 
   /**
-   * @brief WebView callback called after fullscreen is entered.
-   */
-  using WebEngineFullscreenEnteredCallback = std::function<void(void)>;
-
-  /**
-   * @brief WebView callback called after fullscreen is exited.
-   */
-  using WebEngineFullscreenExitedCallback = std::function<void(void)>;
-
-  /**
-   * @brief WebView callback called after text is found.
-   */
-  using WebEngineTextFoundCallback = std::function<void(uint32_t)>;
-
-  /**
    * @brief The callback to be called when the web engine received a plain text of current web page.
    */
   using PlainTextReceivedCallback = std::function<void(const std::string&)>;
@@ -777,11 +757,6 @@ public:
   virtual bool SendWheelEvent(const WheelEvent& event) = 0;
 
   /**
-   * @brief Exit fullscreen.
-   */
-  virtual void ExitFullscreen() = 0;
-
-  /**
    * @brief Callback to be called when frame would be rendered.
    *
    * @param[in] callback
@@ -859,13 +834,6 @@ public:
   virtual void RegisterNavigationPolicyDecidedCallback(WebEngineNavigationPolicyDecidedCallback callback) = 0;
 
   /**
-   * @brief Callback to be called when new window policy would be decided.
-   *
-   * @param[in] callback
-   */
-  virtual void RegisterNewWindowPolicyDecidedCallback(WebEngineNewWindowPolicyDecidedCallback callback) = 0;
-
-  /**
    * @brief Callback to be called when a new window would be created.
    *
    * @param[in] callback
@@ -908,27 +876,6 @@ public:
   virtual void RegisterContextMenuHiddenCallback(WebEngineContextMenuHiddenCallback callback) = 0;
 
   /**
-   * @brief Callback to be called when fullscreen would be entered.
-   *
-   * @param[in] callback
-   */
-  virtual void RegisterFullscreenEnteredCallback(WebEngineFullscreenEnteredCallback callback) = 0;
-
-  /**
-   * @brief Callback to be called when fullscreen would be exited.
-   *
-   * @param[in] callback
-   */
-  virtual void RegisterFullscreenExitedCallback(WebEngineFullscreenExitedCallback callback) = 0;
-
-  /**
-   * @brief Callback to be called when text would be found.
-   *
-   * @param[in] callback
-   */
-  virtual void RegisterTextFoundCallback(WebEngineTextFoundCallback callback) = 0;
-
-  /**
    * @brief Get a plain text of current web page asynchronously.
    *
    * @param[in] callback The callback function called asynchronously.

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 7f07ca0..97b70c1 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
@@ -375,11 +375,6 @@ bool WebEngine::SendWheelEvent(const WheelEvent& event)
   return GetImplementation(*this).SendWheelEvent(event);
 }
 
-void WebEngine::ExitFullscreen()
-{
-  GetImplementation(*this).ExitFullscreen();
-}
-
 void WebEngine::SetFocus(bool focused)
 {
   GetImplementation(*this).SetFocus(focused);
@@ -540,11 +535,6 @@ void WebEngine::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::W
   GetImplementation(*this).RegisterNavigationPolicyDecidedCallback(callback);
 }
 
-void WebEngine::RegisterNewWindowPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNewWindowPolicyDecidedCallback callback)
-{
-  GetImplementation(*this).RegisterNewWindowPolicyDecidedCallback(callback);
-}
-
 void WebEngine::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
 {
   GetImplementation(*this).RegisterNewWindowCreatedCallback(callback);
@@ -575,21 +565,6 @@ void WebEngine::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngi
   GetImplementation(*this).RegisterContextMenuHiddenCallback(callback);
 }
 
-void WebEngine::RegisterFullscreenEnteredCallback(Dali::WebEnginePlugin::WebEngineFullscreenEnteredCallback callback)
-{
-  GetImplementation(*this).RegisterFullscreenEnteredCallback(callback);
-}
-
-void WebEngine::RegisterFullscreenExitedCallback(Dali::WebEnginePlugin::WebEngineFullscreenExitedCallback callback)
-{
-  GetImplementation(*this).RegisterFullscreenExitedCallback(callback);
-}
-
-void WebEngine::RegisterTextFoundCallback(Dali::WebEnginePlugin::WebEngineTextFoundCallback callback)
-{
-  GetImplementation(*this).RegisterTextFoundCallback(callback);
-}
-
 void WebEngine::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback)
 {
   GetImplementation(*this).GetPlainTextAsynchronously(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 f8e3298..1515c76 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
@@ -662,11 +662,6 @@ public:
   bool SendWheelEvent(const WheelEvent& event);
 
   /**
-   * @brief Exit full-screen.
-   */
-  void ExitFullscreen();
-
-  /**
    * @brief Callback to be called when frame would be rendered.
    *
    * @param[in] callback
@@ -744,13 +739,6 @@ public:
   void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback);
 
   /**
-   * @brief Callback to be called when new window policy would be decided.
-   *
-   * @param[in] callback
-   */
-  void RegisterNewWindowPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNewWindowPolicyDecidedCallback callback);
-
-  /**
    * @brief Callback to be called when a new window would be created.
    *
    * @param[in] callback
@@ -793,27 +781,6 @@ public:
   void RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback);
 
   /**
-   * @brief Callback to be called when fullscreen would be entered.
-   *
-   * @param[in] callback
-   */
-  void RegisterFullscreenEnteredCallback(Dali::WebEnginePlugin::WebEngineFullscreenEnteredCallback callback);
-
-  /**
-   * @brief Callback to be called when fullscreen would be exited.
-   *
-   * @param[in] callback
-   */
-  void RegisterFullscreenExitedCallback(Dali::WebEnginePlugin::WebEngineFullscreenExitedCallback callback);
-
-  /**
-   * @brief Callback to be called when text would be found.
-   *
-   * @param[in] callback
-   */
-  void RegisterTextFoundCallback(Dali::WebEnginePlugin::WebEngineTextFoundCallback callback);
-
-  /**
    * @brief Get a plain text of current web page asynchronously.
    *
    * @param[in] callback The callback function called asynchronously.

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index 71b69ea..87e1f6e 100644 (file)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -690,11 +690,6 @@ bool WebEngine::SendWheelEvent(const Dali::WheelEvent& event)
   return mPlugin->SendWheelEvent(event);
 }
 
-void WebEngine::ExitFullscreen()
-{
-  mPlugin->ExitFullscreen();
-}
-
 void WebEngine::RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback)
 {
   mPlugin->RegisterFrameRenderedCallback(callback);
@@ -750,11 +745,6 @@ void WebEngine::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::W
   mPlugin->RegisterNavigationPolicyDecidedCallback(callback);
 }
 
-void WebEngine::RegisterNewWindowPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNewWindowPolicyDecidedCallback callback)
-{
-  mPlugin->RegisterNewWindowPolicyDecidedCallback(callback);
-}
-
 void WebEngine::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
 {
   mPlugin->RegisterNewWindowCreatedCallback(callback);
@@ -785,21 +775,6 @@ void WebEngine::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngi
   mPlugin->RegisterContextMenuHiddenCallback(callback);
 }
 
-void WebEngine::RegisterFullscreenEnteredCallback(Dali::WebEnginePlugin::WebEngineFullscreenEnteredCallback callback)
-{
-  mPlugin->RegisterFullscreenEnteredCallback(callback);
-}
-
-void WebEngine::RegisterFullscreenExitedCallback(Dali::WebEnginePlugin::WebEngineFullscreenExitedCallback callback)
-{
-  mPlugin->RegisterFullscreenExitedCallback(callback);
-}
-
-void WebEngine::RegisterTextFoundCallback(Dali::WebEnginePlugin::WebEngineTextFoundCallback callback)
-{
-  mPlugin->RegisterTextFoundCallback(callback);
-}
-
 void WebEngine::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback)
 {
   mPlugin->GetPlainTextAsynchronously(callback);

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
index b3ef060..1a35dc9 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -468,11 +468,6 @@ public:
   bool SendWheelEvent(const Dali::WheelEvent& event);
 
   /**
-   * @copydoc Dali::WebEngine::ExitFullscreen()
-   */
-  void ExitFullscreen();
-
-  /**
    @copydoc Dali::WebEngine::RegisterFrameRenderedCallback()
    */
   void RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback);
@@ -528,11 +523,6 @@ public:
   void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback);
 
   /**
-   @copydoc Dali::WebEngine::RegisterNewWindowPolicyDecidedCallback()
-   */
-  void RegisterNewWindowPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNewWindowPolicyDecidedCallback callback);
-
-  /**
    @copydoc Dali::WebEngine::RegisterNewWindowCreatedCallback()
    */
   void RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback);
@@ -563,21 +553,6 @@ public:
   void RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback);
 
   /**
-   * @copydoc Dali::WebEngine::RegisterFullscreenEnteredCallback()
-   */
-  void RegisterFullscreenEnteredCallback(Dali::WebEnginePlugin::WebEngineFullscreenEnteredCallback callback);
-
-  /**
-   * @copydoc Dali::WebEngine::RegisterFullscreenExitedCallback()
-   */
-  void RegisterFullscreenExitedCallback(Dali::WebEnginePlugin::WebEngineFullscreenExitedCallback callback);
-
-  /**
-   * @copydoc Dali::WebEngine::RegisterTextFoundCallback()
-   */
-  void RegisterTextFoundCallback(Dali::WebEnginePlugin::WebEngineTextFoundCallback callback);
-
-  /**
    * @copydoc Dali::WebEngine::GetPlainTextAsynchronously()
    */
   void GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback);