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=7ae75433bc431c17408247963fd9e696d7983565;hp=334237410e365dc32b1e3f11c0f6a0f3ee2420d9;hb=679d8feda43ee31cf28d7504a76a5d0834dfab29;hpb=9161d9828d1a5bb3c7eaf83002863de84b23b751 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 3342374..7ae7543 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -87,28 +87,26 @@ DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "pageZoomFactor", FLOAT, DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "textZoomFactor", FLOAT, TEXT_ZOOM_FACTOR ) DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "loadProgressPercentage", FLOAT, LOAD_PROGRESS_PERCENTAGE ) -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_SIGNAL_REGISTRATION(Toolkit, WebView, "formRepostDecision", FORM_REPOST_DECISION_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "frameRendered", FRAME_RENDERED_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "requestInterceptor", REQUEST_INTERCEPTOR_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "consoleMessage", CONSOLE_MESSAGE_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "responsePolicyDecided", POLICY_DECISION ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "certificateConfirm", CERTIFICATE_CONFIRM_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "sslCertificateChanged", SSL_CERTIFICATE_CHANGED_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "httpAuthRequest", HTTP_AUTH_REQUEST_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "contextMenuCustomized", CONTEXT_MENU_CUSTOMIZED_SIGNAL ) -DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "contextMenuItemSelected", CONTEXT_MENU_ITEM_SELECTED_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_SIGNAL_REGISTRATION(Toolkit, WebView, "formRepostDecision", FORM_REPOST_DECISION_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "frameRendered", FRAME_RENDERED_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "requestInterceptor", REQUEST_INTERCEPTOR_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "consoleMessage", CONSOLE_MESSAGE_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "responsePolicyDecided", POLICY_DECISION ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "certificateConfirm", CERTIFICATE_CONFIRM_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "sslCertificateChanged", SSL_CERTIFICATE_CHANGED_SIGNAL) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "httpAuthRequest", HTTP_AUTH_REQUEST_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "contextMenuShown", CONTEXT_MENU_SHOWN_SIGNAL ) +DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "contextMenuHidden", CONTEXT_MENU_HIDDEN_SIGNAL ) DALI_TYPE_REGISTRATION_END() // clang-format on -const std::string kEmptyString; - } // namespace #define GET_ENUM_STRING(structName, inputExp) \ @@ -119,7 +117,6 @@ const std::string kEmptyString; 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(), @@ -128,9 +125,10 @@ WebView::WebView(const std::string& locale, const std::string& timezoneId) mPageLoadErrorSignal(), mUrlChangedSignal(), mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), - mVideoHoleEnabled(true), + mVideoHoleEnabled(false), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mScreenshotCapturedCallback(nullptr) { mWebEngine = Dali::WebEngine::New(); @@ -143,7 +141,6 @@ WebView::WebView(const std::string& locale, const std::string& timezoneId) WebView::WebView(uint32_t argc, char** argv) : Control(ControlBehaviour(ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS)), - mUrl(), mVisual(), mWebViewSize(Stage::GetCurrent().GetSize()), mWebEngine(), @@ -152,9 +149,10 @@ WebView::WebView(uint32_t argc, char** argv) mPageLoadErrorSignal(), mUrlChangedSignal(), mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), - mVideoHoleEnabled(true), + mVideoHoleEnabled(false), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mScreenshotCapturedCallback(nullptr) { mWebEngine = Dali::WebEngine::New(); @@ -238,8 +236,8 @@ void WebView::OnInitialize() mWebEngine.CertificateConfirmSignal().Connect(this, &WebView::OnCertificateConfirm); mWebEngine.SslCertificateChangedSignal().Connect(this, &WebView::OnSslCertificateChanged); mWebEngine.HttpAuthHandlerSignal().Connect(this, &WebView::OnHttpAuthenticationRequest); - mWebEngine.ContextMenuCustomizedSignal().Connect(this, &WebView::OnContextMenuCustomized); - mWebEngine.ContextMenuItemSelectedSignal().Connect(this, &WebView::OnContextMenuItemSelected); + mWebEngine.ContextMenuShownSignal().Connect(this, &WebView::OnContextMenuShown); + mWebEngine.ContextMenuHiddenSignal().Connect(this, &WebView::OnContextMenuHidden); mWebContext = std::unique_ptr(new WebContext(mWebEngine.GetContext())); mWebCookieManager = std::unique_ptr(new WebCookieManager(mWebEngine.GetCookieManager())); @@ -281,26 +279,14 @@ Dali::Toolkit::ImageView WebView::GetFavicon() const void WebView::LoadUrl(const std::string& url) { - mUrl = url; 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}}); - - if(mVisual) + if(!mVisual) { - // Clean up previously registered visual and add new one. - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - mWebEngine.LoadUrl(url); + mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); } - if(mVideoHoleEnabled) - { - EnableBlendMode(false); - } + mWebEngine.LoadUrl(url); } } @@ -308,22 +294,12 @@ void WebView::LoadHtmlString(const std::string& htmlString) { 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}}); - - if(mVisual) + if(!mVisual) { - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - mWebEngine.LoadHtmlString(htmlString); + mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); } - if(mVideoHoleEnabled) - { - EnableBlendMode(false); - } + mWebEngine.LoadHtmlString(htmlString); } } @@ -332,24 +308,12 @@ bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const if(!mWebEngine) return false; - 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}}); - - bool result = false; - if(mVisual) + if(!mVisual) { - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - result = mWebEngine.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl); + mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); } - if(mVideoHoleEnabled) - { - EnableBlendMode(false); - } - return result; + return mWebEngine.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl); } bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri) @@ -357,24 +321,12 @@ bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, co if(!mWebEngine) return false; - 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}}); - - bool result = false; - if(mVisual) + if(!mVisual) { - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - result = mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri); + mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); } - if(mVideoHoleEnabled) - { - EnableBlendMode(false); - } - return result; + return mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri); } void WebView::Reload() @@ -654,6 +606,14 @@ void WebView::RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::Geolo } } +void WebView::SetTtsFocus(bool focused) +{ + if(mWebEngine && !HasKeyInputFocus()) + { + mWebEngine.SetFocus(focused); + } +} + void WebView::UpdateDisplayArea(Dali::PropertyNotification& /*source*/) { if(!mWebEngine) @@ -790,14 +750,14 @@ Dali::Toolkit::WebView::WebViewHttpAuthHandlerSignalType& WebView::HttpAuthHandl return mHttpAuthHandlerSignal; } -Dali::Toolkit::WebView::WebViewContextMenuCustomizedSignalType& WebView::ContextMenuCustomizedSignal() +Dali::Toolkit::WebView::WebViewContextMenuShownSignalType& WebView::ContextMenuShownSignal() { - return mContextMenuCustomizedSignal; + return mContextMenuShownSignal; } -Dali::Toolkit::WebView::WebViewContextMenuItemSelectedSignalType& WebView::ContextMenuItemSelectedSignal() +Dali::Toolkit::WebView::WebViewContextMenuHiddenSignalType& WebView::ContextMenuHiddenSignal() { - return mContextMenuItemSelectedSignal; + return mContextMenuHiddenSignal; } void WebView::OnPageLoadStarted(const std::string& url) @@ -872,6 +832,21 @@ void WebView::OnFrameRendered() } } +void WebView::OnInitialFrameRendered() +{ + mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnInitialFrameRendered); + + 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); + EnableBlendMode(!mVideoHoleEnabled); + } +} + void WebView::OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type) { if(type == Dali::DevelActor::VisibilityChange::Type::SELF) @@ -943,21 +918,21 @@ void WebView::OnHttpAuthenticationRequest(std::shared_ptr menu) +void WebView::OnContextMenuShown(std::shared_ptr menu) { - if(!mContextMenuCustomizedSignal.Empty()) + if(!mContextMenuShownSignal.Empty()) { Dali::Toolkit::WebView handle(GetOwner()); - mContextMenuCustomizedSignal.Emit(handle, std::move(menu)); + mContextMenuShownSignal.Emit(handle, std::move(menu)); } } -void WebView::OnContextMenuItemSelected(std::shared_ptr item) +void WebView::OnContextMenuHidden(std::shared_ptr menu) { - if(!mContextMenuItemSelectedSignal.Empty()) + if(!mContextMenuHiddenSignal.Empty()) { Dali::Toolkit::WebView handle(GetOwner()); - mContextMenuItemSelectedSignal.Emit(handle, std::move(item)); + mContextMenuHiddenSignal.Emit(handle, std::move(menu)); } } @@ -1038,14 +1013,14 @@ bool WebView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tr webView.HttpAuthHandlerSignal().Connect(tracker, functor); connected = true; } - else if(0 == strcmp(signalName.c_str(), CONTEXT_MENU_CUSTOMIZED_SIGNAL)) + else if(0 == strcmp(signalName.c_str(), CONTEXT_MENU_SHOWN_SIGNAL)) { - webView.ContextMenuCustomizedSignal().Connect(tracker, functor); + webView.ContextMenuShownSignal().Connect(tracker, functor); connected = true; } - else if(0 == strcmp(signalName.c_str(), CONTEXT_MENU_ITEM_SELECTED_SIGNAL)) + else if(0 == strcmp(signalName.c_str(), CONTEXT_MENU_HIDDEN_SIGNAL)) { - webView.ContextMenuItemSelectedSignal().Connect(tracker, functor); + webView.ContextMenuHiddenSignal().Connect(tracker, functor); connected = true; } @@ -1207,7 +1182,7 @@ Property::Value WebView::GetProperty(BaseObject* object, Property::Index propert { case Toolkit::WebView::Property::URL: { - value = impl.mUrl; + value = impl.GetUrl(); break; } case Toolkit::WebView::Property::USER_AGENT: @@ -1365,7 +1340,7 @@ Dali::Vector2 WebView::GetContentSize() const std::string WebView::GetTitle() const { - return mWebEngine ? mWebEngine.GetTitle() : kEmptyString; + return mWebEngine ? mWebEngine.GetTitle() : std::string(); } void WebView::SetDocumentBackgroundColor(Dali::Vector4 color) @@ -1402,12 +1377,17 @@ void WebView::EnableCursorByClient(bool enabled) std::string WebView::GetSelectedText() const { - return mWebEngine ? mWebEngine.GetSelectedText() : kEmptyString; + return mWebEngine ? mWebEngine.GetSelectedText() : std::string(); +} + +std::string WebView::GetUrl() const +{ + return mWebEngine ? mWebEngine.GetUrl() : std::string(); } -const std::string& WebView::GetUserAgent() const +std::string WebView::GetUserAgent() const { - return mWebEngine ? mWebEngine.GetUserAgent() : kEmptyString; + return mWebEngine ? mWebEngine.GetUserAgent() : std::string(); } void WebView::SetUserAgent(const std::string& userAgent)