{
public:
/**
- * @brief Creates a new WebEngine handle
+ * @brief Create a new WebEngine handle
*
* @return WebEngine pointer
*/
/**
* @copydoc Dali::WebEngine::Create()
*/
- void Create(int width, int height, const std::string& locale, const std::string& timezoneId);
+ void Create(uint32_t width, uint32_t height, const std::string& locale, const std::string& timezoneId);
/**
* @copydoc Dali::WebEngine::Create()
*/
- void Create(int width, int height, int argc, char** argv);
+ void Create(uint32_t width, uint32_t height, uint32_t argc, char** argv);
/**
* @copydoc Dali::WebEngine::Destroy()
/**
* @copydoc Dali::WebEngine::GetUrl()
*/
- const std::string& GetUrl();
+ std::string GetUrl() const;
/**
* @copydoc Dali::WebEngine::GetUserAgent()
*/
- const std::string& GetUserAgent() const;
+ std::string GetUserAgent() const;
/**
* @copydoc Dali::WebEngine::SetUserAgent()
/**
* @copydoc Dali::WebEngine::ScrollBy()
*/
- void ScrollBy(int deltaX, int deltaY);
+ void ScrollBy(int32_t deltaX, int32_t deltaY);
/**
* @copydoc Dali::WebEngine::ScrollEdgeBy()
*/
- bool ScrollEdgeBy(int deltaX, int deltaY);
+ bool ScrollEdgeBy(int32_t deltaX, int32_t deltaY);
/**
* @copydoc Dali::WebEngine::SetScrollPosition()
*/
- void SetScrollPosition(int x, int y);
+ void SetScrollPosition(int32_t x, int32_t y);
/**
* @copydoc Dali::WebEngine::GetScrollPosition()
void JavaScriptPromptReply(const std::string& result);
/**
+ * @copydoc Dali::WebEngine::CreateHitTest()
+ */
+ std::unique_ptr<Dali::WebEngineHitTest> CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode);
+
+ /**
+ * @copydoc Dali::WebEngine::CreateHitTestAsynchronously()
+ */
+ bool CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback);
+
+ /**
* @copydoc Dali::WebEngine::CanGoForward()
*/
bool CanGoForward();
/**
* @copydoc Dali::WebEngine::EvaluateJavaScript()
*/
- void EvaluateJavaScript(const std::string& script, std::function<void(const std::string&)> resultHandler);
+ void EvaluateJavaScript(const std::string& script, Dali::WebEnginePlugin::JavaScriptMessageHandlerCallback resultHandler);
/**
* @copydoc Dali::WebEngine::AddJavaScriptMessageHandler()
*/
- void AddJavaScriptMessageHandler(const std::string& exposedObjectName, std::function<void(const std::string&)> handler);
+ void AddJavaScriptMessageHandler(const std::string& exposedObjectName, Dali::WebEnginePlugin::JavaScriptMessageHandlerCallback handler);
/**
* @copydoc Dali::WebEngine::ClearAllTilesResources()
/**
* @copydoc Dali::WebEngine::SetSize()
*/
- void SetSize(int width, int height);
+ void SetSize(uint32_t width, uint32_t height);
/**
* @copydoc Dali::WebEngine::EnableMouseEvents()
/**
* @copydoc Dali::WebEngine::GetScreenshot()
*/
- Dali::PixelData GetScreenshot(Dali::Rect<int> viewArea, float scaleFactor);
+ Dali::PixelData GetScreenshot(Dali::Rect<int32_t> viewArea, float scaleFactor);
/**
* @copydoc Dali::WebEngine::GetScreenshotAsync()
*/
- bool GetScreenshotAsynchronously(Dali::Rect<int> viewArea, float scaleFactor, Dali::WebEnginePlugin::ScreenshotCapturedCallback callback);
+ bool GetScreenshotAsynchronously(Dali::Rect<int32_t> viewArea, float scaleFactor, Dali::WebEnginePlugin::ScreenshotCapturedCallback callback);
/**
* @copydoc Dali::WebEngine::IsVideoPlaying()
/**
* @copydoc Dali::WebEngine::UpdateDisplayArea()
*/
- void UpdateDisplayArea(Dali::Rect<int> displayArea);
+ void UpdateDisplayArea(Dali::Rect<int32_t> displayArea);
/**
* @copydoc Dali::WebEngine::EnableVideoHole()
bool SendWheelEvent(const Dali::WheelEvent& event);
/**
- * @copydoc Dali::WebEngine::PageLoadStartedSignal()
+ * @copydoc Dali::WebEngine::FrameRenderedSignal()
*/
- Dali::WebEnginePlugin::WebEnginePageLoadSignalType& PageLoadStartedSignal();
+ Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType& FrameRenderedSignal();
/**
- * @copydoc Dali::WebEngine::PageLoadProgressSignal()
+ * @copydoc Dali::WebEngine::RegisterPageLoadStartedCallback()
*/
- Dali::WebEnginePlugin::WebEnginePageLoadSignalType& PageLoadInProgressSignal();
+ void RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback);
/**
- * @copydoc Dali::WebEngine::PageLoadFinishedSignal()
+ * @copydoc Dali::WebEngine::RegisterPageLoadInProgressCallback()
*/
- Dali::WebEnginePlugin::WebEnginePageLoadSignalType& PageLoadFinishedSignal();
+ void RegisterPageLoadInProgressCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback);
/**
- * @copydoc Dali::WebEngine::PageLoadErrorSignal()
+ * @copydoc Dali::WebEngine::RegisterPageLoadFinishedCallback()
*/
- Dali::WebEnginePlugin::WebEnginePageLoadErrorSignalType& PageLoadErrorSignal();
+ void RegisterPageLoadFinishedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback);
/**
- * @copydoc Dali::WebEngine::ScrollEdgeReachedSignal()
+ * @copydoc Dali::WebEngine::RegisterPageLoadErrorCallback()
*/
- Dali::WebEnginePlugin::WebEngineScrollEdgeReachedSignalType& ScrollEdgeReachedSignal();
+ void RegisterPageLoadErrorCallback(Dali::WebEnginePlugin::WebEnginePageLoadErrorCallback callback);
/**
- * @copydoc Dali::WebEngine::UrlChangedSignal()
+ * @copydoc Dali::WebEngine::RegisterScrollEdgeReachedCallback()
*/
- Dali::WebEnginePlugin::WebEngineUrlChangedSignalType& UrlChangedSignal();
+ void RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback);
/**
- * @copydoc Dali::WebEngine::FormRepostDecisionSignal()
+ * @copydoc Dali::WebEngine::RegisterUrlChangedCallback()
*/
- Dali::WebEnginePlugin::WebEngineFormRepostDecisionSignalType& FormRepostDecisionSignal();
+ void RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback);
/**
- * @copydoc Dali::WebEngine::FrameRenderedSignal()
+ * @copydoc Dali::WebEngine::RegisterFormRepostDecidedCallback()
*/
- Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType& FrameRenderedSignal();
+ void RegisterFormRepostDecidedCallback(Dali::WebEnginePlugin::WebEngineFormRepostDecidedCallback callback);
+
+ /**
+ * @copydoc Dali::WebEngine::RegisterRequestInterceptorCallback()
+ */
+ void RegisterRequestInterceptorCallback(Dali::WebEnginePlugin::WebEngineRequestInterceptorCallback callback);
+
+ /**
+ @copydoc Dali::WebEngine::RegisterConsoleMessageReceivedCallback()
+ */
+ void RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback);
+
+ /**
+ @copydoc Dali::WebEngine::RegisterResponsePolicyDecidedCallback()
+ */
+ void RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback);
+
+ /**
+ * @copydoc Dali::WebEngine::RegisterCertificateConfirmedCallback()
+ */
+ void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback);
+
+ /**
+ * @copydoc Dali::WebEngine::RegisterSslCertificateChangedCallback()
+ */
+ void RegisterSslCertificateChangedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback);
+
+ /**
+ * @copydoc Dali::WebEngine::RegisterHttpAuthHandlerCallback()
+ */
+ void RegisterHttpAuthHandlerCallback(Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback callback);
+
+ /**
+ * @copydoc Dali::WebEngine::RegisterContextMenuShownCallback()
+ */
+ void RegisterContextMenuShownCallback(Dali::WebEnginePlugin::WebEngineContextMenuShownCallback callback);
+
+ /**
+ * @copydoc Dali::WebEngine::RegisterContextMenuHiddenCallback()
+ */
+ void RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback);
+
+ /**
+ * @copydoc Dali::WebEngine::GetPlainTextAsynchronously()
+ */
+ void GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback);
private:
/**
WebEngine& operator=(const WebEngine& WebEngine);
/**
- * @brief Initializes member data.
+ * @brief Initialize member data.
*
* @return Whether the initialization succeed or not.
*/
bool Initialize();
/**
- * @brief Initializes library handle by loading web engine plugin.
+ * @brief Initialize library handle by loading web engine plugin.
*
* @return Whether the initialization succeed or not.
*/