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=805356409f08e0a075729b9ba5ce6d196e4cf414;hp=2369acf1d9091ffa5b9f92db6efa367cae5e00ea;hb=fb222199e44a5352d8c7f6e1c715da1a995e41af;hpb=70510385d88cfbd5c232117d8436ca74c523e172 diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp old mode 100755 new mode 100644 index 2369acf..8053564 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -19,17 +19,17 @@ #include "web-view-impl.h" // EXTERNAL INCLUDES -#include #include #include #include #include +#include #include #include -#include #include -#include #include +#include +#include // INTERNAL INCLUDES #include @@ -39,91 +39,138 @@ #include #include #include +#include #include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - BaseHandle Create() { return Toolkit::WebView::New(); } -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::WebView, Toolkit::Control, Create ) +// clang-format off +DALI_TYPE_REGISTRATION_BEGIN(Toolkit::WebView, Toolkit::Control, Create) -DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "url", STRING, URL ) -DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "userAgent", STRING, USER_AGENT ) -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, "url", STRING, URL ) +DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "userAgent", STRING, USER_AGENT ) +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_PROPERTY_REGISTRATION(Toolkit, WebView, "mouseEventsEnabled", BOOLEAN, MOUSE_EVENTS_ENABLED) +DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "keyEventsEnabled", BOOLEAN, KEY_EVENTS_ENABLED ) -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_SIGNAL_REGISTRATION(Toolkit, WebView, "pageLoadStarted", PAGE_LOAD_STARTED_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "pageLoadInProgress", PAGE_LOAD_IN_PROGRESS_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_SIGNAL_REGISTRATION(Toolkit, WebView, "urlChanged", URL_CHANGED_SIGNAL ) DALI_TYPE_REGISTRATION_END() +// clang-format on const std::string kEmptyString; -} // anonymous namepsace +} // namespace + +#define GET_ENUM_STRING(structName, inputExp) \ + Scripting::GetLinearEnumerationName(static_cast(inputExp), structName##_TABLE, structName##_TABLE_COUNT) + +#define GET_ENUM_VALUE(structName, inputExp, outputExp) \ + Scripting::GetEnumerationProperty(inputExp, structName##_TABLE, structName##_TABLE_COUNT, outputExp) -#define GET_ENUM_STRING( structName, inputExp ) \ - Scripting::GetLinearEnumerationName< Toolkit::WebView::structName::Type >( static_cast< Toolkit::WebView::structName::Type >( inputExp ), structName##_TABLE, structName##_TABLE_COUNT ) +WebView::WebView(const std::string& locale, const std::string& timezoneId) +: 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), + mUrlChangedSignal(), + mMouseEventsEnabled(true), + mKeyEventsEnabled(true) +{ + mWebEngine = Dali::WebEngine::New(); -#define GET_ENUM_VALUE( structName, inputExp, outputExp ) \ - Scripting::GetEnumerationProperty< Toolkit::WebView::structName::Type >( inputExp, structName##_TABLE, structName##_TABLE_COUNT, outputExp ) + // WebEngine is empty when it is not properly initialized. + if(mWebEngine) + { + mWebEngine.Create(mWebViewSize.width, mWebViewSize.height, locale, timezoneId); + } +} -WebView::WebView( const std::string& locale, const std::string& timezoneId ) -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS ) ), +WebView::WebView(int argc, char** argv) +: Control(ControlBehaviour(ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS)), mUrl(), mVisual(), - mWebViewSize( Stage::GetCurrent().GetSize() ), + mWebViewSize(Stage::GetCurrent().GetSize()), mWebEngine(), mPageLoadStartedSignal(), mPageLoadFinishedSignal(), - mPageLoadErrorSignal() + mPageLoadErrorSignal(), + mVideoHoleEnabled(true), + mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), + mUrlChangedSignal(), + mMouseEventsEnabled(true), + mKeyEventsEnabled(true) { mWebEngine = Dali::WebEngine::New(); // WebEngine is empty when it is not properly initialized. - if( mWebEngine ) + if(mWebEngine) { - mWebEngine.Create( mWebViewSize.width, mWebViewSize.height, locale, timezoneId ); + mWebEngine.Create(mWebViewSize.width, mWebViewSize.height, argc, argv); } } WebView::WebView() -: WebView( "", "" ) +: WebView("", "") { } WebView::~WebView() { + if(mWebEngine) + { + mWebEngine.Destroy(); + } } Toolkit::WebView WebView::New() { - WebView* impl = new WebView(); - Toolkit::WebView handle = Toolkit::WebView( *impl ); + WebView* impl = new WebView(); + Toolkit::WebView handle = Toolkit::WebView(*impl); + + impl->Initialize(); + return handle; +} + +Toolkit::WebView WebView::New(const std::string& locale, const std::string& timezoneId) +{ + WebView* impl = new WebView(locale, timezoneId); + Toolkit::WebView handle = Toolkit::WebView(*impl); impl->Initialize(); return handle; } -Toolkit::WebView WebView::New( const std::string& locale, const std::string& timezoneId ) +Toolkit::WebView WebView::New(int argc, char** argv) { - WebView* impl = new WebView( locale, timezoneId ); - Toolkit::WebView handle = Toolkit::WebView( *impl ); + WebView* impl = new WebView(argc, argv); + Toolkit::WebView handle = Toolkit::WebView(*impl); impl->Initialize(); return handle; @@ -131,20 +178,33 @@ Toolkit::WebView WebView::New( const std::string& locale, const std::string& tim 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); + self.HoveredSignal().Connect(this, &WebView::OnHoverEvent); + self.WheelEventSignal().Connect(this, &WebView::OnWheelEvent); + + 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 ) + if(mWebEngine) { - mWebEngine.PageLoadStartedSignal().Connect( this, &WebView::OnPageLoadStarted ); - mWebEngine.PageLoadFinishedSignal().Connect( this, &WebView::OnPageLoadFinished ); - mWebEngine.PageLoadErrorSignal().Connect( this, &WebView::OnPageLoadError ); - mWebEngine.ScrollEdgeReachedSignal().Connect( this, &WebView::OnScrollEdgeReached ); + mWebEngine.PageLoadStartedSignal().Connect(this, &WebView::OnPageLoadStarted); + mWebEngine.PageLoadInProgressSignal().Connect(this, &WebView::OnPageLoadInProgress); + mWebEngine.PageLoadFinishedSignal().Connect(this, &WebView::OnPageLoadFinished); + mWebEngine.PageLoadErrorSignal().Connect(this, &WebView::OnPageLoadError); + mWebEngine.ScrollEdgeReachedSignal().Connect(this, &WebView::OnScrollEdgeReached); + mWebEngine.UrlChangedSignal().Connect(this, &WebView::OnUrlChanged); - 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() ) ); + 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())); } } @@ -168,47 +228,70 @@ Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const return mWebBackForwardList.get(); } -void WebView::LoadUrl( const std::string& url ) +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) { mUrl = url; - if( mWebEngine ) + if(mWebEngine) { - Texture texture = Dali::Texture::New( *mWebEngine.GetNativeImageSource() ); - const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture ); - mVisual = Toolkit::VisualFactory::Get().CreateVisual( - { { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE } , - { Toolkit::ImageVisual::Property::URL, nativeImageUrl } } ); + Texture texture = Dali::Texture::New(*mWebEngine.GetNativeImageSource()); + const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( + {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, nativeImageUrl}}); - if( mVisual ) + if(mVisual) { // Clean up previously registered visual and add new one. - DevelControl::RegisterVisual( *this, Toolkit::WebView::Property::URL, mVisual ); - mWebEngine.LoadUrl( 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 ) + if(mWebEngine) { - Texture texture = Dali::Texture::New( *mWebEngine.GetNativeImageSource() ); - const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture ); - mVisual = Toolkit::VisualFactory::Get().CreateVisual( - { { Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE } , - { Toolkit::ImageVisual::Property::URL, nativeImageUrl } } ); + Texture texture = Dali::Texture::New(*mWebEngine.GetNativeImageSource()); + const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture(texture); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( + {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, nativeImageUrl}}); + + if(mVisual) + { + DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); + mWebEngine.LoadHtmlString(htmlString); + } - if( mVisual ) + if(mVideoHoleEnabled) { - DevelControl::RegisterVisual( *this, Toolkit::WebView::Property::URL, mVisual ); - mWebEngine.LoadHtmlString( htmlString ); + EnableBlendMode(false); } } } void WebView::Reload() { - if( mWebEngine ) + if(mWebEngine) { mWebEngine.Reload(); } @@ -216,7 +299,7 @@ void WebView::Reload() void WebView::StopLoading() { - if( mWebEngine ) + if(mWebEngine) { mWebEngine.StopLoading(); } @@ -224,7 +307,7 @@ void WebView::StopLoading() void WebView::Suspend() { - if( mWebEngine ) + if(mWebEngine) { mWebEngine.Suspend(); } @@ -232,17 +315,17 @@ void WebView::Suspend() void WebView::Resume() { - if( mWebEngine ) + if(mWebEngine) { mWebEngine.Resume(); } } -void WebView::ScrollBy( int deltaX, int deltaY ) +void WebView::ScrollBy(int deltaX, int deltaY) { - if ( mWebEngine ) + if(mWebEngine) { - mWebEngine.ScrollBy( deltaX, deltaY ); + mWebEngine.ScrollBy(deltaX, deltaY); } } @@ -253,7 +336,7 @@ bool WebView::CanGoForward() void WebView::GoForward() { - if( mWebEngine ) + if(mWebEngine) { mWebEngine.GoForward(); } @@ -266,41 +349,155 @@ bool WebView::CanGoBack() void WebView::GoBack() { - if( mWebEngine ) + if(mWebEngine) { mWebEngine.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) +{ + if(mWebEngine) + { + mWebEngine.EvaluateJavaScript(script, resultHandler); + } +} + +void WebView::AddJavaScriptMessageHandler(const std::string& exposedObjectName, std::function handler) +{ + if(mWebEngine) + { + mWebEngine.AddJavaScriptMessageHandler(exposedObjectName, handler); + } +} + +void WebView::RegisterJavaScriptAlertCallback(Dali::WebEnginePlugin::JavaScriptAlertCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterJavaScriptAlertCallback(callback); + } +} + +void WebView::JavaScriptAlertReply() +{ + if(mWebEngine) + { + mWebEngine.JavaScriptAlertReply(); + } +} + +void WebView::RegisterJavaScriptConfirmCallback(Dali::WebEnginePlugin::JavaScriptConfirmCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterJavaScriptConfirmCallback(callback); + } +} + +void WebView::JavaScriptConfirmReply(bool confirmed) +{ + if(mWebEngine) + { + mWebEngine.JavaScriptConfirmReply(confirmed); + } +} + +void WebView::RegisterJavaScriptPromptCallback(Dali::WebEnginePlugin::JavaScriptPromptCallback callback) { - if( mWebEngine ) + if(mWebEngine) { - mWebEngine.EvaluateJavaScript( script, resultHandler ); + mWebEngine.RegisterJavaScriptPromptCallback(callback); } } -void WebView::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler ) +void WebView::JavaScriptPromptReply(const std::string& result) { - if( mWebEngine ) + if(mWebEngine) { - mWebEngine.AddJavaScriptMessageHandler( exposedObjectName, handler ); + mWebEngine.JavaScriptPromptReply(result); } } void WebView::ClearHistory() { - if( mWebEngine ) + if(mWebEngine) { mWebEngine.ClearHistory(); } } +void WebView::UpdateDisplayArea(Dali::PropertyNotification& /*source*/) +{ + if(!mWebEngine) + return; + + Actor self(Self()); + + bool positionUsesAnchorPoint = self.GetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT); + Vector3 actorSize = self.GetCurrentProperty(Actor::Property::SIZE) * self.GetCurrentProperty(Actor::Property::SCALE); + Vector3 anchorPointOffSet = actorSize * (positionUsesAnchorPoint ? self.GetCurrentProperty(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT); + Vector2 screenPosition = self.GetProperty(Actor::Property::SCREEN_POSITION); + + Dali::Rect 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) + { + mWebViewArea = displayArea; + mWebEngine.UpdateDisplayArea(mWebViewArea); + } +} + +void WebView::EnableVideoHole(bool enabled) +{ + mVideoHoleEnabled = enabled; + + EnableBlendMode(!mVideoHoleEnabled); + + if(mWebEngine) + { + 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); + } +} + +void WebView::ClearAllTilesResources() +{ + if(mWebEngine) + { + mWebEngine.ClearAllTilesResources(); + } +} + Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadStartedSignal() { return mPageLoadStartedSignal; } +Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadInProgressSignal() +{ + return mPageLoadInProgressSignal; +} + Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadFinishedSignal() { return mPageLoadFinishedSignal; @@ -316,67 +513,100 @@ Dali::Toolkit::WebView::WebViewScrollEdgeReachedSignalType& WebView::ScrollEdgeR return mScrollEdgeReachedSignal; } -void WebView::OnPageLoadStarted( const std::string& url ) +Dali::Toolkit::WebView::WebViewUrlChangedSignalType& WebView::UrlChangedSignal() +{ + return mUrlChangedSignal; +} + +void WebView::OnPageLoadStarted(const std::string& url) +{ + if(!mPageLoadStartedSignal.Empty()) + { + Dali::Toolkit::WebView handle(GetOwner()); + mPageLoadStartedSignal.Emit(handle, url); + } +} + +void WebView::OnPageLoadInProgress(const std::string& url) { - if( !mPageLoadStartedSignal.Empty() ) + if(!mPageLoadInProgressSignal.Empty()) { - Dali::Toolkit::WebView handle( GetOwner() ); - mPageLoadStartedSignal.Emit( handle, url ); + Dali::Toolkit::WebView handle(GetOwner()); + mPageLoadInProgressSignal.Emit(handle, url); } } -void WebView::OnPageLoadFinished( const std::string& url ) +void WebView::OnPageLoadFinished(const std::string& url) { - if( !mPageLoadFinishedSignal.Empty() ) + if(!mPageLoadFinishedSignal.Empty()) { - Dali::Toolkit::WebView handle( GetOwner() ); - mPageLoadFinishedSignal.Emit( handle, url ); + Dali::Toolkit::WebView handle(GetOwner()); + mPageLoadFinishedSignal.Emit(handle, url); } } -void WebView::OnPageLoadError( const std::string& url, int errorCode ) +void WebView::OnPageLoadError(const std::string& url, int errorCode) { - if( !mPageLoadErrorSignal.Empty() ) + if(!mPageLoadErrorSignal.Empty()) { - Dali::Toolkit::WebView handle( GetOwner() ); - mPageLoadErrorSignal.Emit( handle, url, static_cast< Toolkit::WebView::LoadErrorCode >( errorCode ) ); + Dali::Toolkit::WebView handle(GetOwner()); + mPageLoadErrorSignal.Emit(handle, url, static_cast(errorCode)); } } -void WebView::OnScrollEdgeReached( Dali::WebEnginePlugin::ScrollEdge edge ) +void WebView::OnScrollEdgeReached(Dali::WebEnginePlugin::ScrollEdge edge) { - if( !mScrollEdgeReachedSignal.Empty() ) + if(!mScrollEdgeReachedSignal.Empty()) { - Dali::Toolkit::WebView handle( GetOwner() ); - mScrollEdgeReachedSignal.Emit( handle, edge ); + Dali::Toolkit::WebView handle(GetOwner()); + mScrollEdgeReachedSignal.Emit(handle, edge); } } -bool WebView::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +void WebView::OnUrlChanged(const std::string& url) { - Dali::BaseHandle handle( object ); + if(!mUrlChangedSignal.Empty()) + { + Dali::Toolkit::WebView handle(GetOwner()); + mUrlChangedSignal.Emit(handle, url); + } +} - bool connected = false; - Toolkit::WebView webView = Toolkit::WebView::DownCast( handle ); +bool WebView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor) +{ + Dali::BaseHandle handle(object); + + bool connected = false; + Toolkit::WebView webView = Toolkit::WebView::DownCast(handle); - if( 0 == strcmp( signalName.c_str(), PAGE_LOAD_STARTED_SIGNAL ) ) + if(0 == strcmp(signalName.c_str(), PAGE_LOAD_STARTED_SIGNAL)) + { + webView.PageLoadStartedSignal().Connect(tracker, functor); + connected = true; + } + else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_IN_PROGRESS_SIGNAL)) + { + webView.PageLoadInProgressSignal().Connect(tracker, functor); + connected = true; + } + else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_FINISHED_SIGNAL)) { - webView.PageLoadStartedSignal().Connect( tracker, functor ); + webView.PageLoadFinishedSignal().Connect(tracker, functor); connected = true; } - else if( 0 == strcmp( signalName.c_str(), PAGE_LOAD_FINISHED_SIGNAL ) ) + else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_ERROR_SIGNAL)) { - webView.PageLoadFinishedSignal().Connect( tracker, functor ); + webView.PageLoadErrorSignal().Connect(tracker, functor); connected = true; } - else if( 0 == strcmp( signalName.c_str(), PAGE_LOAD_ERROR_SIGNAL ) ) + else if(0 == strcmp(signalName.c_str(), SCROLL_EDGE_REACHED_SIGNAL)) { - webView.PageLoadErrorSignal().Connect( tracker, functor ); + webView.ScrollEdgeReachedSignal().Connect(tracker, functor); connected = true; } - else if( 0 == strcmp( signalName.c_str(), SCROLL_EDGE_REACHED_SIGNAL ) ) + else if(0 == strcmp(signalName.c_str(), URL_CHANGED_SIGNAL)) { - webView.ScrollEdgeReachedSignal().Connect( tracker, functor ); + webView.UrlChangedSignal().Connect(tracker, functor); connected = true; } @@ -385,64 +615,83 @@ bool WebView::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* t Vector3 WebView::GetNaturalSize() { - if( mVisual ) + if(mVisual) { Vector2 rendererNaturalSize; - mVisual.GetNaturalSize( rendererNaturalSize ); - return Vector3( rendererNaturalSize ); + mVisual.GetNaturalSize(rendererNaturalSize); + return Vector3(rendererNaturalSize); } - return Vector3( mWebViewSize ); + return Vector3(mWebViewSize); } -void WebView::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void WebView::OnSceneConnection(int depth) { - Control::OnRelayout( size, container ); - - if( size.width > 0 && size.height > 0 && mWebViewSize != size ) - { - mWebViewSize = size; + Control::OnSceneConnection(depth); - if( mWebEngine ) - { - mWebEngine.SetSize( size.width, size.height ); - } - } + EnableBlendMode(!mVideoHoleEnabled); } -void WebView::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) +void WebView::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value) { - Toolkit::WebView webView = Toolkit::WebView::DownCast( Dali::BaseHandle( object ) ); + Toolkit::WebView webView = Toolkit::WebView::DownCast(Dali::BaseHandle(object)); - if( webView ) + if(webView) { - WebView& impl = GetImpl( webView ); - switch( index ) + WebView& impl = GetImpl(webView); + switch(index) { case Toolkit::WebView::Property::URL: { std::string url; - if( value.Get( url ) ) + if(value.Get(url)) { - impl.LoadUrl( url ); + impl.LoadUrl(url); } break; } case Toolkit::WebView::Property::USER_AGENT: { std::string input; - if( value.Get( input ) ) + if(value.Get(input)) { - impl.SetUserAgent( input ); + impl.SetUserAgent(input); } break; } case Toolkit::WebView::Property::SCROLL_POSITION: { Vector2 input; - if ( value.Get( input ) ) + if(value.Get(input)) + { + impl.SetScrollPosition(input.x, input.y); + } + break; + } + case Toolkit::WebView::Property::VIDEO_HOLE_ENABLED: + { + bool input; + if(value.Get(input)) + { + impl.EnableVideoHole(input); + } + break; + } + case Toolkit::WebView::Property::MOUSE_EVENTS_ENABLED: + { + bool input; + if(value.Get(input)) { - impl.SetScrollPosition( input.x, input.y ); + impl.EnableMouseEvents(input); + } + break; + } + case Toolkit::WebView::Property::KEY_EVENTS_ENABLED: + { + bool input; + if(value.Get(input)) + { + impl.EnableKeyEvents(input); } break; } @@ -450,16 +699,16 @@ void WebView::SetProperty( BaseObject* object, Property::Index index, const Prop } } -Property::Value WebView::GetProperty( BaseObject* object, Property::Index propertyIndex ) +Property::Value WebView::GetProperty(BaseObject* object, Property::Index propertyIndex) { Property::Value value; - Toolkit::WebView webView = Toolkit::WebView::DownCast( Dali::BaseHandle( object ) ); + Toolkit::WebView webView = Toolkit::WebView::DownCast(Dali::BaseHandle(object)); - if( webView ) + if(webView) { - WebView& impl = GetImpl( webView ); - switch( propertyIndex ) + WebView& impl = GetImpl(webView); + switch(propertyIndex) { case Toolkit::WebView::Property::URL: { @@ -473,105 +722,135 @@ 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: + { + value = impl.GetTitle(); + break; + } + case Toolkit::WebView::Property::VIDEO_HOLE_ENABLED: + { + value = impl.mVideoHoleEnabled; + break; + } + case Toolkit::WebView::Property::MOUSE_EVENTS_ENABLED: + { + value = impl.mMouseEventsEnabled; + break; + } + case Toolkit::WebView::Property::KEY_EVENTS_ENABLED: + { + value = impl.mKeyEventsEnabled; break; } default: - break; + break; } } return value; } -bool WebView::OnTouchEvent( Actor actor, const Dali::TouchEvent& touch ) +bool WebView::OnTouchEvent(Actor actor, const Dali::TouchEvent& touch) { bool result = false; - if( mWebEngine ) + if(mWebEngine) { - result = mWebEngine.SendTouchEvent( touch ); + result = mWebEngine.SendTouchEvent(touch); } return result; } -bool WebView::OnKeyEvent( const Dali::KeyEvent& event ) +bool WebView::OnKeyEvent(const Dali::KeyEvent& event) { bool result = false; - if( mWebEngine ) + if(mWebEngine) { - result = mWebEngine.SendKeyEvent( event ); + result = mWebEngine.SendKeyEvent(event); } return result; } -void WebView::OnKeyInputFocusGained() +bool WebView::OnHoverEvent(Actor actor, const Dali::HoverEvent& hover) { - if( mWebEngine ) + bool result = false; + if(mWebEngine) { - mWebEngine.SetFocus( true ); + result = mWebEngine.SendHoverEvent(hover); } - - EmitKeyInputFocusSignal( true ); // Calls back into the Control hence done last. + return result; } -void WebView::OnKeyInputFocusLost() +bool WebView::OnWheelEvent(Actor actor, const Dali::WheelEvent& wheel) { - if( mWebEngine ) + bool result = false; + if(mWebEngine) { - mWebEngine.SetFocus( false ); + result = mWebEngine.SendWheelEvent(wheel); } - - EmitKeyInputFocusSignal( false ); // Calls back into the Control hence done last. + return result; } -void WebView::SetScrollPosition( int x, int y ) +void WebView::OnKeyInputFocusGained() { - if( mWebEngine ) + if(mWebEngine) { - mWebEngine.SetScrollPosition( x, y ); + mWebEngine.SetFocus(true); } + + EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last. } -void WebView::GetScrollPosition( int& x, int& y ) const +void WebView::OnKeyInputFocusLost() { - if( mWebEngine ) + if(mWebEngine) { - mWebEngine.GetScrollPosition( x, y ); + mWebEngine.SetFocus(false); } + + EmitKeyInputFocusSignal(false); // Calls back into the Control hence done last. } -void WebView::GetScrollSize( int& width, int& height ) const +void WebView::SetScrollPosition(int x, int y) { - if( mWebEngine ) + if(mWebEngine) { - mWebEngine.GetScrollSize( width, height ); + mWebEngine.SetScrollPosition(x, y); } } -void WebView::GetContentSize( int& width, int& height ) const +Dali::Vector2 WebView::GetScrollPosition() const { - if( mWebEngine ) - { - mWebEngine.GetContentSize( width, height ); - } + return mWebEngine ? mWebEngine.GetScrollPosition() : Dali::Vector2::ZERO; +} + +Dali::Vector2 WebView::GetScrollSize() const +{ + return mWebEngine ? mWebEngine.GetScrollSize() : Dali::Vector2::ZERO; +} + +Dali::Vector2 WebView::GetContentSize() const +{ + return mWebEngine ? mWebEngine.GetContentSize() : Dali::Vector2::ZERO; +} + +std::string WebView::GetTitle() const +{ + return mWebEngine ? mWebEngine.GetTitle() : kEmptyString; } const std::string& WebView::GetUserAgent() const @@ -579,11 +858,29 @@ const std::string& WebView::GetUserAgent() const return mWebEngine ? mWebEngine.GetUserAgent() : kEmptyString; } -void WebView::SetUserAgent( const std::string& userAgent ) +void WebView::SetUserAgent(const std::string& userAgent) +{ + if(mWebEngine) + { + mWebEngine.SetUserAgent(userAgent); + } +} + +void WebView::EnableMouseEvents(bool enabled) +{ + if(mWebEngine) + { + mMouseEventsEnabled = enabled; + mWebEngine.EnableMouseEvents(enabled); + } +} + +void WebView::EnableKeyEvents(bool enabled) { - if( mWebEngine ) + if(mWebEngine) { - mWebEngine.SetUserAgent( userAgent ); + mKeyEventsEnabled = enabled; + mWebEngine.EnableKeyEvents(enabled); } }