From 24413b2479837e6f7d570a8341cc3e920e04f483 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Tue, 1 Jun 2021 10:03:20 +0900 Subject: [PATCH] Revert "[Tizen] Rename functions, variables, etc related to policy decision." This reverts commit c00651068b08b96303fe19eb937c409f8d133e4e. --- dali/devel-api/adaptor-framework/web-engine-plugin.h | 8 ++++---- dali/devel-api/adaptor-framework/web-engine.cpp | 4 ++-- dali/devel-api/adaptor-framework/web-engine.h | 4 ++-- dali/internal/web-engine/common/web-engine-impl.cpp | 4 ++-- dali/internal/web-engine/common/web-engine-impl.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) mode change 100755 => 100644 dali/devel-api/adaptor-framework/web-engine.cpp mode change 100755 => 100644 dali/devel-api/adaptor-framework/web-engine.h mode change 100755 => 100644 dali/internal/web-engine/common/web-engine-impl.cpp diff --git a/dali/devel-api/adaptor-framework/web-engine-plugin.h b/dali/devel-api/adaptor-framework/web-engine-plugin.h index 421ca6f..ec8cde0 100755 --- a/dali/devel-api/adaptor-framework/web-engine-plugin.h +++ b/dali/devel-api/adaptor-framework/web-engine-plugin.h @@ -159,9 +159,9 @@ public: using WebEngineFrameRenderedSignalType = Signal; /** - * @brief WebView signal type related with response policy would be decided. + * @brief WebView signal type related with policy would be decided. */ - using WebEngineResponsePolicyDecisionSignalType = Signal)>; + using WebEnginePolicyDecisionSignalType = Signal)>; /** * @brief Hit test callback called after hit test is created asynchronously. @@ -819,11 +819,11 @@ public: virtual WebEngineConsoleMessageSignalType& ConsoleMessageSignal() = 0; /** - * @brief Connect to this signal to be notified when response policy would be decided. + * @brief Connect to this signal to be notified when new policy would be decided. * * @return A signal object to connect with. */ - virtual WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal() = 0; + virtual WebEnginePolicyDecisionSignalType& PolicyDecisionSignal() = 0; /** * @brief Connect to this signal to be notified when certificate need be confirmed. diff --git a/dali/devel-api/adaptor-framework/web-engine.cpp b/dali/devel-api/adaptor-framework/web-engine.cpp old mode 100755 new mode 100644 index c273867..21806f7 --- a/dali/devel-api/adaptor-framework/web-engine.cpp +++ b/dali/devel-api/adaptor-framework/web-engine.cpp @@ -527,9 +527,9 @@ Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& WebEngine::ConsoleMess return GetImplementation(*this).ConsoleMessageSignal(); } -Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& WebEngine::ResponsePolicyDecisionSignal() +Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& WebEngine::PolicyDecisionSignal() { - return GetImplementation(*this).ResponsePolicyDecisionSignal(); + return GetImplementation(*this).PolicyDecisionSignal(); } Dali::WebEnginePlugin::WebEngineCertificateSignalType& WebEngine::CertificateConfirmSignal() diff --git a/dali/devel-api/adaptor-framework/web-engine.h b/dali/devel-api/adaptor-framework/web-engine.h old mode 100755 new mode 100644 index 99cc150..f461e46 --- a/dali/devel-api/adaptor-framework/web-engine.h +++ b/dali/devel-api/adaptor-framework/web-engine.h @@ -702,11 +702,11 @@ public: Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& ConsoleMessageSignal(); /** - * @brief Connect to this signal to be notified when response policy would be decided. + * @brief Connect to this signal to be notified when new policy would be decided. * * @return A signal object to connect with. */ - Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal(); + Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& PolicyDecisionSignal(); /** * @brief Connect to this signal to be notified when certificate need be confirmed. diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp old mode 100755 new mode 100644 index dd1a7d11..a9b483c --- a/dali/internal/web-engine/common/web-engine-impl.cpp +++ b/dali/internal/web-engine/common/web-engine-impl.cpp @@ -621,9 +621,9 @@ Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& WebEngine::ConsoleMess return mPlugin->ConsoleMessageSignal(); } -Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& WebEngine::ResponsePolicyDecisionSignal() +Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& WebEngine::PolicyDecisionSignal() { - return mPlugin->ResponsePolicyDecisionSignal(); + return mPlugin->PolicyDecisionSignal(); } Dali::WebEnginePlugin::WebEngineCertificateSignalType& WebEngine::CertificateConfirmSignal() diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h index c730049..505feb3 100755 --- a/dali/internal/web-engine/common/web-engine-impl.h +++ b/dali/internal/web-engine/common/web-engine-impl.h @@ -505,9 +505,9 @@ public: Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& ConsoleMessageSignal(); /** - @copydoc Dali::WebEngine::ResponsePolicyDecisionSignal() + @copydoc Dali::WebEngine::PolicyDecisionSignal() */ - Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal(); + Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& PolicyDecisionSignal(); /** * @copydoc Dali::WebEngine::CertificateConfirmSignal() -- 2.7.4