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
Make web engine context be a singleton.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
web-view
/
web-view.h
diff --git
a/dali-toolkit/devel-api/controls/web-view/web-view.h
b/dali-toolkit/devel-api/controls/web-view/web-view.h
index
b4e7688
..
4d90fbd
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/web-view/web-view.h
+++ b/
dali-toolkit/devel-api/controls/web-view/web-view.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_WEB_VIEW_H
/*
#define DALI_TOOLKIT_WEB_VIEW_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-24,7
+24,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
-#include <dali/devel-api/adaptor-framework/web-engine-plugin.h>
+#include <dali/devel-api/adaptor-framework/web-engine
/web-engine
-plugin.h>
namespace Dali
{
namespace Dali
{
@@
-216,6
+216,16
@@
public:
static WebView New(uint32_t argc, char** argv);
/**
static WebView New(uint32_t argc, char** argv);
/**
+ * @brief Get context of web engine.
+ */
+ static Dali::WebEngineContext* GetContext();
+
+ /**
+ * @brief Get cookie manager of web engine.
+ */
+ static Dali::WebEngineCookieManager* GetCookieManager();
+
+ /**
* @brief Create an uninitialized WebView.
*/
WebView();
* @brief Create an uninitialized WebView.
*/
WebView();
@@
-259,16
+269,6
@@
public:
Dali::Toolkit::WebSettings* GetSettings() const;
/**
Dali::Toolkit::WebSettings* GetSettings() const;
/**
- * @brief Get WebContext of WebEngine.
- */
- Dali::Toolkit::WebContext* GetContext() const;
-
- /**
- * @brief Get CookieManager of WebEngine.
- */
- Dali::Toolkit::WebCookieManager* GetCookieManager() const;
-
- /**
* @brief Get WebBackForwardList of WebEngine.
*/
Dali::Toolkit::WebBackForwardList* GetBackForwardList() const;
* @brief Get WebBackForwardList of WebEngine.
*/
Dali::Toolkit::WebBackForwardList* GetBackForwardList() const;
@@
-678,25
+678,25
@@
public:
void RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback);
/**
void RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback);
/**
- * @brief Callback to be called when
http request need be intercept
ed.
+ * @brief Callback to be called when
console message will be logg
ed.
*
* @param[in] callback
*/
*
* @param[in] callback
*/
- void Register
RequestInterceptorCallback(Dali::WebEnginePlugin::WebEngineRequestInterceptor
Callback callback);
+ void Register
ConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceived
Callback callback);
/**
/**
- * @brief Callback to be called when
console message will be logg
ed.
+ * @brief Callback to be called when
response policy would be decid
ed.
*
* @param[in] callback
*/
*
* @param[in] callback
*/
- void Register
ConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceiv
edCallback callback);
+ void Register
ResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecid
edCallback callback);
/**
/**
- * @brief Callback to be called when
response
policy would be decided.
+ * @brief Callback to be called when
navigation
policy would be decided.
*
* @param[in] callback
*/
*
* @param[in] callback
*/
- void Register
ResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponse
PolicyDecidedCallback callback);
+ void Register
NavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigation
PolicyDecidedCallback callback);
/**
* @brief Callback to be called when certificate need be confirmed.
/**
* @brief Callback to be called when certificate need be confirmed.
@@
-733,6
+733,13
@@
public:
*/
void RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback);
*/
void RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback);
+ /**
+ * @brief Get a plain text of current web page asynchronously.
+ *
+ * @param[in] callback The callback function called asynchronously.
+ */
+ void GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback);
+
public: // Not intended for application developers
/// @cond internal
/**
public: // Not intended for application developers
/// @cond internal
/**