Revert "[Tizen] Add OverScrolled in WebView"

This reverts commit 43179238c5890d00352f35f884b2ebc211f3ffa2.

Change-Id: I02e3a7ad62bcb6a91019d44926f2232d84af1f14

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 be5f07aeadcf45bf2b69bc6c0551ed31347a48b6..5c8094891034df69b7f95de1492dace429f41cf6 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
@@ -67,18 +67,12 @@ public:
 
   // forward declaration.
   enum class ScrollEdge;
-  enum class OverScrolled;
 
   /**
    * @brief WebView callback related with scroll edge reached.
    */
   using WebEngineScrollEdgeReachedCallback = std::function<void(const ScrollEdge)>;
 
-  /**
-   * @brief WebView callback related with over scrolled.
-   */
-  using WebEngineOverScrolledCallback = std::function<void(const OverScrolled)>;
-
   /**
    * @brief WebView callback related with page url changed.
    */
@@ -227,17 +221,6 @@ public:
     BOTTOM, ///< Bottom edge reached.
   };
 
-  /**
-   * @brief Enumeration for the over scrolled.
-   */
-  enum class OverScrolled
-  {
-    LEFT,   ///< Left over scrolled.
-    RIGHT,  ///< Right over scrolled.
-    TOP,    ///< Top over scrolled.
-    BOTTOM, ///< Bottom over scrolled.
-  };
-
   /**
    * @brief Enumeration that provides the option to find text.
    */
@@ -855,13 +838,6 @@ public:
    */
   virtual void RegisterScrollEdgeReachedCallback(WebEngineScrollEdgeReachedCallback callback) = 0;
 
-  /**
-   * @brief Callback to be called when over scrolled.
-   *
-   * @param[in] callback
-   */
-  virtual void RegisterOverScrolledCallback(WebEngineOverScrolledCallback callback) = 0;
-
   /**
    * @brief Callback to be called when url is changed.
    *

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 999b1ae48f7ee7e788a36143135f58e0031eff37..6a7e5c350a2b34943157403acc73025f2bc50709 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp
@@ -520,11 +520,6 @@ void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngi
   GetImplementation(*this).RegisterScrollEdgeReachedCallback(callback);
 }
 
-void WebEngine::RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback)
-{
-  GetImplementation(*this).RegisterOverScrolledCallback(callback);
-}
-
 void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback)
 {
   GetImplementation(*this).RegisterUrlChangedCallback(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 34eed50941c1c18014417dc20feb96fcfbfaffc6..aa96f3c21c195f1c66a8df58841a7ccaeedbe0df 100755 (executable)
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h
@@ -713,13 +713,6 @@ public:
    */
   void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback);
 
-  /**
-   * @brief Callback to be called when over scrolled.
-   *
-   * @param[in] callback
-   */
-  void RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback);
-
   /**
    * @brief Callback to be called when url is changed.
    *

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index 7f4c977b2158493a525fab88ac55bb0db393bd43..033aa7642d1ccd008f976d17022e83b6202772b4 100644 (file)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -730,11 +730,6 @@ void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngi
   mPlugin->RegisterScrollEdgeReachedCallback(callback);
 }
 
-void WebEngine::RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback)
-{
-  mPlugin->RegisterOverScrolledCallback(callback);
-}
-
 void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback)
 {
   mPlugin->RegisterUrlChangedCallback(callback);

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
index 505b2012ecfaeb4f5583184d12fb7f7b6d92110b..d8afbceb1f5909b88cf83400ddde4003b0d1aebd 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -507,11 +507,6 @@ public:
    */
   void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback);
 
-  /**
-   * @copydoc Dali::WebEngine::RegisterOverScrolledCallback()
-   */
-  void RegisterOverScrolledCallback(Dali::WebEnginePlugin::WebEngineOverScrolledCallback callback);
-
   /**
    * @copydoc Dali::WebEngine::RegisterUrlChangedCallback()
    */