X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fweb-view%2Fweb-view.cpp;h=4d794043423b9e209283c201e53639963b8034cc;hp=201f280915f1b40b73e96733200c9a54cf644ca3;hb=218c58bb6854ca42475416c106b2edd58e24d6d6;hpb=ebc31d0e211cb33fe359071bcab608dbdc400080 diff --git a/dali-toolkit/devel-api/controls/web-view/web-view.cpp b/dali-toolkit/devel-api/controls/web-view/web-view.cpp old mode 100644 new mode 100755 index 201f280..4d79404 --- a/dali-toolkit/devel-api/controls/web-view/web-view.cpp +++ b/dali-toolkit/devel-api/controls/web-view/web-view.cpp @@ -59,7 +59,7 @@ WebView WebView::New(const std::string& locale, const std::string& timezoneId) return Internal::WebView::New(locale, timezoneId); } -WebView WebView::New(int argc, char** argv) +WebView WebView::New(uint32_t argc, char** argv) { return Internal::WebView::New(argc, argv); } @@ -89,7 +89,7 @@ Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const return Dali::Toolkit::GetImpl(*this).GetBackForwardList(); } -Dali::Toolkit::ImageView& WebView::GetFavicon() +Dali::Toolkit::ImageView WebView::GetFavicon() const { return Dali::Toolkit::GetImpl(*this).GetFavicon(); } @@ -104,11 +104,26 @@ void WebView::LoadHtmlString(const std::string& htmlString) Dali::Toolkit::GetImpl(*this).LoadHtmlString(htmlString); } +bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const std::string& basicUri, const std::string& unreachableUrl) +{ + return Dali::Toolkit::GetImpl(*this).LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl); +} + +bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri) +{ + return Dali::Toolkit::GetImpl(*this).LoadContents(contents, contentSize, mimeType, encoding, baseUri); +} + void WebView::Reload() { Dali::Toolkit::GetImpl(*this).Reload(); } +bool WebView::ReloadWithoutCache() +{ + return Dali::Toolkit::GetImpl(*this).ReloadWithoutCache(); +} + void WebView::StopLoading() { Dali::Toolkit::GetImpl(*this).StopLoading(); @@ -124,11 +139,46 @@ void WebView::Resume() Dali::Toolkit::GetImpl(*this).Resume(); } -void WebView::ScrollBy(int deltaX, int deltaY) +void WebView::SuspendNetworkLoading() +{ + Dali::Toolkit::GetImpl(*this).SuspendNetworkLoading(); +} + +void WebView::ResumeNetworkLoading() +{ + Dali::Toolkit::GetImpl(*this).ResumeNetworkLoading(); +} + +bool WebView::AddCustomHeader(const std::string& name, const std::string& value) +{ + return Dali::Toolkit::GetImpl(*this).AddCustomHeader(name, value); +} + +bool WebView::RemoveCustomHeader(const std::string& name) +{ + return Dali::Toolkit::GetImpl(*this).RemoveCustomHeader(name); +} + +uint32_t WebView::StartInspectorServer(uint32_t port) +{ + return Dali::Toolkit::GetImpl(*this).StartInspectorServer(port); +} + +bool WebView::StopInspectorServer() +{ + return Dali::Toolkit::GetImpl(*this).StopInspectorServer(); +} + +void WebView::ScrollBy(int32_t deltaX, int32_t deltaY) { Dali::Toolkit::GetImpl(*this).ScrollBy(deltaX, deltaY); } +bool WebView::ScrollEdgeBy(int32_t deltaX, int32_t deltaY) +{ + return Dali::Toolkit::GetImpl(*this).ScrollEdgeBy(deltaX, deltaY); +} + bool WebView::CanGoForward() { return Dali::Toolkit::GetImpl(*this).CanGoForward(); @@ -164,34 +214,44 @@ void WebView::AddJavaScriptMessageHandler(const std::string& exposedObjectName, Dali::Toolkit::GetImpl(*this).AddJavaScriptMessageHandler(exposedObjectName, handler); } -void WebView::RegisterJavaScriptAlertCallback( Dali::WebEnginePlugin::JavaScriptAlertCallback callback ) +void WebView::RegisterJavaScriptAlertCallback(Dali::WebEnginePlugin::JavaScriptAlertCallback callback) { - Dali::Toolkit::GetImpl( *this ).RegisterJavaScriptAlertCallback( callback ); + Dali::Toolkit::GetImpl(*this).RegisterJavaScriptAlertCallback(callback); } void WebView::JavaScriptAlertReply() { - Dali::Toolkit::GetImpl( *this ).JavaScriptAlertReply(); + Dali::Toolkit::GetImpl(*this).JavaScriptAlertReply(); +} + +void WebView::RegisterJavaScriptConfirmCallback(Dali::WebEnginePlugin::JavaScriptConfirmCallback callback) +{ + Dali::Toolkit::GetImpl(*this).RegisterJavaScriptConfirmCallback(callback); +} + +void WebView::JavaScriptConfirmReply(bool confirmed) +{ + Dali::Toolkit::GetImpl(*this).JavaScriptConfirmReply(confirmed); } -void WebView::RegisterJavaScriptConfirmCallback( Dali::WebEnginePlugin::JavaScriptConfirmCallback callback ) +void WebView::RegisterJavaScriptPromptCallback(Dali::WebEnginePlugin::JavaScriptPromptCallback callback) { - Dali::Toolkit::GetImpl( *this ).RegisterJavaScriptConfirmCallback( callback ); + Dali::Toolkit::GetImpl(*this).RegisterJavaScriptPromptCallback(callback); } -void WebView::JavaScriptConfirmReply( bool confirmed ) +void WebView::JavaScriptPromptReply(const std::string& result) { - Dali::Toolkit::GetImpl( *this ).JavaScriptConfirmReply( confirmed ); + Dali::Toolkit::GetImpl(*this).JavaScriptPromptReply(result); } -void WebView::RegisterJavaScriptPromptCallback( Dali::WebEnginePlugin::JavaScriptPromptCallback callback ) +std::unique_ptr WebView::CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode) { - Dali::Toolkit::GetImpl( *this ).RegisterJavaScriptPromptCallback( callback ); + return Dali::Toolkit::GetImpl(*this).CreateHitTest(x, y, mode); } -void WebView::JavaScriptPromptReply( const std::string& result ) +bool WebView::CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback) { - Dali::Toolkit::GetImpl( *this ).JavaScriptPromptReply( result ); + return Dali::Toolkit::GetImpl(*this).CreateHitTestAsynchronously(x, y, mode, callback); } void WebView::ClearHistory() @@ -201,7 +261,57 @@ void WebView::ClearHistory() void WebView::ClearAllTilesResources() { - Dali::Toolkit::GetImpl( *this ).ClearAllTilesResources(); + Dali::Toolkit::GetImpl(*this).ClearAllTilesResources(); +} + +void WebView::SetScaleFactor(float scaleFactor, Dali::Vector2 point) +{ + Dali::Toolkit::GetImpl(*this).SetScaleFactor(scaleFactor, point); +} + +float WebView::GetScaleFactor() const +{ + return Dali::Toolkit::GetImpl(*this).GetScaleFactor(); +} + +void WebView::ActivateAccessibility(bool activated) +{ + Dali::Toolkit::GetImpl(*this).ActivateAccessibility(activated); +} + +bool WebView::HighlightText(const std::string& text, Dali::WebEnginePlugin::FindOption options, uint32_t maxMatchCount) +{ + return Dali::Toolkit::GetImpl(*this).HighlightText(text, options, maxMatchCount); +} + +void WebView::AddDynamicCertificatePath(const std::string& host, const std::string& certPath) +{ + Dali::Toolkit::GetImpl(*this).AddDynamicCertificatePath(host, certPath); +} + +Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect viewArea, float scaleFactor) +{ + return Dali::Toolkit::GetImpl(*this).GetScreenshot(viewArea, scaleFactor); +} + +bool WebView::GetScreenshotAsynchronously(Dali::Rect viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback) +{ + return Dali::Toolkit::GetImpl(*this).GetScreenshotAsynchronously(viewArea, scaleFactor, callback); +} + +bool WebView::CheckVideoPlayingAsynchronously(Dali::WebEnginePlugin::VideoPlayingCallback callback) +{ + return Dali::Toolkit::GetImpl(*this).CheckVideoPlayingAsynchronously(callback); +} + +void WebView::RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback) +{ + Dali::Toolkit::GetImpl(*this).RegisterGeolocationPermissionCallback(callback); +} + +void WebView::SetTtsFocus(bool focused) +{ + Dali::Toolkit::GetImpl(*this).SetTtsFocus(focused); } WebView::WebViewPageLoadSignalType& WebView::PageLoadStartedSignal() @@ -211,7 +321,7 @@ WebView::WebViewPageLoadSignalType& WebView::PageLoadStartedSignal() WebView::WebViewPageLoadSignalType& WebView::PageLoadInProgressSignal() { - return Dali::Toolkit::GetImpl( *this ).PageLoadInProgressSignal(); + return Dali::Toolkit::GetImpl(*this).PageLoadInProgressSignal(); } WebView::WebViewPageLoadSignalType& WebView::PageLoadFinishedSignal() @@ -231,7 +341,57 @@ WebView::WebViewScrollEdgeReachedSignalType& WebView::ScrollEdgeReachedSignal() WebView::WebViewUrlChangedSignalType& WebView::UrlChangedSignal() { - return Dali::Toolkit::GetImpl( *this ).UrlChangedSignal(); + return Dali::Toolkit::GetImpl(*this).UrlChangedSignal(); +} + +WebView::WebViewFormRepostDecisionSignalType& WebView::FormRepostDecisionSignal() +{ + return Dali::Toolkit::GetImpl(*this).FormRepostDecisionSignal(); +} + +WebView::WebViewFrameRenderedSignalType& WebView::FrameRenderedSignal() +{ + return Dali::Toolkit::GetImpl(*this).FrameRenderedSignal(); +} + +WebView::WebViewRequestInterceptorSignalType& WebView::RequestInterceptorSignal() +{ + return Dali::Toolkit::GetImpl(*this).RequestInterceptorSignal(); +} + +WebView::WebViewConsoleMessageSignalType& WebView::ConsoleMessageSignal() +{ + return Dali::Toolkit::GetImpl(*this).ConsoleMessageSignal(); +} + +WebView::WebViewResponsePolicyDecisionSignalType& WebView::ResponsePolicyDecisionSignal() +{ + return Dali::Toolkit::GetImpl(*this).ResponsePolicyDecisionSignal(); +} + +WebView::WebViewCertificateSignalType& WebView::CertificateConfirmSignal() +{ + return Dali::Toolkit::GetImpl(*this).CertificateConfirmSignal(); +} + +WebView::WebViewCertificateSignalType& WebView::SslCertificateChangedSignal() +{ + return Dali::Toolkit::GetImpl(*this).SslCertificateChangedSignal(); +} + +WebView::WebViewHttpAuthHandlerSignalType& WebView::HttpAuthHandlerSignal() +{ + return Dali::Toolkit::GetImpl(*this).HttpAuthHandlerSignal(); +} + +WebView::WebViewContextMenuShownSignalType& WebView::ContextMenuShownSignal() +{ + return Dali::Toolkit::GetImpl(*this).ContextMenuShownSignal(); +} + +WebView::WebViewContextMenuHiddenSignalType& WebView::ContextMenuHiddenSignal() +{ + return Dali::Toolkit::GetImpl(*this).ContextMenuHiddenSignal(); } WebView::WebView(Internal::WebView& implementation)