// EXTERNAL INCLUDES
#include <cstring>
+#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list.h>
+#include <dali/devel-api/adaptor-framework/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine-settings.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
#include <dali/devel-api/common/stage.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-context.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/public-api/image-loader/image.h>
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
namespace Dali
return Toolkit::WebView::New();
}
-DALI_ENUM_TO_STRING_TABLE_BEGIN( CacheModel )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CacheModel, DOCUMENT_VIEWER )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CacheModel, DOCUMENT_BROWSER )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CacheModel, PRIMARY_WEB_BROWSER )
-DALI_ENUM_TO_STRING_TABLE_END( CacheModel )
-
-DALI_ENUM_TO_STRING_TABLE_BEGIN( CookieAcceptPolicy )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CookieAcceptPolicy, ALWAYS )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CookieAcceptPolicy, NEVER )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CookieAcceptPolicy, NO_THIRD_PARTY )
-DALI_ENUM_TO_STRING_TABLE_END( CookieAcceptPolicy )
-
DALI_TYPE_REGISTRATION_BEGIN( Toolkit::WebView, Toolkit::Control, Create )
DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "url", STRING, URL )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "cacheModel", STRING, CACHE_MODEL )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "cookieAcceptPolicy", STRING, COOKIE_ACCEPT_POLICY )
DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "userAgent", STRING, USER_AGENT )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "enableJavaScript", BOOLEAN, ENABLE_JAVASCRIPT )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "loadImagesAutomatically", BOOLEAN, LOAD_IMAGES_AUTOMATICALLY )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "defaultTextEncodingName", STRING, DEFAULT_TEXT_ENCODING_NAME )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "defaultFontSize", INTEGER, DEFAULT_FONT_SIZE )
+DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "scrollPosition", VECTOR2, SCROLL_POSITION )
+DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "scrollSize", VECTOR2, SCROLL_SIZE )
+DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "contentSize", VECTOR2, CONTENT_SIZE )
+DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "title", STRING, TITLE )
DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadStarted", PAGE_LOAD_STARTED_SIGNAL )
DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadFinished", PAGE_LOAD_FINISHED_SIGNAL )
DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadError", PAGE_LOAD_ERROR_SIGNAL )
+DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "scrollEdgeReached", SCROLL_EDGE_REACHED_SIGNAL )
DALI_TYPE_REGISTRATION_END()
}
}
+WebView::WebView( int argc, char** argv )
+: Control( ControlBehaviour( ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS ) ),
+ mUrl(),
+ mVisual(),
+ mWebViewSize( Stage::GetCurrent().GetSize() ),
+ mWebEngine(),
+ mPageLoadStartedSignal(),
+ mPageLoadFinishedSignal(),
+ mPageLoadErrorSignal()
+{
+ mWebEngine = Dali::WebEngine::New();
+
+ // WebEngine is empty when it is not properly initialized.
+ if ( mWebEngine )
+ {
+ mWebEngine.Create( mWebViewSize.width, mWebViewSize.height, argc, argv );
+ }
+}
+
WebView::WebView()
: WebView( "", "" )
{
return handle;
}
+Toolkit::WebView WebView::New( int argc, char** argv )
+{
+ WebView* impl = new WebView( argc, argv );
+ Toolkit::WebView handle = Toolkit::WebView( *impl );
+
+ impl->Initialize();
+ return handle;
+}
+
void WebView::OnInitialize()
{
Self().SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
mWebEngine.PageLoadStartedSignal().Connect( this, &WebView::OnPageLoadStarted );
mWebEngine.PageLoadFinishedSignal().Connect( this, &WebView::OnPageLoadFinished );
mWebEngine.PageLoadErrorSignal().Connect( this, &WebView::OnPageLoadError );
+ mWebEngine.ScrollEdgeReachedSignal().Connect( this, &WebView::OnScrollEdgeReached );
+
+ mWebContext = std::unique_ptr<Dali::Toolkit::WebContext>( new WebContext( mWebEngine.GetContext() ) );
+ mWebCookieManager = std::unique_ptr<Dali::Toolkit::WebCookieManager>( new WebCookieManager( mWebEngine.GetCookieManager() ) );
+ mWebSettings = std::unique_ptr<Dali::Toolkit::WebSettings>( new WebSettings( mWebEngine.GetSettings() ) );
+ mWebBackForwardList = std::unique_ptr<Dali::Toolkit::WebBackForwardList>( new WebBackForwardList( mWebEngine.GetBackForwardList() ) );
+ }
+}
+
+Dali::Toolkit::WebSettings* WebView::GetSettings() const
+{
+ return mWebSettings.get();
+}
+
+Dali::Toolkit::WebContext* WebView::GetContext() const
+{
+ return mWebContext.get();
+}
+
+Dali::Toolkit::WebCookieManager* WebView::GetCookieManager() const
+{
+ return mWebCookieManager.get();
+}
+
+Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
+{
+ return mWebBackForwardList.get();
+}
+
+Dali::Toolkit::ImageView& WebView::GetFavicon()
+{
+ if ( mWebEngine )
+ {
+ Dali::PixelData pixelData = mWebEngine.GetFavicon();
+ std::string url = Dali::Toolkit::Image::GenerateUrl( pixelData );
+ mFaviconView = Dali::Toolkit::ImageView::New( url );
+ mFaviconView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+ mFaviconView.SetProperty( Dali::Actor::Property::SIZE, Vector2( pixelData.GetWidth(), pixelData.GetHeight() ) );
}
+ return mFaviconView;
}
void WebView::LoadUrl( const std::string& url )
}
}
-void WebView::LoadHTMLString( const std::string& htmlString )
+void WebView::LoadHtmlString( const std::string& htmlString )
{
if( mWebEngine )
{
if( mVisual )
{
DevelControl::RegisterVisual( *this, Toolkit::WebView::Property::URL, mVisual );
- mWebEngine.LoadHTMLString( htmlString );
+ mWebEngine.LoadHtmlString( htmlString );
}
}
}
}
}
+void WebView::ScrollBy( int deltaX, int deltaY )
+{
+ if ( mWebEngine )
+ {
+ mWebEngine.ScrollBy( deltaX, deltaY );
+ }
+}
+
bool WebView::CanGoForward()
{
return mWebEngine ? mWebEngine.CanGoForward() : false;
}
}
-void WebView::ClearHistory()
+void WebView::ClearAllTilesResources()
{
if( mWebEngine )
{
- mWebEngine.ClearHistory();
+ mWebEngine.ClearAllTilesResources();
}
}
-void WebView::ClearCache()
-{
- if( mWebEngine )
- {
- mWebEngine.ClearCache();
- }
-}
-
-void WebView::ClearCookies()
+void WebView::ClearHistory()
{
if( mWebEngine )
{
- mWebEngine.ClearCookies();
+ mWebEngine.ClearHistory();
}
}
return mPageLoadErrorSignal;
}
+Dali::Toolkit::WebView::WebViewScrollEdgeReachedSignalType& WebView::ScrollEdgeReachedSignal()
+{
+ return mScrollEdgeReachedSignal;
+}
+
void WebView::OnPageLoadStarted( const std::string& url )
{
if( !mPageLoadStartedSignal.Empty() )
}
}
+void WebView::OnScrollEdgeReached( Dali::WebEnginePlugin::ScrollEdge edge )
+{
+ if( !mScrollEdgeReachedSignal.Empty() )
+ {
+ Dali::Toolkit::WebView handle( GetOwner() );
+ mScrollEdgeReachedSignal.Emit( handle, edge );
+ }
+}
+
bool WebView::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
{
Dali::BaseHandle handle( object );
webView.PageLoadErrorSignal().Connect( tracker, functor );
connected = true;
}
+ else if( 0 == strcmp( signalName.c_str(), SCROLL_EDGE_REACHED_SIGNAL ) )
+ {
+ webView.ScrollEdgeReachedSignal().Connect( tracker, functor );
+ connected = true;
+ }
return connected;
}
}
break;
}
- case Toolkit::WebView::Property::CACHE_MODEL:
- {
- Toolkit::WebView::CacheModel::Type output = impl.GetCacheModel();
- GET_ENUM_VALUE( CacheModel, value, output );
- impl.SetCacheModel( output );
- break;
- }
- case Toolkit::WebView::Property::COOKIE_ACCEPT_POLICY:
- {
- Toolkit::WebView::CookieAcceptPolicy::Type output = impl.GetCookieAcceptPolicy();
- GET_ENUM_VALUE( CookieAcceptPolicy, value, output );
- impl.SetCookieAcceptPolicy( output );
- break;
- }
case Toolkit::WebView::Property::USER_AGENT:
{
std::string input;
}
break;
}
- case Toolkit::WebView::Property::ENABLE_JAVASCRIPT:
- {
- bool input;
- if( value.Get( input ) )
- {
- impl.EnableJavaScript( input );
- }
- break;
- }
- case Toolkit::WebView::Property::LOAD_IMAGES_AUTOMATICALLY:
+ case Toolkit::WebView::Property::SCROLL_POSITION:
{
- bool input;
- if( value.Get( input ) )
+ Vector2 input;
+ if ( value.Get( input ) )
{
- impl.LoadImagesAutomatically( input );
- }
- break;
- }
- case Toolkit::WebView::Property::DEFAULT_TEXT_ENCODING_NAME:
- {
- std::string input;
- if( value.Get( input ) )
- {
- impl.SetDefaultTextEncodingName( input );
- }
- break;
- }
- case Toolkit::WebView::Property::DEFAULT_FONT_SIZE:
- {
- int input;
- if( value.Get( input ) )
- {
- impl.SetDefaultFontSize( input );
+ impl.SetScrollPosition( input.x, input.y );
}
break;
}
value = impl.mUrl;
break;
}
- case Toolkit::WebView::Property::CACHE_MODEL:
- {
- value = GET_ENUM_STRING( CacheModel, impl.GetCacheModel() );
- break;
- }
- case Toolkit::WebView::Property::COOKIE_ACCEPT_POLICY:
- {
- value = GET_ENUM_STRING( CookieAcceptPolicy, impl.GetCookieAcceptPolicy() );
- break;
- }
case Toolkit::WebView::Property::USER_AGENT:
{
value = impl.GetUserAgent();
break;
}
- case Toolkit::WebView::Property::ENABLE_JAVASCRIPT:
+ case Toolkit::WebView::Property::SCROLL_POSITION:
{
- value = impl.IsJavaScriptEnabled();
+ value = impl.GetScrollPosition();
break;
}
- case Toolkit::WebView::Property::LOAD_IMAGES_AUTOMATICALLY:
+ case Toolkit::WebView::Property::SCROLL_SIZE:
{
- value = impl.AreImagesAutomaticallyLoaded();
+ value = impl.GetScrollSize();
break;
}
- case Toolkit::WebView::Property::DEFAULT_TEXT_ENCODING_NAME:
+ case Toolkit::WebView::Property::CONTENT_SIZE:
{
- value = impl.GetDefaultTextEncodingName();
+ value = impl.GetContentSize();
break;
}
- case Toolkit::WebView::Property::DEFAULT_FONT_SIZE:
+ case Toolkit::WebView::Property::TITLE:
{
- value = impl.GetDefaultFontSize();
+ value = impl.GetTitle();
break;
}
default:
return result;
}
-Toolkit::WebView::CacheModel::Type WebView::GetCacheModel() const
-{
- return mWebEngine ? static_cast< Toolkit::WebView::CacheModel::Type >( mWebEngine.GetCacheModel() ) : Toolkit::WebView::CacheModel::DOCUMENT_VIEWER;
-}
-
-void WebView::SetCacheModel( Toolkit::WebView::CacheModel::Type cacheModel )
+void WebView::OnKeyInputFocusGained()
{
if( mWebEngine )
{
- mWebEngine.SetCacheModel( static_cast< WebEnginePlugin::CacheModel >( cacheModel ) );
+ mWebEngine.SetFocus( true );
}
-}
-Toolkit::WebView::CookieAcceptPolicy::Type WebView::GetCookieAcceptPolicy() const
-{
- return mWebEngine ? static_cast< Toolkit::WebView::CookieAcceptPolicy::Type >( mWebEngine.GetCookieAcceptPolicy() ) : Toolkit::WebView::CookieAcceptPolicy::NO_THIRD_PARTY;
+ EmitKeyInputFocusSignal( true ); // Calls back into the Control hence done last.
}
-void WebView::SetCookieAcceptPolicy( Toolkit::WebView::CookieAcceptPolicy::Type policy )
+void WebView::OnKeyInputFocusLost()
{
if( mWebEngine )
{
- mWebEngine.SetCookieAcceptPolicy( static_cast< WebEnginePlugin::CookieAcceptPolicy >( policy ) );
+ mWebEngine.SetFocus( false );
}
-}
-const std::string& WebView::GetUserAgent() const
-{
- return mWebEngine ? mWebEngine.GetUserAgent() : kEmptyString;
+ EmitKeyInputFocusSignal( false ); // Calls back into the Control hence done last.
}
-void WebView::SetUserAgent( const std::string& userAgent )
+void WebView::SetScrollPosition( int x, int y )
{
if( mWebEngine )
{
- mWebEngine.SetUserAgent( userAgent );
+ mWebEngine.SetScrollPosition( x, y );
}
}
-bool WebView::IsJavaScriptEnabled() const
+Dali::Vector2 WebView::GetScrollPosition() const
{
- return mWebEngine ? mWebEngine.IsJavaScriptEnabled() : true;
+ return mWebEngine ? mWebEngine.GetScrollPosition() : Dali::Vector2::ZERO;
}
-void WebView::EnableJavaScript( bool enabled )
+Dali::Vector2 WebView::GetScrollSize() const
{
- if( mWebEngine )
- {
- mWebEngine.EnableJavaScript( enabled );
- }
+ return mWebEngine ? mWebEngine.GetScrollSize() : Dali::Vector2::ZERO;
}
-bool WebView::AreImagesAutomaticallyLoaded() const
+Dali::Vector2 WebView::GetContentSize() const
{
- return mWebEngine ? mWebEngine.AreImagesAutomaticallyLoaded() : true;
+ return mWebEngine ? mWebEngine.GetContentSize() : Dali::Vector2::ZERO;
}
-void WebView::LoadImagesAutomatically( bool automatic )
+std::string WebView::GetTitle() const
{
- if( mWebEngine )
- {
- mWebEngine.LoadImagesAutomatically( automatic );
- }
-}
-
-const std::string& WebView::GetDefaultTextEncodingName() const
-{
- return mWebEngine ? mWebEngine.GetDefaultTextEncodingName() : kEmptyString;
-}
-
-void WebView::SetDefaultTextEncodingName( const std::string& defaultTextEncodingName )
-{
- if( mWebEngine )
- {
- mWebEngine.SetDefaultTextEncodingName( defaultTextEncodingName );
- }
+ return mWebEngine ? mWebEngine.GetTitle() : kEmptyString;
}
-int WebView::GetDefaultFontSize() const
+const std::string& WebView::GetUserAgent() const
{
- return mWebEngine ? mWebEngine.GetDefaultFontSize() : 0;
+ return mWebEngine ? mWebEngine.GetUserAgent() : kEmptyString;
}
-void WebView::SetDefaultFontSize( int defaultFontSize )
+void WebView::SetUserAgent( const std::string& userAgent )
{
if( mWebEngine )
{
- mWebEngine.SetDefaultFontSize( defaultFontSize );
+ mWebEngine.SetUserAgent( userAgent );
}
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff