X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fweb-view%2Fweb-view-impl.cpp;h=86b39c258a5a4a70b12fffd39bdb3750b773e9da;hp=6a3af8d94c7099ddc2782829979c9fbcece8b36c;hb=b9e642e718049bba5c8ee7df3bd353155581f5a5;hpb=49f4aba622282abe49713de9f1bb0ee8085855a5 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))