evas_object_smart_callback_add(mWebView, "form,repost,warning,show",
&WebViewContainerForDali::OnFormRepostDecisionRequest,
&mClient);
- evas_object_smart_callback_add(mWebView, "policy,newwindow,decide",
- &WebViewContainerForDali::OnNewWindowPolicyDecided,
+ evas_object_smart_callback_add(mWebView, "policy,response,decide",
+ &WebViewContainerForDali::OnResponsePolicyDecided,
&mClient);
evas_object_smart_callback_add(mWebView, "request,certificate,confirm",
&WebViewContainerForDali::OnCertificateConfirmRequest,
return client->GeolocationPermission(host, protocol);
}
- static void OnNewWindowPolicyDecided(void* data, Evas_Object*, void* policy)
+ static void OnResponsePolicyDecided(void* data, Evas_Object*, void* policy)
{
auto client = static_cast<WebViewContainerClient*>(data);
Ewk_Policy_Decision* policyDecision = static_cast<Ewk_Policy_Decision*>(policy);
std::shared_ptr<Dali::WebEnginePolicyDecision> webPolicyDecision(new TizenWebEnginePolicyDecision(policyDecision));
- client->NewWindowPolicyDecided(std::move(webPolicyDecision));
+ client->ResponsePolicyDecided(std::move(webPolicyDecision));
}
static void OnCertificateConfirmRequest(void* data, Evas_Object*, void* eventInfo)
std::unique_ptr<Dali::WebEngineHitTest> TizenWebEngineChromium::CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode)
{
- std::unique_ptr<Dali::WebEngineHitTest> webHitTest;
- if (!mWebViewContainer)
+ if (mWebViewContainer)
{
- return webHitTest;
+ return mWebViewContainer->CreateHitTest(x, y, mode);
}
- return mWebViewContainer->CreateHitTest(x, y, mode);
+ return nullptr;
}
bool TizenWebEngineChromium::CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback)
return mConsoleMessageSignal;
}
-Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& TizenWebEngineChromium::PolicyDecisionSignal()
+Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& TizenWebEngineChromium::ResponsePolicyDecisionSignal()
{
- return mPolicyDecisionSignal;
+ return mResponsePolicyDecisionSignal;
}
Dali::WebEnginePlugin::WebEngineCertificateSignalType& TizenWebEngineChromium::CertificateConfirmSignal()
}
}
-void TizenWebEngineChromium::NewWindowPolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision)
+void TizenWebEngineChromium::ResponsePolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision)
{
- DALI_LOG_RELEASE_INFO("#NewWindowPolicyDecided.\n");
- if (!mPolicyDecisionSignal.Empty())
+ DALI_LOG_RELEASE_INFO("#ResponsePolicyDecided.\n");
+ if (!mResponsePolicyDecisionSignal.Empty())
{
- mPolicyDecisionSignal.Emit(std::move(decision));
+ mResponsePolicyDecisionSignal.Emit(std::move(decision));
}
}
* policy would be decided.
* @param [in] decision Policy need be decided.
*/
- virtual void NewWindowPolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision) = 0;
+ virtual void ResponsePolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> decision) = 0;
/**
* @brief Callback function to be called by WebViewContainer when certificate
Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& ConsoleMessageSignal() override;
/**
- * @copydoc Dali::WebEnginePlugin::PolicyDecisionSignal()
+ * @copydoc Dali::WebEnginePlugin::ResponsePolicyDecisionSignal()
*/
- Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& PolicyDecisionSignal() override;
+ Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal() override;
/**
* @copydoc Dali::WebEnginePlugin::CertificateConfirmSignal()
void RequestFormRepostDecision(std::shared_ptr<Dali::WebEngineFormRepostDecision> decision) override;
/**
- * @copydoc Dali::Plugin::WebViewContainerClient::NewWindowPolicyDecided()
+ * @copydoc Dali::Plugin::WebViewContainerClient::ResponsePolicyDecided()
*/
- void NewWindowPolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> policy) override;
+ void ResponsePolicyDecided(std::shared_ptr<Dali::WebEnginePolicyDecision> policy) override;
/**
* @copydoc Dali::Plugin::WebViewContainerClient::UrlChanged()
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;
void DeleteAllWebStorage() override;
/**
- * @copydoc Dali::WebEngineContext::DeleteWebStorageOrigin()
+ * @copydoc Dali::WebEngineContext::DeleteWebStorage()
*/
bool DeleteWebStorage(WebEngineSecurityOrigin& origin) override;
std::string GetContextCertificateFile() const override;
/**
- * @copydoc Dali::WebEngineContext::SetContextTizenAppId()
+ * @copydoc Dali::WebEngineContext::SetContextAppId()
*/
void SetContextAppId(const std::string& appID) override;
/**
- * @copydoc Dali::WebEngineContext::SetContextTizenAppVersion()
+ * @copydoc Dali::WebEngineContext::SetContextAppVersion()
*/
bool SetContextAppVersion(const std::string& appVersion) override;
bool DeleteAllWebIndexedDatabase() override;
/**
- * @copydoc Dali::WebEngineContext::FreeFormPasswordDataList()
+ * @copydoc Dali::WebEngineContext::DeleteFormPasswordDataList()
*/
void DeleteFormPasswordDataList(const std::vector<std::string>& list) override;
std::string GetProxyBypassRule() const override;
/**
- * @copydoc Dali::WebEngineContext::NotifyLowMemory()
+ * @copydoc Dali::WebEngineContext::FreeUnusedMemory()
*/
bool FreeUnusedMemory() override;
}
/**
- * @copydoc Dali::WebEnginePlugin::PolicyDecisionSignal()
+ * @copydoc Dali::WebEnginePlugin::ResponsePolicyDecisionSignal()
*/
- Dali::WebEnginePlugin::WebEnginePolicyDecisionSignalType& PolicyDecisionSignal() override
+ Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal() override
{
- return mPolicyDecisionSignal;
+ return mResponsePolicyDecisionSignal;
}
/**
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;