X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-web-engine.cpp;h=9aa5155cf92343d231f77c6e1eec7055c4935f7d;hp=48676eaaa7b0b72a05457e67dec2ea8d93f35459;hb=8d7facdc053ca256566f8e91c180b9027692ef2a;hpb=cf5f3348fac583716248323ab040f384f856e39a diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp index 48676ea..9aa5155 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp @@ -23,10 +23,10 @@ #include #include #include +#include #include #include #include -#include #include namespace Dali @@ -446,22 +446,19 @@ public: mScrollPosition.y = y; } - void GetScrollPosition( int& x, int& y ) const + Dali::Vector2 GetScrollPosition() const { - x = mScrollPosition.x; - y = mScrollPosition.y; + return mScrollPosition; } - void GetScrollSize( int& w, int& h ) const + Dali::Vector2 GetScrollSize() const { - w = mScrollSize.width; - h = mScrollSize.height; + return mScrollSize; } - void GetContentSize( int& w, int& h ) const + Dali::Vector2 GetContentSize() const { - w = mContentSize.width; - h = mContentSize.height; + return mContentSize; } Dali::WebEnginePlugin::WebEnginePageLoadSignalType& PageLoadStartedSignal() @@ -769,19 +766,19 @@ void WebEngine::SetScrollPosition( int x, int y ) Internal::Adaptor::GetImplementation( *this ).SetScrollPosition( x, y ); } -void WebEngine::GetScrollPosition( int& x, int& y ) const +Dali::Vector2 WebEngine::GetScrollPosition() const { - Internal::Adaptor::GetImplementation( *this ).GetScrollPosition( x, y ); + return Internal::Adaptor::GetImplementation( *this ).GetScrollPosition(); } -void WebEngine::GetScrollSize( int& w, int& h ) const +Dali::Vector2 WebEngine::GetScrollSize() const { - Internal::Adaptor::GetImplementation( *this ).GetScrollSize( w, h ); + return Internal::Adaptor::GetImplementation( *this ).GetScrollSize(); } -void WebEngine::GetContentSize( int& w, int& h ) const +Dali::Vector2 WebEngine::GetContentSize() const { - Internal::Adaptor::GetImplementation( *this ).GetContentSize( w, h ); + return Internal::Adaptor::GetImplementation( *this ).GetContentSize(); } void WebEngine::SetSize( int width, int height ) @@ -802,6 +799,14 @@ void WebEngine::SetFocus( bool focused ) { } +void WebEngine::UpdateDisplayArea( Dali::Rect< int > displayArea ) +{ +} + +void WebEngine::EnableVideoHole( bool enabled ) +{ +} + Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadStartedSignal() { return Internal::Adaptor::GetImplementation( *this ).PageLoadStartedSignal();