X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fweb-view%2Fweb-view.cpp;h=338f8b9960250b4a8aa34a2d5b67d069453953e1;hb=e9075a50279076fa8d070e8ee53b7922779a8b66;hp=20ae948bc9e392fe26df0eced24bc8142a997c46;hpb=e5d379064ba0e9a68d1d2680906952dbde263f34;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 20ae948..338f8b9 --- a/dali-toolkit/devel-api/controls/web-view/web-view.cpp +++ b/dali-toolkit/devel-api/controls/web-view/web-view.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -23,24 +23,22 @@ namespace Dali { - namespace Toolkit { - WebView::WebView() { } -WebView::WebView( const WebView& WebView ) -: Control( WebView ) +WebView::WebView(const WebView& WebView) +: Control(WebView) { } -WebView& WebView::operator=( const WebView& view ) +WebView& WebView::operator=(const WebView& view) { - if( &view != this ) + if(&view != this) { - Control::operator=( view ); + Control::operator=(view); } return *this; @@ -55,120 +53,130 @@ WebView WebView::New() return Internal::WebView::New(); } -WebView WebView::New( const std::string& locale, const std::string& timezoneId ) +WebView WebView::New(const std::string& locale, const std::string& timezoneId) { - return Internal::WebView::New( locale, timezoneId ); + return Internal::WebView::New(locale, timezoneId); } -WebView WebView::DownCast( BaseHandle handle ) +WebView WebView::DownCast(BaseHandle handle) { - return Control::DownCast< WebView, Internal::WebView >( handle ); + return Control::DownCast(handle); } -void WebView::LoadUrl( const std::string& url ) +void WebView::LoadUrl(const std::string& url) { - Dali::Toolkit::GetImpl( *this ).LoadUrl( url ); + Dali::Toolkit::GetImpl(*this).LoadUrl(url); } -void WebView::LoadHTMLString( const std::string& htmlString ) +void WebView::LoadHTMLString(const std::string& htmlString) { - Dali::Toolkit::GetImpl( *this ).LoadHTMLString( htmlString ); + Dali::Toolkit::GetImpl(*this).LoadHTMLString(htmlString); } void WebView::Reload() { - Dali::Toolkit::GetImpl( *this ).Reload(); + Dali::Toolkit::GetImpl(*this).Reload(); } void WebView::StopLoading() { - Dali::Toolkit::GetImpl( *this ).StopLoading(); + Dali::Toolkit::GetImpl(*this).StopLoading(); } void WebView::Suspend() { - Dali::Toolkit::GetImpl( *this ).Suspend(); + Dali::Toolkit::GetImpl(*this).Suspend(); } void WebView::Resume() { - Dali::Toolkit::GetImpl( *this ).Resume(); + Dali::Toolkit::GetImpl(*this).Resume(); +} + +void WebView::ScrollBy( int deltaX, int deltaY ) +{ + Dali::Toolkit::GetImpl( *this ).ScrollBy( deltaX, deltaY ); } bool WebView::CanGoForward() { - return Dali::Toolkit::GetImpl( *this ).CanGoForward(); + return Dali::Toolkit::GetImpl(*this).CanGoForward(); } void WebView::GoForward() { - Dali::Toolkit::GetImpl( *this ).GoForward(); + Dali::Toolkit::GetImpl(*this).GoForward(); } bool WebView::CanGoBack() { - return Dali::Toolkit::GetImpl( *this ).CanGoBack(); + return Dali::Toolkit::GetImpl(*this).CanGoBack(); } void WebView::GoBack() { - Dali::Toolkit::GetImpl( *this ).GoBack(); + Dali::Toolkit::GetImpl(*this).GoBack(); } -void WebView::EvaluateJavaScript( const std::string& script, std::function< void( const std::string& ) > resultHandler ) +void WebView::EvaluateJavaScript(const std::string& script, std::function resultHandler) { - Dali::Toolkit::GetImpl( *this ).EvaluateJavaScript( script, resultHandler ); + Dali::Toolkit::GetImpl(*this).EvaluateJavaScript(script, resultHandler); } -void WebView::EvaluateJavaScript( const std::string& script ) +void WebView::EvaluateJavaScript(const std::string& script) { - Dali::Toolkit::GetImpl( *this ).EvaluateJavaScript( script, nullptr ); + Dali::Toolkit::GetImpl(*this).EvaluateJavaScript(script, nullptr); } -void WebView::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler ) +void WebView::AddJavaScriptMessageHandler(const std::string& exposedObjectName, std::function handler) { - Dali::Toolkit::GetImpl( *this ).AddJavaScriptMessageHandler( exposedObjectName, handler ); + Dali::Toolkit::GetImpl(*this).AddJavaScriptMessageHandler(exposedObjectName, handler); } void WebView::ClearHistory() { - Dali::Toolkit::GetImpl( *this ).ClearHistory(); + Dali::Toolkit::GetImpl(*this).ClearHistory(); } void WebView::ClearCache() { - Dali::Toolkit::GetImpl( *this ).ClearCache(); + Dali::Toolkit::GetImpl(*this).ClearCache(); } void WebView::ClearCookies() { - Dali::Toolkit::GetImpl( *this ).ClearCookies(); + Dali::Toolkit::GetImpl(*this).ClearCookies(); } WebView::WebViewPageLoadSignalType& WebView::PageLoadStartedSignal() { - return Dali::Toolkit::GetImpl( *this ).PageLoadStartedSignal(); + return Dali::Toolkit::GetImpl(*this).PageLoadStartedSignal(); } WebView::WebViewPageLoadSignalType& WebView::PageLoadFinishedSignal() { - return Dali::Toolkit::GetImpl( *this ).PageLoadFinishedSignal(); + return Dali::Toolkit::GetImpl(*this).PageLoadFinishedSignal(); } WebView::WebViewPageLoadErrorSignalType& WebView::PageLoadErrorSignal() { - return Dali::Toolkit::GetImpl( *this ).PageLoadErrorSignal(); + return Dali::Toolkit::GetImpl(*this).PageLoadErrorSignal(); +} + +WebView::WebViewScrollEdgeReachedSignalType& WebView::ScrollEdgeReachedSignal() +{ + return Dali::Toolkit::GetImpl( *this ).ScrollEdgeReachedSignal(); } -WebView::WebView( Internal::WebView& implementation ) -: Control( implementation ) +WebView::WebView(Internal::WebView& implementation) +: Control(implementation) { } -WebView::WebView( Dali::Internal::CustomActor* internal ) -: Control( internal ) +WebView::WebView(Dali::Internal::CustomActor* internal) +: Control(internal) { - VerifyCustomActorPointer< Internal::WebView >( internal ); + VerifyCustomActorPointer(internal); } } // namespace Toolkit