From: Adeel Kazmi Date: Fri, 7 May 2021 10:35:19 +0000 (+0100) Subject: [dali_2.0.25] Merge branch 'devel/master' X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=177b9cb383ec5d87aab1521d5a925666478d90d6;hp=4562af123a3a8ab849bc23215b720f0c123bd6ff [dali_2.0.25] Merge branch 'devel/master' Change-Id: Id839c044dc44b483f1983a2eef9561c0bc0bb679 --- diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp index 88be84c..e3596c4 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp @@ -1507,9 +1507,9 @@ public: return mConsoleMessageSignal; } - Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& PolicyDecisionSignal() + Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal() { - return mPolicyDecisionSignal; + return mResponsePolicyDecisionSignal; } Dali::WebEnginePlugin::WebEngineCertificateSignalType& CertificateConfirmSignal() @@ -1552,7 +1552,7 @@ public: Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType mFrameRenderedSignal; Dali::WebEnginePlugin::WebEngineRequestInterceptorSignalType mRequestInterceptorSignal; Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType mConsoleMessageSignal; - Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType mPolicyDecisionSignal; + Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType mResponsePolicyDecisionSignal; Dali::WebEnginePlugin::WebEngineCertificateSignalType mCertificateConfirmSignal; Dali::WebEnginePlugin::WebEngineCertificateSignalType mSslCertificateChangedSignal; Dali::WebEnginePlugin::WebEngineHttpAuthHandlerSignalType mHttpAuthHandlerSignal; @@ -1636,7 +1636,7 @@ bool OnLoadUrl() std::shared_ptr message(new MockWebEngineConsoleMessage()); gInstance->mConsoleMessageSignal.Emit(std::move(message)); std::shared_ptr policyDecision(new MockWebEnginePolicyDecision()); - gInstance->mPolicyDecisionSignal.Emit(std::move(policyDecision)); + gInstance->mResponsePolicyDecisionSignal.Emit(std::move(policyDecision)); std::shared_ptr certificate(new MockWebEngineCertificate()); gInstance->mCertificateConfirmSignal.Emit(std::move(certificate)); @@ -2322,9 +2322,9 @@ Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& WebEngine::ConsoleMess return Internal::Adaptor::GetImplementation(*this).ConsoleMessageSignal(); } -Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& WebEngine::PolicyDecisionSignal() +Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& WebEngine::ResponsePolicyDecisionSignal() { - return Internal::Adaptor::GetImplementation(*this).PolicyDecisionSignal(); + return Internal::Adaptor::GetImplementation(*this).ResponsePolicyDecisionSignal(); } Dali::WebEnginePlugin::WebEngineCertificateSignalType& WebEngine::CertificateConfirmSignal() diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp index 86776ff..867c44f 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp @@ -81,8 +81,8 @@ static int gRequestInterceptorCallbackCalled = 0; static std::shared_ptr gRequestInterceptorInstance = nullptr; static int gConsoleMessageCallbackCalled = 0; static std::shared_ptr gConsoleMessageInstance = nullptr; -static int gPolicyDecisionCallbackCalled = 0; -static std::shared_ptr gPolicyDecisionInstance = nullptr; +static int gResponsePolicyDecidedCallbackCalled = 0; +static std::shared_ptr gResponsePolicyDecisionInstance = nullptr; static int gCertificateConfirmCallbackCalled = 0; static std::shared_ptr gCertificateConfirmInstance = nullptr; static int gSslCertificateChangedCallbackCalled = 0; @@ -137,10 +137,10 @@ static void OnScrollEdgeReached( WebView view, Dali::WebEnginePlugin::ScrollEdge gScrollEdgeReachedCallbackCalled++; } -static void OnPolicyDecisionRequest(WebView view, std::shared_ptr decision) +static void OnResponsePolicyDecided(WebView view, std::shared_ptr decision) { - gPolicyDecisionCallbackCalled++; - gPolicyDecisionInstance = std::move(decision); + gResponsePolicyDecidedCallbackCalled++; + gResponsePolicyDecisionInstance = std::move(decision); } static void OnUrlChanged( WebView view, const std::string& url ) @@ -1300,7 +1300,7 @@ int UtcDaliWebViewHttpRequestInterceptor(void) END_TEST; } -int UtcDaliWebViewPolicyDecisionRequest(void) +int UtcDaliWebViewResponsePolicyDecisionRequest(void) { ToolkitTestApplication application; @@ -1309,42 +1309,42 @@ int UtcDaliWebViewPolicyDecisionRequest(void) // load url. ConnectionTracker* testTracker = new ConnectionTracker(); - view.PolicyDecisionSignal().Connect( &OnPolicyDecisionRequest ); + view.ResponsePolicyDecisionSignal().Connect( &OnResponsePolicyDecided ); bool signal1 = false; - view.ConnectSignal( testTracker, "policyDecision", CallbackFunctor(&signal1) ); - DALI_TEST_EQUALS( gPolicyDecisionCallbackCalled, 0, TEST_LOCATION ); - DALI_TEST_CHECK(gPolicyDecisionInstance == 0); + view.ConnectSignal( testTracker, "responsePolicyDecided", CallbackFunctor(&signal1) ); + DALI_TEST_EQUALS( gResponsePolicyDecidedCallbackCalled, 0, TEST_LOCATION ); + DALI_TEST_CHECK(gResponsePolicyDecisionInstance == 0); view.LoadUrl( TEST_URL1 ); Test::EmitGlobalTimerSignal(); - DALI_TEST_EQUALS( gPolicyDecisionCallbackCalled, 1, TEST_LOCATION ); + DALI_TEST_EQUALS( gResponsePolicyDecidedCallbackCalled, 1, TEST_LOCATION ); DALI_TEST_CHECK( signal1 ); - // check policy decision & its frame. - DALI_TEST_CHECK(gPolicyDecisionInstance != 0); + // check response policy decision & its frame. + DALI_TEST_CHECK(gResponsePolicyDecisionInstance != 0); std::string testUrl("http://test.html"); - DALI_TEST_EQUALS(gPolicyDecisionInstance->GetUrl(), testUrl, TEST_LOCATION); + DALI_TEST_EQUALS(gResponsePolicyDecisionInstance->GetUrl(), testUrl, TEST_LOCATION); std::string testCookie("test:abc"); - DALI_TEST_EQUALS(gPolicyDecisionInstance->GetCookie(), testCookie, TEST_LOCATION); + DALI_TEST_EQUALS(gResponsePolicyDecisionInstance->GetCookie(), testCookie, TEST_LOCATION); Dali::WebEnginePolicyDecision::DecisionType testDecisionType = Dali::WebEnginePolicyDecision::DecisionType::USE; - DALI_TEST_EQUALS(gPolicyDecisionInstance->GetDecisionType(), testDecisionType, TEST_LOCATION); + DALI_TEST_EQUALS(gResponsePolicyDecisionInstance->GetDecisionType(), testDecisionType, TEST_LOCATION); std::string testResponseMime("txt/xml"); - DALI_TEST_EQUALS(gPolicyDecisionInstance->GetResponseMime(), testResponseMime, TEST_LOCATION); + DALI_TEST_EQUALS(gResponsePolicyDecisionInstance->GetResponseMime(), testResponseMime, TEST_LOCATION); int32_t ResponseStatusCode = 500; - DALI_TEST_EQUALS(gPolicyDecisionInstance->GetResponseStatusCode(), ResponseStatusCode, TEST_LOCATION); + DALI_TEST_EQUALS(gResponsePolicyDecisionInstance->GetResponseStatusCode(), ResponseStatusCode, TEST_LOCATION); Dali::WebEnginePolicyDecision::NavigationType testNavigationType = Dali::WebEnginePolicyDecision::NavigationType::LINK_CLICKED; - DALI_TEST_EQUALS(gPolicyDecisionInstance->GetNavigationType(), testNavigationType, TEST_LOCATION); + DALI_TEST_EQUALS(gResponsePolicyDecisionInstance->GetNavigationType(), testNavigationType, TEST_LOCATION); std::string testScheme("test"); - DALI_TEST_EQUALS(gPolicyDecisionInstance->GetScheme(), testScheme, TEST_LOCATION); - DALI_TEST_CHECK(gPolicyDecisionInstance->Use()); - DALI_TEST_CHECK(gPolicyDecisionInstance->Ignore()); - DALI_TEST_CHECK(gPolicyDecisionInstance->Suspend()); + DALI_TEST_EQUALS(gResponsePolicyDecisionInstance->GetScheme(), testScheme, TEST_LOCATION); + DALI_TEST_CHECK(gResponsePolicyDecisionInstance->Use()); + DALI_TEST_CHECK(gResponsePolicyDecisionInstance->Ignore()); + DALI_TEST_CHECK(gResponsePolicyDecisionInstance->Suspend()); - Dali::WebEngineFrame* webFrame = &(gPolicyDecisionInstance->GetFrame()); + Dali::WebEngineFrame* webFrame = &(gResponsePolicyDecisionInstance->GetFrame()); DALI_TEST_CHECK(webFrame); DALI_TEST_CHECK(webFrame->IsMainFrame()); - gPolicyDecisionInstance = nullptr; + gResponsePolicyDecisionInstance = nullptr; END_TEST; } diff --git a/dali-toolkit/devel-api/controls/web-view/web-view.cpp b/dali-toolkit/devel-api/controls/web-view/web-view.cpp index d3c201a..b777e7a 100755 --- a/dali-toolkit/devel-api/controls/web-view/web-view.cpp +++ b/dali-toolkit/devel-api/controls/web-view/web-view.cpp @@ -359,9 +359,9 @@ WebView::WebViewConsoleMessageSignalType& WebView::ConsoleMessageSignal() return Dali::Toolkit::GetImpl(*this).ConsoleMessageSignal(); } -WebView::WebViewPolicyDecisionSignalType& WebView::PolicyDecisionSignal() +WebView::WebViewResponsePolicyDecisionSignalType& WebView::ResponsePolicyDecisionSignal() { - return Dali::Toolkit::GetImpl(*this).PolicyDecisionSignal(); + return Dali::Toolkit::GetImpl(*this).ResponsePolicyDecisionSignal(); } WebView::WebViewCertificateSignalType& WebView::CertificateConfirmSignal() diff --git a/dali-toolkit/devel-api/controls/web-view/web-view.h b/dali-toolkit/devel-api/controls/web-view/web-view.h index 4f9159d..2ef7d91 100755 --- a/dali-toolkit/devel-api/controls/web-view/web-view.h +++ b/dali-toolkit/devel-api/controls/web-view/web-view.h @@ -234,9 +234,9 @@ public: using WebViewConsoleMessageSignalType = Signal)>; /** - * @brief WebView signal type related with policy decision. + * @brief WebView signal type related with response policy decision. */ - using WebViewPolicyDecisionSignalType = Signal)>; + using WebViewResponsePolicyDecisionSignalType = Signal)>; /** * @brief WebView signal type related with certificate changed. @@ -753,11 +753,11 @@ public: WebViewConsoleMessageSignalType& ConsoleMessageSignal(); /** - * @brief Connect to this signal to be notified when new policy would be decided. + * @brief Connect to this signal to be notified when response policy would be decided. * * @return A signal object to connect with. */ - WebViewPolicyDecisionSignalType& PolicyDecisionSignal(); + WebViewResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal(); /** * @brief Connect to this signal to be notified when certificate need be confirmed. diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp old mode 100644 new mode 100755 index 6a3af8d..86b39c2 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -97,7 +97,7 @@ DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "formRepostDecision", FORM_REPOS DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "frameRendered", FRAME_RENDERED_SIGNAL ) DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "requestInterceptor", REQUEST_INTERCEPTOR_SIGNAL ) DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "consoleMessage", CONSOLE_MESSAGE_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "policyDecision", POLICY_DECISION ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "responsePolicyDecided", POLICY_DECISION ) DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "certificateConfirm", CERTIFICATE_CONFIRM_SIGNAL ) DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "sslCertificateChanged", SSL_CERTIFICATE_CHANGED_SIGNAL ) DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "httpAuthRequest", HTTP_AUTH_REQUEST_SIGNAL ) @@ -234,7 +234,7 @@ void WebView::OnInitialize() mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnFrameRendered); mWebEngine.RequestInterceptorSignal().Connect(this, &WebView::OnInterceptRequest); mWebEngine.ConsoleMessageSignal().Connect(this, &WebView::OnConsoleMessage); - mWebEngine.PolicyDecisionSignal().Connect(this, &WebView::OnPolicyDecisionRequest); + mWebEngine.ResponsePolicyDecisionSignal().Connect(this, &WebView::OnResponsePolicyDecided); mWebEngine.CertificateConfirmSignal().Connect(this, &WebView::OnCertificateConfirm); mWebEngine.SslCertificateChangedSignal().Connect(this, &WebView::OnSslCertificateChanged); mWebEngine.HttpAuthHandlerSignal().Connect(this, &WebView::OnHttpAuthenticationRequest); @@ -764,9 +764,9 @@ Dali::Toolkit::WebView::WebViewConsoleMessageSignalType& WebView::ConsoleMessage return mConsoleMessageSignal; } -Dali::Toolkit::WebView::WebViewPolicyDecisionSignalType& WebView::PolicyDecisionSignal() +Dali::Toolkit::WebView::WebViewResponsePolicyDecisionSignalType& WebView::ResponsePolicyDecisionSignal() { - return mPolicyDecisionSignal; + return mResponsePolicyDecisionSignal; } Dali::Toolkit::WebView::WebViewCertificateSignalType& WebView::CertificateConfirmSignal() @@ -901,12 +901,12 @@ void WebView::OnConsoleMessage(std::shared_ptr me } } -void WebView::OnPolicyDecisionRequest(std::shared_ptr decision) +void WebView::OnResponsePolicyDecided(std::shared_ptr decision) { - if(!mPolicyDecisionSignal.Empty()) + if(!mResponsePolicyDecisionSignal.Empty()) { Dali::Toolkit::WebView handle(GetOwner()); - mPolicyDecisionSignal.Emit(handle, std::move(decision)); + mResponsePolicyDecisionSignal.Emit(handle, std::move(decision)); } } @@ -1014,7 +1014,7 @@ bool WebView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tr } else if(0 == strcmp(signalName.c_str(), POLICY_DECISION)) { - webView.PolicyDecisionSignal().Connect(tracker, functor); + webView.ResponsePolicyDecisionSignal().Connect(tracker, functor); connected = true; } else if(0 == strcmp(signalName.c_str(), CERTIFICATE_CONFIRM_SIGNAL)) diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.h b/dali-toolkit/internal/controls/web-view/web-view-impl.h index 4031ee6..c9eaa39 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.h +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.h @@ -358,9 +358,9 @@ public: Dali::Toolkit::WebView::WebViewConsoleMessageSignalType& ConsoleMessageSignal(); /** - * @copydoc Dali::Toolkit::WebView::PolicyDecisionSignal() + * @copydoc Dali::Toolkit::WebView::ResponsePolicyDecisionSignal() */ - Dali::Toolkit::WebView::WebViewPolicyDecisionSignalType& PolicyDecisionSignal(); + Dali::Toolkit::WebView::WebViewResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal(); /** * @copydoc Dali::Toolkit::WebView::CertificateConfirmSignal() @@ -709,10 +709,10 @@ private: void OnConsoleMessage(std::shared_ptr message); /** - * @brief Callback function to be called when policy need be decided. + * @brief Callback function to be called when response policy need be decided. * @param[in] decision The policy decided. */ - void OnPolicyDecisionRequest(std::shared_ptr decision); + void OnResponsePolicyDecided(std::shared_ptr decision); /** * @brief Callback function to be called when certificate need be confirmed. @@ -760,7 +760,7 @@ private: Dali::Toolkit::WebView::WebViewFrameRenderedSignalType mFrameRenderedSignal; Dali::Toolkit::WebView::WebViewRequestInterceptorSignalType mRequestInterceptorSignal; Dali::Toolkit::WebView::WebViewConsoleMessageSignalType mConsoleMessageSignal; - Dali::Toolkit::WebView::WebViewPolicyDecisionSignalType mPolicyDecisionSignal; + Dali::Toolkit::WebView::WebViewResponsePolicyDecisionSignalType mResponsePolicyDecisionSignal; Dali::Toolkit::WebView::WebViewCertificateSignalType mCertificateConfirmSignal; Dali::Toolkit::WebView::WebViewCertificateSignalType mSslCertificateChangedSignal; Dali::Toolkit::WebView::WebViewHttpAuthHandlerSignalType mHttpAuthHandlerSignal; diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 048eae4..c3e32cb 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -29,7 +29,7 @@ namespace Toolkit { const unsigned int TOOLKIT_MAJOR_VERSION = 2; const unsigned int TOOLKIT_MINOR_VERSION = 0; -const unsigned int TOOLKIT_MICRO_VERSION = 24; +const unsigned int TOOLKIT_MICRO_VERSION = 25; const char* const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 8feb0e8..94d8e11 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali2-toolkit Summary: Dali 3D engine Toolkit -Version: 2.0.24 +Version: 2.0.25 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT