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.cpp;h=0cf97a4a7923aeb003974fdecb6beb8ae86ac1e2;hp=1205cc2ddfd2a3b8a7a593d67c414f22d7060cdb;hb=bdf6f4a40418173ffb5a71768b90acd2ba9b3ce9;hpb=68f3682143d00699debff8f6a1414bd4f5855b6d diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp index 1205cc2..0cf97a4 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -524,23 +524,17 @@ Property::Value WebView::GetProperty( BaseObject* object, Property::Index proper } case Toolkit::WebView::Property::SCROLL_POSITION: { - int x, y; - impl.GetScrollPosition( x, y ); - value = Vector2( x, y ); + value = impl.GetScrollPosition(); break; } case Toolkit::WebView::Property::SCROLL_SIZE: { - int width, height; - impl.GetScrollSize( width, height ); - value = Vector2( width, height ); + value = impl.GetScrollSize(); break; } case Toolkit::WebView::Property::CONTENT_SIZE: { - int width, height; - impl.GetContentSize( width, height ); - value = Vector2( width, height ); + value = impl.GetContentSize(); break; } case Toolkit::WebView::Property::TITLE: @@ -606,28 +600,19 @@ void WebView::SetScrollPosition( int x, int y ) } } -void WebView::GetScrollPosition( int& x, int& y ) const +Dali::Vector2 WebView::GetScrollPosition() const { - if( mWebEngine ) - { - mWebEngine.GetScrollPosition( x, y ); - } + return mWebEngine ? mWebEngine.GetScrollPosition() : Dali::Vector2::ZERO; } -void WebView::GetScrollSize( int& width, int& height ) const +Dali::Vector2 WebView::GetScrollSize() const { - if( mWebEngine ) - { - mWebEngine.GetScrollSize( width, height ); - } + return mWebEngine ? mWebEngine.GetScrollSize() : Dali::Vector2::ZERO; } -void WebView::GetContentSize( int& width, int& height ) const +Dali::Vector2 WebView::GetContentSize() const { - if( mWebEngine ) - { - mWebEngine.GetContentSize( width, height ); - } + return mWebEngine ? mWebEngine.GetContentSize() : Dali::Vector2::ZERO; } std::string WebView::GetTitle() const