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.2.15] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
web-view
/
web-view-impl.h
diff --git
a/dali-toolkit/internal/controls/web-view/web-view-impl.h
b/dali-toolkit/internal/controls/web-view/web-view-impl.h
index
6a0da6e
..
61834a2
100755
(executable)
--- a/
dali-toolkit/internal/controls/web-view/web-view-impl.h
+++ b/
dali-toolkit/internal/controls/web-view/web-view-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_WEB_VIEW_H
/*
#define DALI_TOOLKIT_INTERNAL_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.
@@
-21,7
+21,7
@@
// EXTERNAL INCLUDES
#include <dali/devel-api/actors/actor-devel.h>
#include <dali/devel-api/adaptor-framework/proxy-accessible.h>
// EXTERNAL INCLUDES
#include <dali/devel-api/actors/actor-devel.h>
#include <dali/devel-api/adaptor-framework/proxy-accessible.h>
-#include <dali/devel-api/adaptor-framework/web-engine.h>
+#include <dali/devel-api/adaptor-framework/web-engine
/web-engine
.h>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/object/property-notification.h>
#include <memory>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/object/property-notification.h>
#include <memory>
@@
-40,8
+40,6
@@
namespace Toolkit
class KeyEvent;
class TouchEvent;
class WebBackForwardList;
class KeyEvent;
class TouchEvent;
class WebBackForwardList;
-class WebContext;
-class WebCookieManager;
class WebSettings;
class WebView;
class WebSettings;
class WebView;
@@
-75,19
+73,24
@@
public:
static Toolkit::WebView New(uint32_t argc, char** argv);
/**
static Toolkit::WebView New(uint32_t argc, char** argv);
/**
- * @copydoc Dali::Toolkit::WebView::
GetSettings
()
+ * @copydoc Dali::Toolkit::WebView::
FindWebView
()
*/
*/
-
Dali::Toolkit::WebSettings* GetSettings() const
;
+
static Toolkit::WebView FindWebView(Dali::WebEnginePlugin* plugin)
;
/**
* @copydoc Dali::Toolkit::WebView::GetContext()
*/
/**
* @copydoc Dali::Toolkit::WebView::GetContext()
*/
-
Dali::Toolkit::WebContext* GetContext() const
;
+
static Dali::WebEngineContext* GetContext()
;
/**
* @copydoc Dali::Toolkit::WebView::GetCookieManager()
*/
/**
* @copydoc Dali::Toolkit::WebView::GetCookieManager()
*/
- Dali::Toolkit::WebCookieManager* GetCookieManager() const;
+ static Dali::WebEngineCookieManager* GetCookieManager();
+
+ /**
+ * @copydoc Dali::Toolkit::WebView::GetSettings()
+ */
+ Dali::Toolkit::WebSettings* GetSettings() const;
/**
* @copydoc Dali::Toolkit::WebView::GetBackForwardList()
/**
* @copydoc Dali::Toolkit::WebView::GetBackForwardList()
@@
-95,6
+98,11
@@
public:
Dali::Toolkit::WebBackForwardList* GetBackForwardList() const;
/**
Dali::Toolkit::WebBackForwardList* GetBackForwardList() const;
/**
+ * @copydoc Dali::Toolkit::WebView::GetPlugin()
+ */
+ Dali::WebEnginePlugin* GetPlugin() const;
+
+ /**
* @copydoc Dali::Toolkit::WebView::GetFavicon()
*/
Dali::Toolkit::ImageView GetFavicon() const;
* @copydoc Dali::Toolkit::WebView::GetFavicon()
*/
Dali::Toolkit::ImageView GetFavicon() const;
@@
-370,6
+378,11
@@
public:
void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback);
/**
void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback);
/**
+ * @copydoc Dali::Toolkit::WebView::RegisterNewWindowCreatedCallback()
+ */
+ void RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback);
+
+ /**
* @copydoc Dali::Toolkit::WebView::RegisterCertificateConfirmedCallback()
*/
void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback);
* @copydoc Dali::Toolkit::WebView::RegisterCertificateConfirmedCallback()
*/
void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback);
@@
-584,12
+597,6
@@
private:
bool SetVisibility(bool visible);
/**
bool SetVisibility(bool visible);
/**
- * @brief Update display area of web view.
- * @param[in] source The soource triggers Notification.
- */
- void UpdateDisplayArea(Dali::PropertyNotification& source);
-
- /**
* @brief Enable/Disable video hole for video playing.
* @param[in] enabled True if video hole is enabled, false otherwise.
*/
* @brief Enable/Disable video hole for video playing.
* @param[in] enabled True if video hole is enabled, false otherwise.
*/
@@
-652,9
+659,10
@@
private:
void OnFrameRendered();
/**
void OnFrameRendered();
/**
- * @brief Callback function to be called when frame is rendered. This is to check initial buffer is ready.
+ * @brief Callback for updating display area of web view.
+ * @param[in] source The soource triggers Notification.
*/
*/
- void On
InitialFrameRendered(
);
+ void On
DisplayAreaUpdated(Dali::PropertyNotification& source
);
/**
* @brief Callback function to be called when visibility is changed.
/**
* @brief Callback function to be called when visibility is changed.
@@
-680,6
+688,11
@@
protected:
protected:
/**
protected:
/**
+ * @copydoc Dali::Accessibility::Accessible::GetAttributes()
+ */
+ Dali::Accessibility::Attributes GetAttributes() const override;
+
+ /**
* @copydoc Dali::Accessibility::ActorAccessible::DoGetChildren()
*/
void DoGetChildren(std::vector<Dali::Accessibility::Accessible*>& children) override;
* @copydoc Dali::Accessibility::ActorAccessible::DoGetChildren()
*/
void DoGetChildren(std::vector<Dali::Accessibility::Accessible*>& children) override;
@@
-698,8
+711,6
@@
private:
Dali::Size mWebViewSize;
Dali::WebEngine mWebEngine;
Dali::Size mWebViewSize;
Dali::WebEngine mWebEngine;
- std::unique_ptr<Dali::Toolkit::WebContext> mWebContext;
- std::unique_ptr<Dali::Toolkit::WebCookieManager> mWebCookieManager;
std::unique_ptr<Dali::Toolkit::WebSettings> mWebSettings;
std::unique_ptr<Dali::Toolkit::WebBackForwardList> mWebBackForwardList;
std::unique_ptr<Dali::Toolkit::WebSettings> mWebSettings;
std::unique_ptr<Dali::Toolkit::WebBackForwardList> mWebBackForwardList;