X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fweb-view%2Fweb-view-impl.h;h=a9917fd9a816f8033a580f4dede2b81c039eed9a;hp=6898afaaabf35dbfe9812b5ecf59e8e5bba0b9df;hb=218c58bb6854ca42475416c106b2edd58e24d6d6;hpb=580eea83bb02f8b936dc348ba4c1bee86df2500b diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.h b/dali-toolkit/internal/controls/web-view/web-view-impl.h old mode 100644 new mode 100755 index 6898afa..a9917fd --- a/dali-toolkit/internal/controls/web-view/web-view-impl.h +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.h @@ -52,7 +52,7 @@ protected: WebView(const std::string& locale, const std::string& timezoneId); - WebView(int argc, char** argv); + WebView(uint32_t argc, char** argv); virtual ~WebView(); @@ -68,36 +68,34 @@ public: static Toolkit::WebView New(const std::string& locale, const std::string& timezoneId); /** - * @copydoc Dali::Toolkit::WebView::New( int, char** ) + * @copydoc Dali::Toolkit::WebView::New( uint32_t, char** ) */ - static Toolkit::WebView New(int argc, char** argv); + static Toolkit::WebView New(uint32_t argc, char** argv); /** - * @brief Get settings of WebEngine. + * @copydoc Dali::Toolkit::WebView::GetSettings() */ Dali::Toolkit::WebSettings* GetSettings() const; /** - * @brief Get context of WebEngine. + * @copydoc Dali::Toolkit::WebView::GetContext() */ Dali::Toolkit::WebContext* GetContext() const; /** - * @brief Get cookie manager of WebEngine. + * @copydoc Dali::Toolkit::WebView::GetCookieManager() */ Dali::Toolkit::WebCookieManager* GetCookieManager() const; /** - * @brief Get WebBackForwardList of WebEngine. + * @copydoc Dali::Toolkit::WebView::GetBackForwardList() */ Dali::Toolkit::WebBackForwardList* GetBackForwardList() const; /** - * @brief Get Favicon of web page. - * - * @return Handle to a fav icon + * @copydoc Dali::Toolkit::WebView::GetFavicon() */ - Dali::Toolkit::ImageView& GetFavicon(); + Dali::Toolkit::ImageView GetFavicon() const; /** * @copydoc Dali::Toolkit::WebView::LoadUrl() @@ -177,12 +175,12 @@ public: /** * @copydoc Dali::Toolkit::WebView::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::Toolkit::WebView::CanGoForward() @@ -245,6 +243,16 @@ public: void JavaScriptPromptReply(const std::string& result); /** + * @copydoc Dali::Toolkit::WebView::CreateHitTest() + */ + std::unique_ptr CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode); + + /** + * @copydoc Dali::Toolkit::WebView::CreateHitTestAsynchronously() + */ + bool CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback); + + /** * @copydoc Dali::Toolkit::WebView::ClearHistory() */ void ClearHistory(); @@ -282,12 +290,12 @@ public: /** * @copydoc Dali::Toolkit::WebView::GetScreenshot() */ - Dali::Toolkit::ImageView GetScreenshot(Dali::Rect viewArea, float scaleFactor); + Dali::Toolkit::ImageView GetScreenshot(Dali::Rect viewArea, float scaleFactor); /** * @copydoc Dali::Toolkit::WebView::GetScreenshotAsynchronously() */ - bool GetScreenshotAsynchronously(Dali::Rect viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback); + bool GetScreenshotAsynchronously(Dali::Rect viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback); /** * @copydoc Dali::Toolkit::WebView::CheckVideoPlayingAsynchronously() @@ -300,6 +308,11 @@ public: void RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback); /** + * @copydoc Dali::Toolkit::WebView::SetTtsFocus() + */ + void SetTtsFocus(bool focused); + + /** * @copydoc Dali::Toolkit::WebView::PageLoadStartedSignal() */ Dali::Toolkit::WebView::WebViewPageLoadSignalType& PageLoadStartedSignal(); @@ -339,6 +352,46 @@ public: */ Dali::Toolkit::WebView::WebViewFrameRenderedSignalType& FrameRenderedSignal(); + /** + * @copydoc Dali::Toolkit::WebView::RequestInterceptorSignal() + */ + Dali::Toolkit::WebView::WebViewRequestInterceptorSignalType& RequestInterceptorSignal(); + + /** + * @copydoc Dali::Toolkit::WebView::ConsoleMessageSignal() + */ + Dali::Toolkit::WebView::WebViewConsoleMessageSignalType& ConsoleMessageSignal(); + + /** + * @copydoc Dali::Toolkit::WebView::ResponsePolicyDecisionSignal() + */ + Dali::Toolkit::WebView::WebViewResponsePolicyDecisionSignalType& ResponsePolicyDecisionSignal(); + + /** + * @copydoc Dali::Toolkit::WebView::CertificateConfirmSignal() + */ + Dali::Toolkit::WebView::WebViewCertificateSignalType& CertificateConfirmSignal(); + + /** + * @copydoc Dali::Toolkit::WebView::SslCertificateChangedSignal() + */ + Dali::Toolkit::WebView::WebViewCertificateSignalType& SslCertificateChangedSignal(); + + /** + * @copydoc Dali::Toolkit::WebView::HttpAuthHandlerSignal() + */ + Dali::Toolkit::WebView::WebViewHttpAuthHandlerSignalType& HttpAuthHandlerSignal(); + + /** + * @copydoc Dali::Toolkit::WebView::ContextMenuShownSignal() + */ + Dali::Toolkit::WebView::WebViewContextMenuShownSignalType& ContextMenuShownSignal(); + + /** + * @copydoc Dali::Toolkit::WebView::ContextMenuHiddenSignal() + */ + Dali::Toolkit::WebView::WebViewContextMenuHiddenSignalType& ContextMenuHiddenSignal(); + public: // Properties /** * @brief Called when a property of an object of this type is set. @@ -407,77 +460,83 @@ private: WebView& operator=(const WebView& webView); /** - * @brief Sets an absolute scroll of the given view. + * @brief Set an absolute scroll of the given view. * @param[in] x The coordinate x of scroll * @param[in] y The coordinate y of scroll */ - void SetScrollPosition(int x, int y); + void SetScrollPosition(int32_t x, int32_t y); /** - * @brief Gets the current scroll position of the given view. + * @brief Get the current scroll position of the given view. * @param[out] x The coordinate x of scroll * @param[out] y The coordinate y of scroll */ Dali::Vector2 GetScrollPosition() const; /** - * @brief Gets the possible scroll size of the given view. + * @brief Get the possible scroll size of the given view. * @param[out] width The width of scroll size * @param[out] height The height of scroll size */ Dali::Vector2 GetScrollSize() const; /** - * @brief Gets the last known content's size. + * @brief Get the last known content's size. * @param[out] width The width of content's size * @param[out] height The height of content's size */ Dali::Vector2 GetContentSize() const; /** - * @brief Returns the title of the Web. + * @brief Return the title of the Web. * * @return The title of web page */ std::string GetTitle() const; /** - * @brief Sets the background color of web page. + * @brief Set the background color of web page. * @param[in] color The value of background color. */ void SetDocumentBackgroundColor(Dali::Vector4 color); /** - * @brief Clears tiles when hidden. + * @brief Clear tiles when hidden. * * @param[in] cleared Whether tiles are cleared or not */ void ClearTilesWhenHidden(bool cleared); /** - * @brief Sets multiplier of cover area of tile. + * @brief Set multiplier of cover area of tile. * * @param[in] multiplier The multiplier of cover area */ void SetTileCoverAreaMultiplier(float multiplier); /** - * @brief Enables cursor by client. + * @brief Enable cursor by client. * @param[in] enabled Whether cursor is enabled or not. */ void EnableCursorByClient(bool enabled); /** - * @brief Gets the selected text. + * @brief Get the selected text. * @return The selected text */ std::string GetSelectedText() const; /** + * @brief Get url of web page. + * @return The string of url + */ + std::string GetUrl() const; + + /** * @brief Get user agent string. * @return The string value of user agent */ - const std::string& GetUserAgent() const; + std::string GetUserAgent() const; /** * @brief Set user agent string. @@ -486,31 +545,31 @@ private: void SetUserAgent(const std::string& userAgent); /** - * @brief Sets zoom factor of the current page. + * @brief Set zoom factor of the current page. * @param[in] zoomFactor a new factor to be set. */ void SetPageZoomFactor(float zoomFactor); /** - * @brief Queries the current zoom factor of the page。 + * @brief Query the current zoom factor of the page。 * @return The current page zoom factor. */ float GetPageZoomFactor() const; /** - * @brief Sets the current text zoom level。. + * @brief Set the current text zoom level。. * @param[in] zoomFactor a new factor to be set. */ void SetTextZoomFactor(float zoomFactor); /** - * @brief Gets the current text zoom level. + * @brief Get the current text zoom level. * @return The current text zoom factor. */ float GetTextZoomFactor() const; /** - * @brief Gets the current load progress of the page. + * @brief Get the current load progress of the page. * @return The load progress of the page. */ float GetLoadProgressPercentage() const; @@ -524,7 +583,7 @@ private: bool SetVisibility(bool visible); /** - * @brief Updates display area of web view. + * @brief Update display area of web view. * @param[in] source The soource triggers Notification. */ void UpdateDisplayArea(Dali::PropertyNotification& source); @@ -542,14 +601,14 @@ private: void EnableBlendMode(bool blendEnabled); /** - * @brief Enables/disables mouse events. The default is enabled. + * @brief Enable/disable mouse events. The default is enabled. * * @param[in] enabled True if mouse events are enabled, false otherwise */ void EnableMouseEvents(bool enabled); /** - * @brief Enables/disables key events. The default is enabled. + * @brief Enable/disable key events. The default is enabled. * * @param[in] enabled True if key events enabled, false otherwise */ @@ -560,7 +619,7 @@ private: * @param[in] pixel Pixel data * @return The new image view */ - Dali::Toolkit::ImageView CreateImageView(Dali::PixelData pixel); + Dali::Toolkit::ImageView CreateImageView(Dali::PixelData pixel) const; /** * @brief Callback function to be called when page load started. @@ -585,11 +644,11 @@ private: * @param[in] url The url currently being loaded * @param[in] errorCode The error code */ - void OnPageLoadError(const std::string& url, int errorCode); + void OnPageLoadError(std::shared_ptr error); /** * @brief Callback function to be called when scroll edge is reached. - * @param[in] e The scroll edge reached. + * @param[in] edge The scroll edge reached. */ void OnScrollEdgeReached(Dali::WebEnginePlugin::ScrollEdge edge); @@ -600,7 +659,7 @@ private: void OnUrlChanged(const std::string& url); /** - * Signal occurs when the Web View has been touched. + * @brief Signal occurs when the Web View has been touched. * @param[in] actor The Actor Touched * @param[in] touch The Touch Data. * @return Whether to consume event or not. @@ -608,7 +667,7 @@ private: bool OnTouchEvent(Actor actor, const Dali::TouchEvent& touch); /** - * Signal occurs when the Web View has been hovered. + * @brief Signal occurs when the Web View has been hovered. * @param[in] actor The Actor Hovered * @param[in] hover The Hover Data. * @return Whether to consume event or not. @@ -616,7 +675,7 @@ private: bool OnHoverEvent(Actor actor, const Dali::HoverEvent& hover); /** - * Signal occurs when the Web View receives wheel event. + * @brief Signal occurs when the Web View receives wheel event. * @param[in] actor The Actor that receives Wheel event. * @param[in] wheel The Wheel Data. * @return Whether to consume event or not. @@ -635,6 +694,11 @@ private: void OnFrameRendered(); /** + * @brief Callback function to be called when frame is rendered. This is to check initial buffer is ready. + */ + void OnInitialFrameRendered(); + + /** * @brief Callback function to be called when visibility is changed. * @param[in] actor The actor, or child of actor, whose visibility has changed * @param[in] isVisible Whether the actor is now visible or not @@ -648,32 +712,86 @@ private: */ void OnScreenshotCaptured(Dali::PixelData pixel); + /** + * @brief Callback function to be called when http request need be intercepted. + * @param [in] request The http request interceptor. + */ + void OnInterceptRequest(std::shared_ptr interceptor); + + /** + * @brief Callback function to be called when console message will be logged. + * @param[in] message The message logged. + */ + void OnConsoleMessage(std::shared_ptr message); + + /** + * @brief Callback function to be called when response policy need be decided. + * @param[in] decision The policy decided. + */ + void OnResponsePolicyDecided(std::shared_ptr decision); + + /** + * @brief Callback function to be called when certificate need be confirmed. + * @param[in] certificate The certificate policy decision. + */ + void OnCertificateConfirm(std::shared_ptr certificate); + + /** + * @brief Callback function to be called when ssl certificate is changed. + * @param[in] certificate The certificate information received. + */ + void OnSslCertificateChanged(std::shared_ptr certificate); + + /** + * @brief Callback function to be called when http authentication need be confirmed. + * @param[in] handler The handler for http authentication + */ + void OnHttpAuthenticationRequest(std::shared_ptr handler); + + /** + * @brief Callback function to be called when context menu would be shown. + * @param[in] e The scroll edge reached. + */ + void OnContextMenuShown(std::shared_ptr menu); + + /** + * @brief Callback function to be called when context menu would be hidden. + * @param[in] url The url currently being loaded + */ + void OnContextMenuHidden(std::shared_ptr menu); + private: - std::string mUrl; Dali::Toolkit::Visual::Base mVisual; Dali::Size mWebViewSize; Dali::WebEngine mWebEngine; - Dali::Toolkit::WebView::WebViewPageLoadSignalType mPageLoadStartedSignal; - Dali::Toolkit::WebView::WebViewPageLoadSignalType mPageLoadInProgressSignal; - Dali::Toolkit::WebView::WebViewPageLoadSignalType mPageLoadFinishedSignal; - Dali::Toolkit::WebView::WebViewPageLoadErrorSignalType mPageLoadErrorSignal; - Dali::Toolkit::WebView::WebViewUrlChangedSignalType mUrlChangedSignal; - Dali::Toolkit::WebView::WebViewScrollEdgeReachedSignalType mScrollEdgeReachedSignal; - Dali::Toolkit::WebView::WebViewFormRepostDecisionSignalType mFormRepostDecisionSignal; - Dali::Toolkit::WebView::WebViewFrameRenderedSignalType mFrameRenderedSignal; + Dali::Toolkit::WebView::WebViewPageLoadSignalType mPageLoadStartedSignal; + Dali::Toolkit::WebView::WebViewPageLoadSignalType mPageLoadInProgressSignal; + Dali::Toolkit::WebView::WebViewPageLoadSignalType mPageLoadFinishedSignal; + Dali::Toolkit::WebView::WebViewPageLoadErrorSignalType mPageLoadErrorSignal; + Dali::Toolkit::WebView::WebViewUrlChangedSignalType mUrlChangedSignal; + Dali::Toolkit::WebView::WebViewScrollEdgeReachedSignalType mScrollEdgeReachedSignal; + Dali::Toolkit::WebView::WebViewFormRepostDecisionSignalType mFormRepostDecisionSignal; + Dali::Toolkit::WebView::WebViewFrameRenderedSignalType mFrameRenderedSignal; + Dali::Toolkit::WebView::WebViewRequestInterceptorSignalType mRequestInterceptorSignal; + Dali::Toolkit::WebView::WebViewConsoleMessageSignalType mConsoleMessageSignal; + Dali::Toolkit::WebView::WebViewResponsePolicyDecisionSignalType mResponsePolicyDecisionSignal; + Dali::Toolkit::WebView::WebViewCertificateSignalType mCertificateConfirmSignal; + Dali::Toolkit::WebView::WebViewCertificateSignalType mSslCertificateChangedSignal; + Dali::Toolkit::WebView::WebViewHttpAuthHandlerSignalType mHttpAuthHandlerSignal; + Dali::Toolkit::WebView::WebViewContextMenuShownSignalType mContextMenuShownSignal; + Dali::Toolkit::WebView::WebViewContextMenuHiddenSignalType mContextMenuHiddenSignal; std::unique_ptr mWebContext; std::unique_ptr mWebCookieManager; std::unique_ptr mWebSettings; std::unique_ptr mWebBackForwardList; - Dali::Toolkit::ImageView mFaviconView; Dali::PropertyNotification mPositionUpdateNotification; Dali::PropertyNotification mSizeUpdateNotification; Dali::PropertyNotification mScaleUpdateNotification; + Dali::Rect mWebViewArea; bool mVideoHoleEnabled; - Dali::Rect mWebViewArea; bool mMouseEventsEnabled; bool mKeyEventsEnabled;