Merge "Fix svace issue" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / web-view / web-context.cpp

diff --git a/dali-toolkit/devel-api/controls/web-view/web-context.cpp b/dali-toolkit/devel-api/controls/web-view/web-context.cpp
index 2a7090b..128546b 100755 (executable)
--- a/dali-toolkit/devel-api/controls/web-view/web-context.cpp
+++ b/dali-toolkit/devel-api/controls/web-view/web-context.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 #include <dali-toolkit/devel-api/controls/web-view/web-context.h>
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-security-origin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-security-origin.h>
 
 namespace Dali
 {
@@ -49,11 +49,31 @@ void WebContext::SetProxyUri(const std::string& uri)
   mWebEngineContext.SetProxyUri(uri);
 }
 
+std::string WebContext::GetProxyUri() const
+{
+  return mWebEngineContext.GetProxyUri();
+}
+
+void WebContext::SetProxyBypassRule(const std::string& proxy, const std::string& bypass)
+{
+  mWebEngineContext.SetProxyBypassRule(proxy, bypass);
+}
+
+std::string WebContext::GetProxyBypassRule() const
+{
+  return mWebEngineContext.GetProxyBypassRule();
+}
+
 void WebContext::SetCertificateFilePath(const std::string& certificatePath)
 {
   mWebEngineContext.SetCertificateFilePath(certificatePath);
 }
 
+std::string WebContext::GetCertificateFilePath() const
+{
+  return mWebEngineContext.GetCertificateFilePath();
+}
+
 void WebContext::SetDefaultProxyAuth(const std::string& username, const std::string& password)
 {
   mWebEngineContext.SetDefaultProxyAuth(username, password);
@@ -124,6 +144,11 @@ void WebContext::RegisterMimeOverriddenCallback(Dali::WebEngineContext::WebEngin
   mWebEngineContext.RegisterMimeOverriddenCallback(callback);
 }
 
+void WebContext::RegisterRequestInterceptedCallback(Dali::WebEngineContext::WebEngineRequestInterceptedCallback callback)
+{
+  mWebEngineContext.RegisterRequestInterceptedCallback(callback);
+}
+
 void WebContext::EnableCache(bool cacheEnabled)
 {
   mWebEngineContext.EnableCache(cacheEnabled);
@@ -134,34 +159,39 @@ bool WebContext::IsCacheEnabled() const
   return mWebEngineContext.IsCacheEnabled();
 }
 
-std::string WebContext::GetContextCertificateFile() const
+void WebContext::SetAppId(const std::string& appId)
 {
-  return mWebEngineContext.GetContextCertificateFile();
+  mWebEngineContext.SetAppId(appId);
 }
 
-void WebContext::SetContextAppId(const std::string& appID)
+bool WebContext::SetAppVersion(const std::string& appVersion)
 {
-  mWebEngineContext.SetContextAppId(appID);
+  return mWebEngineContext.SetAppVersion(appVersion);
 }
 
-bool WebContext::SetContextAppVersion(const std::string& appVersion)
+void WebContext::SetApplicationType(const Dali::WebEngineContext::ApplicationType applicationType)
 {
-  return mWebEngineContext.SetContextAppVersion(appVersion);
+  mWebEngineContext.SetApplicationType(applicationType);
 }
 
-void WebContext::SetContextApplicationType(const Dali::WebEngineContext::ApplicationType applicationType)
+void WebContext::SetTimeOffset(float timeOffset)
 {
-  mWebEngineContext.SetContextApplicationType(applicationType);
+  mWebEngineContext.SetTimeOffset(timeOffset);
 }
 
-void WebContext::SetContextTimeOffset(float timeOffset)
+void WebContext::SetTimeZoneOffset(float timeZoneOffset, float daylightSavingTime)
 {
-  mWebEngineContext.SetContextTimeOffset(timeOffset);
+  mWebEngineContext.SetTimeZoneOffset(timeZoneOffset, daylightSavingTime);
 }
 
-void WebContext::SetContextTimeZoneOffset(float timeZoneOffset, float daylightSavingTime)
+void WebContext::SetDefaultZoomFactor(float zoomFactor)
 {
-  mWebEngineContext.SetContextTimeZoneOffset(timeZoneOffset, daylightSavingTime);
+  mWebEngineContext.SetDefaultZoomFactor(zoomFactor);
+}
+
+float WebContext::GetDefaultZoomFactor() const
+{
+  return mWebEngineContext.GetDefaultZoomFactor();
 }
 
 void WebContext::RegisterUrlSchemesAsCorsEnabled(const std::vector<std::string>& schemes)
@@ -174,16 +204,6 @@ void WebContext::RegisterJsPluginMimeTypes(const std::vector<std::string>& mimeT
   mWebEngineContext.RegisterJsPluginMimeTypes(mimeTypes);
 }
 
-void WebContext::SetDefaultZoomFactor(float zoomFactor)
-{
-  mWebEngineContext.SetDefaultZoomFactor(zoomFactor);
-}
-
-float WebContext::GetContextDefaultZoomFactor() const
-{
-  return mWebEngineContext.GetContextDefaultZoomFactor();
-}
-
 bool WebContext::DeleteAllApplicationCache()
 {
   return mWebEngineContext.DeleteAllApplicationCache();
@@ -209,21 +229,6 @@ void WebContext::DeleteAllFormCandidateData()
   mWebEngineContext.DeleteAllFormCandidateData();
 }
 
-std::string WebContext::GetContextProxy() const
-{
-  return mWebEngineContext.GetContextProxy();
-}
-
-void WebContext::SetContextProxy(const std::string& proxy, const std::string& bypass)
-{
-  mWebEngineContext.SetContextProxy(proxy, bypass);
-}
-
-std::string WebContext::GetProxyBypassRule() const
-{
-  return mWebEngineContext.GetProxyBypassRule();
-}
-
 bool WebContext::FreeUnusedMemory()
 {
   return mWebEngineContext.FreeUnusedMemory();