From 5792c1dcd4c7b1566f5b936fe513a0bf37e7beb8 Mon Sep 17 00:00:00 2001 From: "huayong.xu" Date: Mon, 28 Nov 2022 18:28:42 +0800 Subject: [PATCH] [Tizen] Add API for 'url,changed' event. Change-Id: I41741b2448142801bc7e32410a92037b1ff560f0 --- dali/devel-api/adaptor-framework/web-engine-plugin.h | 12 ++++++++++++ dali/devel-api/adaptor-framework/web-engine.cpp | 5 +++++ dali/devel-api/adaptor-framework/web-engine.h | 7 +++++++ dali/internal/web-engine/common/web-engine-impl.cpp | 5 +++++ dali/internal/web-engine/common/web-engine-impl.h | 5 +++++ 5 files changed, 34 insertions(+) mode change 100644 => 100755 dali/devel-api/adaptor-framework/web-engine-plugin.h mode change 100644 => 100755 dali/devel-api/adaptor-framework/web-engine.cpp mode change 100644 => 100755 dali/devel-api/adaptor-framework/web-engine.h mode change 100644 => 100755 dali/internal/web-engine/common/web-engine-impl.cpp mode change 100644 => 100755 dali/internal/web-engine/common/web-engine-impl.h diff --git a/dali/devel-api/adaptor-framework/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine-plugin.h old mode 100644 new mode 100755 index a3ba736..ad72e6e --- a/dali/devel-api/adaptor-framework/web-engine-plugin.h +++ b/dali/devel-api/adaptor-framework/web-engine-plugin.h @@ -73,6 +73,11 @@ public: using JavaScriptMessageHandlerCallback = std::function; /** + * @brief WebView callback related with page url changed. + */ + using WebEngineUrlChangedCallback = std::function; + + /** * @brief WebView callback related with navigation policy would be decided. */ using WebEngineNavigationPolicyDecidedCallback = std::function)>; @@ -353,6 +358,13 @@ public: virtual void RegisterScrollEdgeReachedCallback(WebEngineScrollEdgeReachedCallback callback) = 0; /** + * @brief Callback to be called when url is changed. + * + * @param[in] callback + */ + virtual void RegisterUrlChangedCallback(WebEngineUrlChangedCallback callback) = 0; + + /** * @brief Callback to be called when navigation policy would be decided. * * @param[in] callback diff --git a/dali/devel-api/adaptor-framework/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine.cpp old mode 100644 new mode 100755 index 6cc992f..c00723e --- a/dali/devel-api/adaptor-framework/web-engine.cpp +++ b/dali/devel-api/adaptor-framework/web-engine.cpp @@ -280,6 +280,11 @@ void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngi GetImplementation(*this).RegisterScrollEdgeReachedCallback(callback); } +void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback) +{ + GetImplementation(*this).RegisterUrlChangedCallback(callback); +} + void WebEngine::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback) { GetImplementation(*this).RegisterNavigationPolicyDecidedCallback(callback); diff --git a/dali/devel-api/adaptor-framework/web-engine.h b/dali/devel-api/adaptor-framework/web-engine.h old mode 100644 new mode 100755 index 7218a70..83fbb84 --- a/dali/devel-api/adaptor-framework/web-engine.h +++ b/dali/devel-api/adaptor-framework/web-engine.h @@ -340,6 +340,13 @@ public: void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback); /** + * @brief Callback to be called when url is changed. + * + * @param[in] callback + */ + void RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback); + + /** * @brief Callback to be called when navigation policy would be decided. * * @param[in] callback diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp old mode 100644 new mode 100755 index 2ab82ef..9bd7399 --- a/dali/internal/web-engine/common/web-engine-impl.cpp +++ b/dali/internal/web-engine/common/web-engine-impl.cpp @@ -375,6 +375,11 @@ void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngi mPlugin->RegisterScrollEdgeReachedCallback(callback); } +void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback) +{ + mPlugin->RegisterUrlChangedCallback(callback); +} + void WebEngine::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback) { mPlugin->RegisterNavigationPolicyDecidedCallback(callback); diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h old mode 100644 new mode 100755 index 1a8927d..1d7f1ca --- a/dali/internal/web-engine/common/web-engine-impl.h +++ b/dali/internal/web-engine/common/web-engine-impl.h @@ -265,6 +265,11 @@ public: void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback); /** + * @copydoc Dali::WebEngine::RegisterUrlChangedCallback() + */ + void RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback); + + /** @copydoc Dali::WebEngine::RegisterNavigationPolicyDecidedCallback() */ void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback); -- 2.7.4