projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.3.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
web-view
/
web-view.cpp
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
5b0f3d2
..
63d9cca
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/web-view/web-view.cpp
+++ b/
dali-toolkit/devel-api/controls/web-view/web-view.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
3
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-64,24
+64,29
@@
WebView WebView::New(uint32_t argc, char** argv)
return Internal::WebView::New(argc, argv);
}
return Internal::WebView::New(argc, argv);
}
-
WebView WebView::DownCast(BaseHandle handle
)
+
Toolkit::WebView WebView::FindWebView(Dali::WebEnginePlugin* plugin
)
{
{
- return
Control::DownCast<WebView, Internal::WebView>(handle
);
+ return
Internal::WebView::FindWebView(plugin
);
}
}
-Dali::
Toolkit::WebSettings* WebView::GetSettings() const
+Dali::
WebEngineContext* WebView::GetContext()
{
{
- return
Dali::Toolkit::GetImpl(*this).GetSettings
();
+ return
Internal::WebView::GetContext
();
}
}
-Dali::
Toolkit::WebContext* WebView::GetContext() const
+Dali::
WebEngineCookieManager* WebView::GetCookieManager()
{
{
- return
Dali::Toolkit::GetImpl(*this).GetContext
();
+ return
Internal::WebView::GetCookieManager
();
}
}
-Dali::Toolkit::WebCookieManager* WebView::GetCookieManager() const
+WebView WebView::DownCast(BaseHandle handle)
{
{
- return Dali::Toolkit::GetImpl(*this).GetCookieManager();
+ return Control::DownCast<WebView, Internal::WebView>(handle);
+}
+
+Dali::Toolkit::WebSettings* WebView::GetSettings() const
+{
+ return Dali::Toolkit::GetImpl(*this).GetSettings();
}
Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
}
Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
@@
-89,6
+94,11
@@
Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
return Dali::Toolkit::GetImpl(*this).GetBackForwardList();
}
return Dali::Toolkit::GetImpl(*this).GetBackForwardList();
}
+Dali::WebEnginePlugin* WebView::GetPlugin() const
+{
+ return Dali::Toolkit::GetImpl(*this).GetPlugin();
+}
+
Dali::Toolkit::ImageView WebView::GetFavicon() const
{
return Dali::Toolkit::GetImpl(*this).GetFavicon();
Dali::Toolkit::ImageView WebView::GetFavicon() const
{
return Dali::Toolkit::GetImpl(*this).GetFavicon();
@@
-109,7
+119,7
@@
bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const
return Dali::Toolkit::GetImpl(*this).LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
}
return Dali::Toolkit::GetImpl(*this).LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl);
}
-bool WebView::LoadContents(const
std::string&
contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
+bool WebView::LoadContents(const
int8_t*
contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri)
{
return Dali::Toolkit::GetImpl(*this).LoadContents(contents, contentSize, mimeType, encoding, baseUri);
}
{
return Dali::Toolkit::GetImpl(*this).LoadContents(contents, contentSize, mimeType, encoding, baseUri);
}
@@
-369,6
+379,11
@@
void WebView::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::Web
Dali::Toolkit::GetImpl(*this).RegisterNavigationPolicyDecidedCallback(callback);
}
Dali::Toolkit::GetImpl(*this).RegisterNavigationPolicyDecidedCallback(callback);
}
+void WebView::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
+{
+ Dali::Toolkit::GetImpl(*this).RegisterNewWindowCreatedCallback(callback);
+}
+
void WebView::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback)
{
Dali::Toolkit::GetImpl(*this).RegisterCertificateConfirmedCallback(callback);
void WebView::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback)
{
Dali::Toolkit::GetImpl(*this).RegisterCertificateConfirmedCallback(callback);