Revert "[Tizen] Revert "[Web] Fix WebView terminate crash""

[platform/core/uifw/dali-adaptor.git] / dali / internal / web-engine / common / web-engine-impl.h

diff --git a/dali/internal/web-engine/common/web-engine-impl.h b/dali/internal/web-engine/common/web-engine-impl.h
index 39e9e59..96e6eac 100755 (executable)
--- a/dali/internal/web-engine/common/web-engine-impl.h
+++ b/dali/internal/web-engine/common/web-engine-impl.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_IMPL_H
 
 /*
- * 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.
@@ -22,8 +22,9 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/web-engine-plugin.h>
-#include <dali/devel-api/adaptor-framework/web-engine.h>
+#include <dali/devel-api/adaptor-framework/accessibility.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-plugin.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine.h>
 
 namespace Dali
 {
@@ -55,6 +56,18 @@ public:
   static WebEnginePtr New();
 
   /**
+   * @brief Get context of web engine
+   *
+   */
+  static Dali::WebEngineContext* GetContext();
+
+  /**
+   * @brief Get cookie manager of web engine
+   *
+   */
+  static Dali::WebEngineCookieManager* GetCookieManager();
+
+  /**
    * @copydoc Dali::WebEngine::Create()
    */
   void Create(uint32_t width, uint32_t height, const std::string& locale, const std::string& timezoneId);
@@ -70,6 +83,11 @@ public:
   void Destroy();
 
   /**
+   * @copydoc Dali::WebEngine::GetPlugin()
+   */
+  Dali::WebEnginePlugin* GetPlugin() const;
+
+  /**
    * @copydoc Dali::WebEngine::GetNativeImageSource()
    */
   Dali::NativeImageSourcePtr GetNativeImageSource();
@@ -80,16 +98,6 @@ public:
   Dali::WebEngineSettings& GetSettings() const;
 
   /**
-   * @copydoc Dali::WebEngine::GetContext()
-   */
-  Dali::WebEngineContext& GetContext() const;
-
-  /**
-   * @copydoc Dali::WebEngine::GetCookieManager()
-   */
-  Dali::WebEngineCookieManager& GetCookieManager() const;
-
-  /**
    * @copydoc Dali::WebEngine::GetBackForwardList()
    */
   Dali::WebEngineBackForwardList& GetBackForwardList() const;
@@ -400,6 +408,11 @@ public:
   void ActivateAccessibility(bool activated);
 
   /**
+   * @copydoc Dali::WebEngine::GetAccessibilityAddress()
+   */
+  Accessibility::Address GetAccessibilityAddress();
+
+  /**
    * @copydoc Dali::WebEngine::SetVisibility()
    */
   bool SetVisibility(bool visible);
@@ -505,6 +518,11 @@ public:
   void RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback);
 
   /**
+   @copydoc Dali::WebEngine::RegisterNavigationPolicyDecidedCallback()
+   */
+  void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback);
+
+  /**
    * @copydoc Dali::WebEngine::RegisterCertificateConfirmedCallback()
    */
   void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback);
@@ -558,21 +576,8 @@ private:
    */
   bool Initialize();
 
-  /**
-   * @brief Initialize library handle by loading web engine plugin.
-   *
-   * @return Whether the initialization succeed or not.
-   */
-  bool InitializePluginHandle();
-
 private:
-  typedef Dali::WebEnginePlugin* (*CreateWebEngineFunction)();
-  typedef void (*DestroyWebEngineFunction)(Dali::WebEnginePlugin* plugin);
-
-  Dali::WebEnginePlugin*   mPlugin;              ///< WebEnginePlugin instance
-  void*                    mHandle;              ///< Handle for the loaded library
-  CreateWebEngineFunction  mCreateWebEnginePtr;  ///< Function to create plugin instance
-  DestroyWebEngineFunction mDestroyWebEnginePtr; ///< Function to destroy plugin instance
+  Dali::WebEnginePlugin* mPlugin; ///< WebEnginePlugin instance
 };
 
 } // namespace Adaptor