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
Merge "Add an API for getting web view when request is intercepted." into 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
bfa5502
..
ddc0461
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/web-view/web-view.cpp
+++ b/
dali-toolkit/devel-api/controls/web-view/web-view.cpp
@@
-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::WebEngineCookieManager* WebView::GetCookieManager()
+{
+ return Internal::WebView::GetCookieManager();
}
}
-Dali::Toolkit::WebContext* WebView::GetContext() const
+WebView WebView::DownCast(BaseHandle handle)
{
{
- return
Dali::Toolkit::GetImpl(*this).GetContext(
);
+ return
Control::DownCast<WebView, Internal::WebView>(handle
);
}
}
-Dali::Toolkit::Web
CookieManager* WebView::GetCookieManager
() const
+Dali::Toolkit::Web
Settings* WebView::GetSettings
() const
{
{
- return Dali::Toolkit::GetImpl(*this).Get
CookieManager
();
+ return Dali::Toolkit::GetImpl(*this).Get
Settings
();
}
Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
}
Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
@@
-354,11
+359,6
@@
void WebView::RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFram
Dali::Toolkit::GetImpl(*this).RegisterFrameRenderedCallback(callback);
}
Dali::Toolkit::GetImpl(*this).RegisterFrameRenderedCallback(callback);
}
-void WebView::RegisterRequestInterceptorCallback(Dali::WebEnginePlugin::WebEngineRequestInterceptorCallback callback)
-{
- Dali::Toolkit::GetImpl(*this).RegisterRequestInterceptorCallback(callback);
-}
-
void WebView::RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback)
{
Dali::Toolkit::GetImpl(*this).RegisterConsoleMessageReceivedCallback(callback);
void WebView::RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback)
{
Dali::Toolkit::GetImpl(*this).RegisterConsoleMessageReceivedCallback(callback);
@@
-369,6
+369,11
@@
void WebView::RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEn
Dali::Toolkit::GetImpl(*this).RegisterResponsePolicyDecidedCallback(callback);
}
Dali::Toolkit::GetImpl(*this).RegisterResponsePolicyDecidedCallback(callback);
}
+void WebView::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback)
+{
+ Dali::Toolkit::GetImpl(*this).RegisterNavigationPolicyDecidedCallback(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);
@@
-394,6
+399,11
@@
void WebView::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngine
Dali::Toolkit::GetImpl(*this).RegisterContextMenuHiddenCallback(callback);
}
Dali::Toolkit::GetImpl(*this).RegisterContextMenuHiddenCallback(callback);
}
+void WebView::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback)
+{
+ Dali::Toolkit::GetImpl(*this).GetPlainTextAsynchronously(callback);
+}
+
WebView::WebView(Internal::WebView& implementation)
: Control(implementation)
{
WebView::WebView(Internal::WebView& implementation)
: Control(implementation)
{