From 910e7b7113f63ad3fe337f192e1cad663dda148e Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Mon, 9 Sep 2024 16:29:33 +0900 Subject: [PATCH] [Tizen] Revert "[Tizen] Add WebAuthDisplayQR and Response for QR code passkey" - chromium web engine update is required - fix gbs build error : dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp:867:3: error: 'ewk_view_webauthn_cancel' was not declared in this scope [ 285s] 867 | ewk_view_webauthn_cancel(mWebView); [ 285s] | ^~~~~~~~~~~~~~~~~~~~~~~~ This reverts commit 802bbd0ac9d219f3c2a21a9979f1e90808457447. Change-Id: I0a769cbd90a29922c5847eae0cddfeb26f793f2b --- .../web-engine/web-engine-plugin.h | 30 ---------------------- .../adaptor-framework/web-engine/web-engine.cpp | 15 ----------- .../adaptor-framework/web-engine/web-engine.h | 21 --------------- .../internal/web-engine/common/web-engine-impl.cpp | 15 ----------- dali/internal/web-engine/common/web-engine-impl.h | 15 ----------- 5 files changed, 96 deletions(-) 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 5c80948..7b34419 100755 --- a/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h +++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h @@ -201,16 +201,6 @@ public: using PlainTextReceivedCallback = std::function; /** - * @brief WebView callback informs browser app to display QB code popup for passkey scenario. - */ - using WebEngineWebAuthDisplayQRCallback = std::function; - - /** - * @brief WebView callback informs browser app that the passkey registration and authentication has been successful and app can close QR popup. - */ - using WebEngineWebAuthResponseCallback = std::function; - - /** * @brief Enumeration for the scroll edge. */ enum class ScrollEdge @@ -949,26 +939,6 @@ public: * @param[in] callback The callback function called asynchronously. */ virtual void GetPlainTextAsynchronously(PlainTextReceivedCallback callback) = 0; - - /** - * @brief Cancel WebAuthentication(cancel in progress passkey operation). - */ - virtual void WebAuthenticationCancel() = 0; - - /** - * @brief Register WebAuthDisplayQR callback. - * - * @param[in] callback The callback informs browser app to display QR code popup for passkey scenario. - */ - virtual void RegisterWebAuthDisplayQRCallback(WebEngineWebAuthDisplayQRCallback callback) = 0; - - /** - * @brief Register WebAuthResponse callback. - * - * @param[in] callback The callback informs browser app that the passkey registration and authentication has been successful and app can close QR popup. - */ - virtual void RegisterWebAuthResponseCallback(WebEngineWebAuthResponseCallback callback) = 0; - }; // specialization has to be done in the same namespace 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 6a7e5c3..4d8fb89 100755 --- a/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp +++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.cpp @@ -600,19 +600,4 @@ void WebEngine::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextRecei GetImplementation(*this).GetPlainTextAsynchronously(callback); } -void WebEngine::WebAuthenticationCancel() -{ - GetImplementation(*this).WebAuthenticationCancel(); -} - -void WebEngine::RegisterWebAuthDisplayQRCallback(Dali::WebEnginePlugin::WebEngineWebAuthDisplayQRCallback callback) -{ - GetImplementation(*this).RegisterWebAuthDisplayQRCallback(callback); -} - -void WebEngine::RegisterWebAuthResponseCallback(Dali::WebEnginePlugin::WebEngineWebAuthResponseCallback callback) -{ - GetImplementation(*this).RegisterWebAuthResponseCallback(callback); -} - } // namespace Dali 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 aa96f3c..bb62795 100755 --- a/dali/devel-api/adaptor-framework/web-engine/web-engine.h +++ b/dali/devel-api/adaptor-framework/web-engine/web-engine.h @@ -825,27 +825,6 @@ public: */ void GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback); - /** - * @brief Cancel WebAuthentication(cancel in progress passkey operation). - */ - void WebAuthenticationCancel(); - - /** - * @brief Get a plain text of current web page asynchronously. - * - * @param[in] callback The callback function called asynchronously. - - */ - void RegisterWebAuthDisplayQRCallback(Dali::WebEnginePlugin::WebEngineWebAuthDisplayQRCallback callback); - - /** - * @brief Get a plain text of current web page asynchronously. - * - * @param[in] callback The callback function called asynchronously. - - */ - void RegisterWebAuthResponseCallback(Dali::WebEnginePlugin::WebEngineWebAuthResponseCallback callback); - private: // Not intended for application developers /** * @brief Internal constructor diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp index 033aa76..2b557f1 100644 --- a/dali/internal/web-engine/common/web-engine-impl.cpp +++ b/dali/internal/web-engine/common/web-engine-impl.cpp @@ -810,21 +810,6 @@ void WebEngine::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextRecei mPlugin->GetPlainTextAsynchronously(callback); } -void WebEngine::WebAuthenticationCancel() -{ - mPlugin->WebAuthenticationCancel(); -} - -void WebEngine::RegisterWebAuthDisplayQRCallback(Dali::WebEnginePlugin::WebEngineWebAuthDisplayQRCallback callback) -{ - mPlugin->RegisterWebAuthDisplayQRCallback(callback); -} - -void WebEngine::RegisterWebAuthResponseCallback(Dali::WebEnginePlugin::WebEngineWebAuthResponseCallback callback) -{ - mPlugin->RegisterWebAuthResponseCallback(callback); -} - } // namespace Adaptor } // namespace Internal } // namespace Dali diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h index d8afbce..e356133 100755 --- a/dali/internal/web-engine/common/web-engine-impl.h +++ b/dali/internal/web-engine/common/web-engine-impl.h @@ -587,21 +587,6 @@ public: */ void GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback); - /** - * @copydoc Dali::WebEngine::WebAuthenticationCancel() - */ - void WebAuthenticationCancel(); - - /** - * @copydoc Dali::WebEngine::RegisterWebAuthDisplayQRCallback() - */ - void RegisterWebAuthDisplayQRCallback(Dali::WebEnginePlugin::WebEngineWebAuthDisplayQRCallback callback); - - /** - * @copydoc Dali::WebEngine::RegisterWebAuthResponseCallback() - */ - void RegisterWebAuthResponseCallback(Dali::WebEnginePlugin::WebEngineWebAuthResponseCallback callback); - private: /** * @brief Constructor. -- 2.7.4