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=9e31e462d893a33f7b916d08f31495292dd47f59;hp=db14c27797aeaee328b274e5551bd03eb859570a;hb=893ca7b6b58b59ed4671daf867c4a319d8c9a770;hpb=c1fe36eb61a52b0efb91218b41c09ed7ba7fd819 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 db14c27..9e31e46 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -20,6 +20,10 @@ // EXTERNAL INCLUDES #include +#include +#include +#include +#include #include #include #include @@ -29,8 +33,13 @@ // INTERNAL INCLUDES #include +#include +#include +#include +#include #include #include +#include #include namespace Dali @@ -50,31 +59,15 @@ BaseHandle Create() 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_PROPERTY_REGISTRATION( Toolkit, WebView, "videoHoleEnabled", BOOLEAN, VIDEO_HOLE_ENABLED ) DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadStarted", PAGE_LOAD_STARTED_SIGNAL ) DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadFinished", PAGE_LOAD_FINISHED_SIGNAL ) @@ -101,7 +94,9 @@ WebView::WebView( const std::string& locale, const std::string& timezoneId ) mWebEngine(), mPageLoadStartedSignal(), mPageLoadFinishedSignal(), - mPageLoadErrorSignal() + mPageLoadErrorSignal(), + mVideoHoleEnabled( true ), + mWebViewArea ( 0, 0, mWebViewSize.width, mWebViewSize.height ) { mWebEngine = Dali::WebEngine::New(); @@ -112,6 +107,27 @@ WebView::WebView( const std::string& locale, const std::string& timezoneId ) } } +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(), + mVideoHoleEnabled( true ), + mWebViewArea ( 0, 0, mWebViewSize.width, mWebViewSize.height ) +{ + 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( "", "" ) { @@ -119,6 +135,10 @@ WebView::WebView() WebView::~WebView() { + if( mWebEngine ) + { + mWebEngine.Destroy(); + } } Toolkit::WebView WebView::New() @@ -139,10 +159,28 @@ Toolkit::WebView WebView::New( const std::string& locale, const std::string& tim 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 ); - Self().TouchedSignal().Connect( this, &WebView::OnTouchEvent ); + Actor self = Self(); + + self.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true ); + self.TouchedSignal().Connect( this, &WebView::OnTouchEvent ); + + mPositionUpdateNotification = self.AddPropertyNotification( Actor::Property::WORLD_POSITION, StepCondition( 1.0f, 1.0f ) ); + mSizeUpdateNotification = self.AddPropertyNotification( Actor::Property::SIZE, StepCondition( 1.0f, 1.0f ) ); + mScaleUpdateNotification = self.AddPropertyNotification( Actor::Property::WORLD_SCALE, StepCondition( 0.1f, 1.0f ) ); + mPositionUpdateNotification.NotifySignal().Connect( this, &WebView::UpdateDisplayArea ); + mSizeUpdateNotification.NotifySignal().Connect( this, &WebView::UpdateDisplayArea ); + mScaleUpdateNotification.NotifySignal().Connect( this, &WebView::UpdateDisplayArea ); if( mWebEngine ) { @@ -150,7 +188,45 @@ void WebView::OnInitialize() mWebEngine.PageLoadFinishedSignal().Connect( this, &WebView::OnPageLoadFinished ); mWebEngine.PageLoadErrorSignal().Connect( this, &WebView::OnPageLoadError ); mWebEngine.ScrollEdgeReachedSignal().Connect( this, &WebView::OnScrollEdgeReached ); + + mWebContext = std::unique_ptr( new WebContext( mWebEngine.GetContext() ) ); + mWebCookieManager = std::unique_ptr( new WebCookieManager( mWebEngine.GetCookieManager() ) ); + mWebSettings = std::unique_ptr( new WebSettings( mWebEngine.GetSettings() ) ); + mWebBackForwardList = std::unique_ptr( 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 ) @@ -170,10 +246,15 @@ void WebView::LoadUrl( const std::string& url ) DevelControl::RegisterVisual( *this, Toolkit::WebView::Property::URL, mVisual ); mWebEngine.LoadUrl( url ); } + + if ( mVideoHoleEnabled ) + { + EnableBlendMode( false ); + } } } -void WebView::LoadHTMLString( const std::string& htmlString ) +void WebView::LoadHtmlString( const std::string& htmlString ) { if( mWebEngine ) { @@ -186,7 +267,12 @@ void WebView::LoadHTMLString( const std::string& htmlString ) if( mVisual ) { DevelControl::RegisterVisual( *this, Toolkit::WebView::Property::URL, mVisual ); - mWebEngine.LoadHTMLString( htmlString ); + mWebEngine.LoadHtmlString( htmlString ); + } + + if ( mVideoHoleEnabled ) + { + EnableBlendMode( false ); } } } @@ -273,6 +359,14 @@ void WebView::AddJavaScriptMessageHandler( const std::string& exposedObjectName, } } +void WebView::ClearAllTilesResources() +{ + if( mWebEngine ) + { + mWebEngine.ClearAllTilesResources(); + } +} + void WebView::ClearHistory() { if( mWebEngine ) @@ -281,19 +375,56 @@ void WebView::ClearHistory() } } -void WebView::ClearCache() +void WebView::UpdateDisplayArea( Dali::PropertyNotification& /*source*/ ) { - if( mWebEngine ) + if( !mWebEngine ) + return; + + Actor self( Self() ); + + bool positionUsesAnchorPoint = self.GetProperty< bool >( Actor::Property::POSITION_USES_ANCHOR_POINT ); + Vector3 actorSize = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ) * self.GetCurrentProperty< Vector3 >( Actor::Property::SCALE ); + Vector3 anchorPointOffSet = actorSize * ( positionUsesAnchorPoint ? self.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) : AnchorPoint::TOP_LEFT ); + Vector2 screenPosition = self.GetProperty< Vector2 >( Actor::Property::SCREEN_POSITION ); + + Dali::Rect< int > displayArea; + displayArea.x = screenPosition.x - anchorPointOffSet.x; + displayArea.y = screenPosition.y - anchorPointOffSet.y; + displayArea.width = actorSize.x; + displayArea.height = actorSize.y; + + Size displaySize = Size( displayArea.width, displayArea.height ); + if ( mWebViewSize != displaySize ) + { + mWebViewSize = displaySize; + } + + if (mWebViewArea != displayArea ) { - mWebEngine.ClearCache(); + mWebViewArea = displayArea; + mWebEngine.UpdateDisplayArea( mWebViewArea ); } } -void WebView::ClearCookies() +void WebView::EnableVideoHole( bool enabled ) { + mVideoHoleEnabled = enabled; + + EnableBlendMode( !mVideoHoleEnabled ); + if( mWebEngine ) { - mWebEngine.ClearCookies(); + mWebEngine.EnableVideoHole( mVideoHoleEnabled ); + } +} + +void WebView::EnableBlendMode( bool blendEnabled ) +{ + Actor self = Self(); + for (uint32_t i = 0; i < self.GetRendererCount(); i++) + { + Dali::Renderer render = self.GetRendererAt( i ); + render.SetProperty( Renderer::Property::BLEND_MODE, blendEnabled ? BlendMode::ON : BlendMode::OFF ); } } @@ -396,19 +527,11 @@ Vector3 WebView::GetNaturalSize() return Vector3( mWebViewSize ); } -void WebView::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void WebView::OnSceneConnection( int depth ) { - Control::OnRelayout( size, container ); + Control::OnSceneConnection( depth ); - if( size.width > 0 && size.height > 0 && mWebViewSize != size ) - { - mWebViewSize = size; - - if( mWebEngine ) - { - mWebEngine.SetSize( size.width, size.height ); - } - } + EnableBlendMode( !mVideoHoleEnabled ); } void WebView::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) @@ -429,20 +552,6 @@ void WebView::SetProperty( BaseObject* object, Property::Index index, const Prop } 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; @@ -452,48 +561,21 @@ void WebView::SetProperty( BaseObject* object, Property::Index index, const Prop } break; } - case Toolkit::WebView::Property::ENABLE_JAVASCRIPT: + case Toolkit::WebView::Property::SCROLL_POSITION: { - bool input; - if( value.Get( input ) ) + Vector2 input; + if ( value.Get( input ) ) { - impl.EnableJavaScript( input ); + impl.SetScrollPosition( input.x, input.y ); } break; } - case Toolkit::WebView::Property::LOAD_IMAGES_AUTOMATICALLY: + case Toolkit::WebView::Property::VIDEO_HOLE_ENABLED: { bool 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 ); - } - break; - } - case Toolkit::WebView::Property::SCROLL_POSITION: - { - Vector2 input; - if ( value.Get( input ) ) - { - impl.SetScrollPosition( input.x, input.y ); + impl.EnableVideoHole( input ); } break; } @@ -517,60 +599,34 @@ Property::Value WebView::GetProperty( BaseObject* object, Property::Index proper 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: - { - value = impl.IsJavaScriptEnabled(); - break; - } - case Toolkit::WebView::Property::LOAD_IMAGES_AUTOMATICALLY: - { - value = impl.AreImagesAutomaticallyLoaded(); - break; - } - case Toolkit::WebView::Property::DEFAULT_TEXT_ENCODING_NAME: + case Toolkit::WebView::Property::SCROLL_POSITION: { - value = impl.GetDefaultTextEncodingName(); + value = impl.GetScrollPosition(); break; } - case Toolkit::WebView::Property::DEFAULT_FONT_SIZE: + case Toolkit::WebView::Property::SCROLL_SIZE: { - value = impl.GetDefaultFontSize(); + value = impl.GetScrollSize(); break; } - case Toolkit::WebView::Property::SCROLL_POSITION: + case Toolkit::WebView::Property::CONTENT_SIZE: { - int x, y; - impl.GetScrollPosition( x, y ); - value = Vector2( x, y ); + value = impl.GetContentSize(); break; } - case Toolkit::WebView::Property::SCROLL_SIZE: + case Toolkit::WebView::Property::TITLE: { - int width, height; - impl.GetScrollSize( width, height ); - value = Vector2( width, height ); + value = impl.GetTitle(); break; } - case Toolkit::WebView::Property::CONTENT_SIZE: + case Toolkit::WebView::Property::VIDEO_HOLE_ENABLED: { - int width, height; - impl.GetContentSize( width, height ); - value = Vector2( width, height ); + value = impl.mVideoHoleEnabled; break; } default: @@ -631,54 +687,24 @@ void WebView::SetScrollPosition( int x, int y ) } } -void WebView::GetScrollPosition( int& x, int& y ) const -{ - if( mWebEngine ) - { - mWebEngine.GetScrollPosition( x, y ); - } -} - -void WebView::GetScrollSize( int& width, int& height ) const -{ - if( mWebEngine ) - { - mWebEngine.GetScrollSize( width, height ); - } -} - -void WebView::GetContentSize( int& width, int& height ) const +Dali::Vector2 WebView::GetScrollPosition() const { - if( mWebEngine ) - { - mWebEngine.GetContentSize( width, height ); - } -} - -Toolkit::WebView::CacheModel::Type WebView::GetCacheModel() const -{ - return mWebEngine ? static_cast< Toolkit::WebView::CacheModel::Type >( mWebEngine.GetCacheModel() ) : Toolkit::WebView::CacheModel::DOCUMENT_VIEWER; + return mWebEngine ? mWebEngine.GetScrollPosition() : Dali::Vector2::ZERO; } -void WebView::SetCacheModel( Toolkit::WebView::CacheModel::Type cacheModel ) +Dali::Vector2 WebView::GetScrollSize() const { - if( mWebEngine ) - { - mWebEngine.SetCacheModel( static_cast< WebEnginePlugin::CacheModel >( cacheModel ) ); - } + return mWebEngine ? mWebEngine.GetScrollSize() : Dali::Vector2::ZERO; } -Toolkit::WebView::CookieAcceptPolicy::Type WebView::GetCookieAcceptPolicy() const +Dali::Vector2 WebView::GetContentSize() const { - return mWebEngine ? static_cast< Toolkit::WebView::CookieAcceptPolicy::Type >( mWebEngine.GetCookieAcceptPolicy() ) : Toolkit::WebView::CookieAcceptPolicy::NO_THIRD_PARTY; + return mWebEngine ? mWebEngine.GetContentSize() : Dali::Vector2::ZERO; } -void WebView::SetCookieAcceptPolicy( Toolkit::WebView::CookieAcceptPolicy::Type policy ) +std::string WebView::GetTitle() const { - if( mWebEngine ) - { - mWebEngine.SetCookieAcceptPolicy( static_cast< WebEnginePlugin::CookieAcceptPolicy >( policy ) ); - } + return mWebEngine ? mWebEngine.GetTitle() : kEmptyString; } const std::string& WebView::GetUserAgent() const @@ -694,58 +720,6 @@ void WebView::SetUserAgent( const std::string& userAgent ) } } -bool WebView::IsJavaScriptEnabled() const -{ - return mWebEngine ? mWebEngine.IsJavaScriptEnabled() : true; -} - -void WebView::EnableJavaScript( bool enabled ) -{ - if( mWebEngine ) - { - mWebEngine.EnableJavaScript( enabled ); - } -} - -bool WebView::AreImagesAutomaticallyLoaded() const -{ - return mWebEngine ? mWebEngine.AreImagesAutomaticallyLoaded() : true; -} - -void WebView::LoadImagesAutomatically( bool automatic ) -{ - 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 ); - } -} - -int WebView::GetDefaultFontSize() const -{ - return mWebEngine ? mWebEngine.GetDefaultFontSize() : 0; -} - -void WebView::SetDefaultFontSize( int defaultFontSize ) -{ - if( mWebEngine ) - { - mWebEngine.SetDefaultFontSize( defaultFontSize ); - } -} - #undef GET_ENUM_STRING #undef GET_ENUM_VALUE