X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fweb-view%2Fweb-view-impl.h;h=cf5319f6d6c247a6bf893b1564ab1a4c06501290;hb=979b10d9898707860fc2ee542dc0bb9946097eb9;hp=6898afaaabf35dbfe9812b5ecf59e8e5bba0b9df;hpb=13d67c6114ee1ec18fabf666b485cf8923ddc004;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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..cf5319f --- a/dali-toolkit/internal/controls/web-view/web-view-impl.h +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.h @@ -339,6 +339,16 @@ 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(); + public: // Properties /** * @brief Called when a property of an object of this type is set. @@ -407,7 +417,7 @@ 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 */ @@ -421,54 +431,54 @@ private: 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; @@ -486,31 +496,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 +534,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 +552,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 */ @@ -585,7 +595,7 @@ 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. @@ -648,6 +658,18 @@ 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); + private: std::string mUrl; Dali::Toolkit::Visual::Base mVisual; @@ -662,12 +684,15 @@ private: 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; std::unique_ptr mWebContext; std::unique_ptr mWebCookieManager; std::unique_ptr mWebSettings; std::unique_ptr mWebBackForwardList; - Dali::Toolkit::ImageView mFaviconView; + + Dali::Toolkit::ImageView mFaviconView; Dali::PropertyNotification mPositionUpdateNotification; Dali::PropertyNotification mSizeUpdateNotification;