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=6a3af8d94c7099ddc2782829979c9fbcece8b36c;hp=0dd6834c33b1a502cb6202363d2b0bd345aa8921;hb=HEAD;hpb=8189dd071c31a8958d71d99fc9cd65de6a85ccb6 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 0dd6834..c121cc7 100644 --- 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) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 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. @@ -16,43 +16,45 @@ */ // CLASS HEADER -#include "web-view-impl.h" +#include // EXTERNAL INCLUDES -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include // INTERNAL INCLUDES #include #include -#include -#include -#include #include -#include +#include +#include #include +#include #include #include +#include +#include +#include + namespace Dali { namespace Toolkit @@ -87,50 +89,81 @@ 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, "policyDecision", 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_TYPE_REGISTRATION_END() // clang-format on -const std::string kEmptyString; +std::unordered_map>& GetPluginWebViewTable() +{ + static std::unordered_map> pluginWebViewMap; + return pluginWebViewMap; +} -} // namespace +enum class DisplayAreaCalculateOption +{ + PROPERTY = 0, ///< Calculate display update area by property + CURRENT_PROPERTY = 1, ///< Calculate display update area by current property +}; -#define GET_ENUM_STRING(structName, inputExp) \ - Scripting::GetLinearEnumerationName(static_cast(inputExp), structName##_TABLE, structName##_TABLE_COUNT) +/** + * @brief Helper function to calculate exact display area, offset and size. + * It will be useful when view size is not integer value, or view size is not matched with texture size. + * + * @param[in] self The view itself. + * @param[in] option Option of this calculation. Let we decide what kind of property will be used. + * @return DisplayArea for this view. + */ +Rect CalculateDisplayArea(Dali::Actor self, DisplayAreaCalculateOption option) +{ + bool positionUsesAnchorPoint = self.GetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT); + Vector3 actorSize = (option == DisplayAreaCalculateOption::CURRENT_PROPERTY) ? self.GetCurrentProperty(Actor::Property::SIZE) * self.GetCurrentProperty(Actor::Property::SCALE) + : self.GetProperty(Actor::Property::SIZE) * self.GetProperty(Actor::Property::SCALE); + Vector3 anchorPointOffSet = actorSize * (positionUsesAnchorPoint ? self.GetCurrentProperty(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT); + Vector2 screenPosition = (option == DisplayAreaCalculateOption::CURRENT_PROPERTY) ? self.GetProperty(Actor::Property::SCREEN_POSITION) + : Dali::DevelActor::CalculateScreenPosition(self); -#define GET_ENUM_VALUE(structName, inputExp, outputExp) \ - Scripting::GetEnumerationProperty(inputExp, structName##_TABLE, structName##_TABLE_COUNT, outputExp) + Dali::Rect displayArea; + displayArea.x = screenPosition.x - anchorPointOffSet.x; + displayArea.y = screenPosition.y - anchorPointOffSet.y; + displayArea.width = actorSize.x; + displayArea.height = actorSize.y; + + return displayArea; +} + +constexpr Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); + +/** + * @brief Helper function to calculate exact pixel area value by view and texture size. + * It will be useful when view size is not integer value, or view size is not matched with texture size. + * + * @param[in] viewSize The size of view. + * @param[in] textureWidth The width of texture, that must be integer type. + * @param[in] textureHeight The height of texture, that must be integer type. + * @return PixelArea value that image visual can use. + */ +Vector4 CalculatePixelArea(const Size& viewSize, const uint32_t textureWidth, const uint32_t textureHeight) +{ + float widthRatio = textureWidth == 0u ? 1.0f : viewSize.width / static_cast(textureWidth); + float heightRatio = textureHeight == 0u ? 1.0f : viewSize.height / static_cast(textureHeight); + return Vector4(0.0f, 0.0f, widthRatio, heightRatio); +} + +} // namespace 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(), - mUrlChangedSignal(), + mLastRenderedNativeImageWidth(0u), + mLastRenderedNativeImageHeight(0u), mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), - mVideoHoleEnabled(true), + mVideoHoleEnabled(false), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mVisualChangeRequired(false), + mScreenshotCapturedCallback{nullptr}, + mFrameRenderedCallback{nullptr} { mWebEngine = Dali::WebEngine::New(); @@ -141,20 +174,20 @@ WebView::WebView(const std::string& locale, const std::string& timezoneId) } } -WebView::WebView(int argc, char** argv) +WebView::WebView(uint32_t argc, char** argv) : Control(ControlBehaviour(ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS)), - mUrl(), mVisual(), mWebViewSize(Stage::GetCurrent().GetSize()), mWebEngine(), - mPageLoadStartedSignal(), - mPageLoadFinishedSignal(), - mPageLoadErrorSignal(), - mUrlChangedSignal(), + mLastRenderedNativeImageWidth(0u), + mLastRenderedNativeImageHeight(0u), mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), - mVideoHoleEnabled(true), + mVideoHoleEnabled(false), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mVisualChangeRequired(false), + mScreenshotCapturedCallback{nullptr}, + mFrameRenderedCallback{nullptr} { mWebEngine = Dali::WebEngine::New(); @@ -174,6 +207,11 @@ WebView::~WebView() { if(mWebEngine) { + auto iter = GetPluginWebViewTable().find(mWebEngine.GetPlugin()); + if(iter != GetPluginWebViewTable().end()) + { + GetPluginWebViewTable().erase(iter); + } mWebEngine.Destroy(); } } @@ -182,7 +220,10 @@ Toolkit::WebView WebView::New() { WebView* impl = new WebView(); Toolkit::WebView handle = Toolkit::WebView(*impl); - + if(impl->GetPlugin()) + { + GetPluginWebViewTable()[impl->GetPlugin()] = handle; + } impl->Initialize(); return handle; } @@ -191,76 +232,96 @@ Toolkit::WebView WebView::New(const std::string& locale, const std::string& time { WebView* impl = new WebView(locale, timezoneId); Toolkit::WebView handle = Toolkit::WebView(*impl); - + if(impl->GetPlugin()) + { + GetPluginWebViewTable()[impl->GetPlugin()] = handle; + } impl->Initialize(); return handle; } -Toolkit::WebView WebView::New(int argc, char** argv) +Toolkit::WebView WebView::New(uint32_t argc, char** argv) { WebView* impl = new WebView(argc, argv); Toolkit::WebView handle = Toolkit::WebView(*impl); - + if(impl->GetPlugin()) + { + GetPluginWebViewTable()[impl->GetPlugin()] = handle; + } impl->Initialize(); return handle; } +Toolkit::WebView WebView::FindWebView(Dali::WebEnginePlugin* plugin) +{ + auto iter = GetPluginWebViewTable().find(plugin); + if(iter != GetPluginWebViewTable().end()) + { + return iter->second.GetHandle(); + } + return Toolkit::WebView(); +} + +Dali::WebEngineContext* WebView::GetContext() +{ + return Dali::WebEngine::GetContext(); +} + +Dali::WebEngineCookieManager* WebView::GetCookieManager() +{ + return Dali::WebEngine::GetCookieManager(); +} + void WebView::OnInitialize() { Actor self = Self(); self.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true); + self.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE, true); self.TouchedSignal().Connect(this, &WebView::OnTouchEvent); self.HoveredSignal().Connect(this, &WebView::OnHoverEvent); self.WheelEventSignal().Connect(this, &WebView::OnWheelEvent); Dali::DevelActor::VisibilityChangedSignal(self).Connect(this, &WebView::OnVisibilityChanged); + mWebViewVisibleState |= WebViewVisibleStateFlag::SELF_SHOW; + 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) - { - 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); - mWebEngine.FormRepostDecisionSignal().Connect(this, &WebView::OnFormRepostDecision); - mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnFrameRendered); - mWebEngine.RequestInterceptorSignal().Connect(this, &WebView::OnInterceptRequest); - mWebEngine.ConsoleMessageSignal().Connect(this, &WebView::OnConsoleMessage); - mWebEngine.PolicyDecisionSignal().Connect(this, &WebView::OnPolicyDecisionRequest); - 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); - - mWebContext = std::unique_ptr(new WebContext(mWebEngine.GetContext())); - mWebCookieManager = std::unique_ptr(new WebCookieManager(mWebEngine.GetCookieManager())); + mPositionUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated); + mSizeUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated); + mScaleUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated); + + if(mWebEngine) + { + mWebEngine.RegisterFrameRenderedCallback(std::bind(&WebView::OnFrameRendered, this)); mWebSettings = std::unique_ptr(new WebSettings(mWebEngine.GetSettings())); mWebBackForwardList = std::unique_ptr(new WebBackForwardList(mWebEngine.GetBackForwardList())); } + + self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER); } -Dali::Toolkit::WebSettings* WebView::GetSettings() const +DevelControl::ControlAccessible* WebView::CreateAccessibleObject() { - return mWebSettings.get(); + return new WebViewAccessible(Self(), mWebEngine); } -Dali::Toolkit::WebContext* WebView::GetContext() const +void WebView::OnRelayout(const Vector2& size, RelayoutContainer& container) { - return mWebContext.get(); + if(!mWebEngine) + { + return; + } + + auto displayArea = CalculateDisplayArea(Self(), DisplayAreaCalculateOption::PROPERTY); + + SetDisplayArea(displayArea); } -Dali::Toolkit::WebCookieManager* WebView::GetCookieManager() const +Dali::Toolkit::WebSettings* WebView::GetSettings() const { - return mWebCookieManager.get(); + return mWebSettings.get(); } Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const @@ -268,38 +329,27 @@ Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const return mWebBackForwardList.get(); } -Dali::Toolkit::ImageView& WebView::GetFavicon() +Dali::WebEnginePlugin* WebView::GetPlugin() const +{ + return mWebEngine ? mWebEngine.GetPlugin() : nullptr; +} + +Dali::Toolkit::ImageView WebView::GetFavicon() const { + Dali::Toolkit::ImageView faviconView; if(mWebEngine) { Dali::PixelData pixelData = mWebEngine.GetFavicon(); - mFaviconView = CreateImageView(pixelData); + faviconView = CreateImageView(pixelData); } - return mFaviconView; + return faviconView; } 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) - { - // Clean up previously registered visual and add new one. - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - mWebEngine.LoadUrl(url); - } - - if(mVideoHoleEnabled) - { - EnableBlendMode(false); - } + mWebEngine.LoadUrl(url); } } @@ -307,22 +357,7 @@ 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) - { - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - mWebEngine.LoadHtmlString(htmlString); - } - - if(mVideoHoleEnabled) - { - EnableBlendMode(false); - } + mWebEngine.LoadHtmlString(htmlString); } } @@ -331,49 +366,15 @@ 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) - { - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - result = mWebEngine.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl); - } - - 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) +bool WebView::LoadContents(const int8_t* contents, uint32_t contentSize, const std::string& mimeType, const std::string& encoding, const std::string& baseUri) { 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) - { - DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); - result = mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri); - } - - if(mVideoHoleEnabled) - { - EnableBlendMode(false); - } - return result; + return mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri); } void WebView::Reload() @@ -449,7 +450,7 @@ bool WebView::StopInspectorServer() return mWebEngine ? mWebEngine.StopInspectorServer() : false; } -void WebView::ScrollBy(int deltaX, int deltaY) +void WebView::ScrollBy(int32_t deltaX, int32_t deltaY) { if(mWebEngine) { @@ -457,7 +458,7 @@ void WebView::ScrollBy(int deltaX, int deltaY) } } -bool WebView::ScrollEdgeBy(int deltaX, int deltaY) +bool WebView::ScrollEdgeBy(int32_t deltaX, int32_t deltaY) { return mWebEngine ? mWebEngine.ScrollEdgeBy(deltaX, deltaY) : false; } @@ -492,7 +493,7 @@ void WebView::EvaluateJavaScript(const std::string& script, std::function WebView::CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode) +{ + std::unique_ptr webHitTest; + if(!mWebEngine) + { + return webHitTest; + } + + return mWebEngine.CreateHitTest(x, y, mode); +} + +bool WebView::CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback) +{ + bool result = false; + if(mWebEngine) + { + result = mWebEngine.CreateHitTestAsynchronously(x, y, mode, std::move(callback)); + } + return result; +} + void WebView::ClearHistory() { if(mWebEngine) @@ -602,7 +624,7 @@ void WebView::AddDynamicCertificatePath(const std::string& host, const std::stri } } -Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect viewArea, float scaleFactor) +Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect viewArea, float scaleFactor) { Dali::Toolkit::ImageView imageView; if(mWebEngine) @@ -613,53 +635,30 @@ Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect viewArea, float return imageView; } -bool WebView::GetScreenshotAsynchronously(Dali::Rect viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback) +bool WebView::GetScreenshotAsynchronously(Dali::Rect viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback) { - mScreenshotCapturedCallback = callback; + mScreenshotCapturedCallback = std::move(callback); return mWebEngine ? mWebEngine.GetScreenshotAsynchronously(viewArea, scaleFactor, std::bind(&WebView::OnScreenshotCaptured, this, std::placeholders::_1)) : false; } bool WebView::CheckVideoPlayingAsynchronously(Dali::WebEnginePlugin::VideoPlayingCallback callback) { - return mWebEngine ? mWebEngine.CheckVideoPlayingAsynchronously(callback) : false; + return mWebEngine ? mWebEngine.CheckVideoPlayingAsynchronously(std::move(callback)) : false; } void WebView::RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback) { if(mWebEngine) { - mWebEngine.RegisterGeolocationPermissionCallback(callback); + mWebEngine.RegisterGeolocationPermissionCallback(std::move(callback)); } } -void WebView::UpdateDisplayArea(Dali::PropertyNotification& /*source*/) +void WebView::SetTtsFocus(bool focused) { - 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) + if(mWebEngine && !HasKeyInputFocus()) { - mWebViewSize = displaySize; - } - - if(mWebViewArea != displayArea) - { - mWebViewArea = displayArea; - mWebEngine.UpdateDisplayArea(mWebViewArea); + mWebEngine.SetFocus(focused); } } @@ -685,173 +684,246 @@ void WebView::EnableBlendMode(bool blendEnabled) } } -Dali::Toolkit::ImageView WebView::CreateImageView(Dali::PixelData pixel) +Dali::Toolkit::ImageView WebView::CreateImageView(Dali::PixelData pixel) const { - std::string url = Dali::Toolkit::Image::GenerateUrl(pixel); - Dali::Toolkit::ImageView imageView = Dali::Toolkit::ImageView::New(url); + if(!pixel) + { + return Dali::Toolkit::ImageView(); + } + + Dali::Toolkit::ImageUrl url = Dali::Toolkit::Image::GenerateUrl(pixel); + Dali::Toolkit::ImageView imageView = Dali::Toolkit::ImageView::New(url.GetUrl()); imageView.SetProperty(Dali::Actor::Property::SIZE, Vector2(pixel.GetWidth(), pixel.GetHeight())); return imageView; } -Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadStartedSignal() -{ - return mPageLoadStartedSignal; -} - -Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadInProgressSignal() -{ - return mPageLoadInProgressSignal; -} - -Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadFinishedSignal() +void WebView::RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) { - return mPageLoadFinishedSignal; + if(mWebEngine) + { + mWebEngine.RegisterPageLoadStartedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewPageLoadErrorSignalType& WebView::PageLoadErrorSignal() +void WebView::RegisterPageLoadInProgressCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) { - return mPageLoadErrorSignal; + if(mWebEngine) + { + mWebEngine.RegisterPageLoadInProgressCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewScrollEdgeReachedSignalType& WebView::ScrollEdgeReachedSignal() +void WebView::RegisterPageLoadFinishedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) { - return mScrollEdgeReachedSignal; + if(mWebEngine) + { + mWebEngine.RegisterPageLoadFinishedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewUrlChangedSignalType& WebView::UrlChangedSignal() +void WebView::RegisterPageLoadErrorCallback(Dali::WebEnginePlugin::WebEnginePageLoadErrorCallback callback) { - return mUrlChangedSignal; + if(mWebEngine) + { + mWebEngine.RegisterPageLoadErrorCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewFormRepostDecisionSignalType& WebView::FormRepostDecisionSignal() +void WebView::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback) { - return mFormRepostDecisionSignal; + if(mWebEngine) + { + mWebEngine.RegisterScrollEdgeReachedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewFrameRenderedSignalType& WebView::FrameRenderedSignal() +void WebView::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback) { - return mFrameRenderedSignal; + if(mWebEngine) + { + mWebEngine.RegisterUrlChangedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewRequestInterceptorSignalType& WebView::RequestInterceptorSignal() +void WebView::RegisterFormRepostDecidedCallback(Dali::WebEnginePlugin::WebEngineFormRepostDecidedCallback callback) { - return mRequestInterceptorSignal; + if(mWebEngine) + { + mWebEngine.RegisterFormRepostDecidedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewConsoleMessageSignalType& WebView::ConsoleMessageSignal() +void WebView::RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback) { - return mConsoleMessageSignal; + mFrameRenderedCallback = std::move(callback); } -Dali::Toolkit::WebView::WebViewPolicyDecisionSignalType& WebView::PolicyDecisionSignal() +void WebView::RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback) { - return mPolicyDecisionSignal; + if(mWebEngine) + { + mWebEngine.RegisterConsoleMessageReceivedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewCertificateSignalType& WebView::CertificateConfirmSignal() +void WebView::RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback) { - return mCertificateConfirmSignal; + if(mWebEngine) + { + mWebEngine.RegisterResponsePolicyDecidedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewCertificateSignalType& WebView::SslCertificateChangedSignal() +void WebView::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback) { - return mSslCertificateChangedSignal; + if(mWebEngine) + { + mWebEngine.RegisterNavigationPolicyDecidedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewHttpAuthHandlerSignalType& WebView::HttpAuthHandlerSignal() +void WebView::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback) { - return mHttpAuthHandlerSignal; + if(mWebEngine) + { + mWebEngine.RegisterNewWindowCreatedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewContextMenuCustomizedSignalType& WebView::ContextMenuCustomizedSignal() +void WebView::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback) { - return mContextMenuCustomizedSignal; + if(mWebEngine) + { + mWebEngine.RegisterCertificateConfirmedCallback(std::move(callback)); + } } -Dali::Toolkit::WebView::WebViewContextMenuItemSelectedSignalType& WebView::ContextMenuItemSelectedSignal() +void WebView::RegisterSslCertificateChangedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback) { - return mContextMenuItemSelectedSignal; + if(mWebEngine) + { + mWebEngine.RegisterSslCertificateChangedCallback(std::move(callback)); + } } -void WebView::OnPageLoadStarted(const std::string& url) +void WebView::RegisterHttpAuthHandlerCallback(Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback callback) { - if(!mPageLoadStartedSignal.Empty()) + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadStartedSignal.Emit(handle, url); + mWebEngine.RegisterHttpAuthHandlerCallback(std::move(callback)); } } -void WebView::OnPageLoadInProgress(const std::string& url) +void WebView::RegisterContextMenuShownCallback(Dali::WebEnginePlugin::WebEngineContextMenuShownCallback callback) { - if(!mPageLoadInProgressSignal.Empty()) + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadInProgressSignal.Emit(handle, url); + mWebEngine.RegisterContextMenuShownCallback(std::move(callback)); } } -void WebView::OnPageLoadFinished(const std::string& url) +void WebView::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback) { - if(!mPageLoadFinishedSignal.Empty()) + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadFinishedSignal.Emit(handle, url); + mWebEngine.RegisterContextMenuHiddenCallback(std::move(callback)); } } -void WebView::OnPageLoadError(std::shared_ptr error) +void WebView::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback) { - if(!mPageLoadErrorSignal.Empty()) + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadErrorSignal.Emit(handle, std::move(error)); + mWebEngine.GetPlainTextAsynchronously(std::move(callback)); } } -void WebView::OnScrollEdgeReached(Dali::WebEnginePlugin::ScrollEdge edge) +void WebView::OnFrameRendered() { - if(!mScrollEdgeReachedSignal.Empty()) + if(mFrameRenderedCallback) { - Dali::Toolkit::WebView handle(GetOwner()); - mScrollEdgeReachedSignal.Emit(handle, edge); + mFrameRenderedCallback(); } -} -void WebView::OnUrlChanged(const std::string& url) -{ - if(!mUrlChangedSignal.Empty()) + // Make sure that mVisual is created only if required. + if(mVisualChangeRequired || !mVisual) { - Dali::Toolkit::WebView handle(GetOwner()); - mUrlChangedSignal.Emit(handle, url); + // Reset flag + mVisualChangeRequired = false; + + auto nativeImageSourcePtr = mWebEngine.GetNativeImageSource(); + + mLastRenderedNativeImageWidth = nativeImageSourcePtr->GetWidth(); + mLastRenderedNativeImageHeight = nativeImageSourcePtr->GetHeight(); + + Dali::Toolkit::ImageUrl nativeImageUrl = Dali::Toolkit::Image::GenerateUrl(nativeImageSourcePtr); + + mVisual = Toolkit::VisualFactory::Get().CreateVisual( + {{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, + {Toolkit::ImageVisual::Property::URL, nativeImageUrl.GetUrl()}, + {Toolkit::ImageVisual::Property::PIXEL_AREA, FULL_TEXTURE_RECT}, + {Toolkit::ImageVisual::Property::WRAP_MODE_U, Dali::WrapMode::CLAMP_TO_EDGE}, + {Toolkit::ImageVisual::Property::WRAP_MODE_V, Dali::WrapMode::CLAMP_TO_EDGE}}); + + if(mVisual) + { + DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); + EnableBlendMode(!mVideoHoleEnabled); + } } } -void WebView::OnFormRepostDecision(std::shared_ptr decision) +void WebView::OnDisplayAreaUpdated(Dali::PropertyNotification& /*source*/) { - if(!mFormRepostDecisionSignal.Empty()) + if(!mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - std::shared_ptr repostDecision(new Dali::Toolkit::WebFormRepostDecision(decision)); - mFormRepostDecisionSignal.Emit(handle, std::move(repostDecision)); + return; } + + auto displayArea = CalculateDisplayArea(Self(), DisplayAreaCalculateOption::CURRENT_PROPERTY); + + SetDisplayArea(displayArea); } -void WebView::OnFrameRendered() +void WebView::OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type) { - if(!mFrameRenderedSignal.Empty()) + if(type == Dali::DevelActor::VisibilityChange::Type::SELF) { - Dali::Toolkit::WebView handle(GetOwner()); - mFrameRenderedSignal.Emit(handle); + if(isVisible) + { + mWebViewVisibleState |= WebViewVisibleStateFlag::SELF_SHOW; + } + else + { + mWebViewVisibleState &= ~WebViewVisibleStateFlag::SELF_SHOW; + } + } + else if(type == Dali::DevelActor::VisibilityChange::Type::PARENT) + { + if(isVisible) + { + mWebViewVisibleState |= WebViewVisibleStateFlag::PARENT_SHOW; + // TODO : We should consider double-hide called from parent + } + else + { + mWebViewVisibleState &= ~WebViewVisibleStateFlag::PARENT_SHOW; + } } + ApplyVisibilityCheck(); } -void WebView::OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type) +void WebView::OnWindowVisibilityChanged(Window window, bool visible) { - if(type == Dali::DevelActor::VisibilityChange::Type::SELF) + if(visible) + { + mWebViewVisibleState |= WebViewVisibleStateFlag::WINDOW_SHOW; + } + else { - SetVisibility(isVisible); + mWebViewVisibleState &= ~WebViewVisibleStateFlag::WINDOW_SHOW; } + ApplyVisibilityCheck(); } void WebView::OnScreenshotCaptured(Dali::PixelData pixel) @@ -863,167 +935,131 @@ void WebView::OnScreenshotCaptured(Dali::PixelData pixel) } } -void WebView::OnInterceptRequest(std::shared_ptr interceptor) +void WebView::SetDisplayArea(const Dali::Rect& displayArea) { - if(!mRequestInterceptorSignal.Empty()) + Size displaySize = Size(displayArea.width, displayArea.height); + if(mWebViewSize != displaySize) { - Dali::Toolkit::WebView handle(GetOwner()); - mRequestInterceptorSignal.Emit(handle, std::move(interceptor)); + mWebViewSize = displaySize; } -} -void WebView::OnConsoleMessage(std::shared_ptr message) -{ - if(!mConsoleMessageSignal.Empty()) + if(mWebViewArea != displayArea) { - Dali::Toolkit::WebView handle(GetOwner()); - mConsoleMessageSignal.Emit(handle, std::move(message)); + // WebEngine visual size changed. we have to re-create visual. + mVisualChangeRequired = true; + + // Change old visual's pixel area matched as changed web view size + if(mVisual) + { + auto pixelArea = CalculatePixelArea(mWebViewSize, mLastRenderedNativeImageWidth, mLastRenderedNativeImageHeight); + Toolkit::GetImplementation(mVisual).DoAction(Toolkit::DevelVisual::Action::UPDATE_PROPERTY, {{Toolkit::ImageVisual::Property::PIXEL_AREA, pixelArea}}); + } + + mWebViewArea = displayArea; + mWebEngine.UpdateDisplayArea(mWebViewArea); } } -void WebView::OnPolicyDecisionRequest(std::shared_ptr decision) +void WebView::OnSceneConnection(int depth) { - if(!mPolicyDecisionSignal.Empty()) + mWebViewVisibleState |= WebViewVisibleStateFlag::SCENE_ON; + mWebViewVisibleState |= WebViewVisibleStateFlag::PARENT_SHOW; + // TODO : We should consider already hided parent + Window window = DevelWindow::Get(Self()); + if(window) { - Dali::Toolkit::WebView handle(GetOwner()); - mPolicyDecisionSignal.Emit(handle, std::move(decision)); + // Hold the weak handle of the placement window. + mPlacementWindow = window; + if(window.IsVisible()) + { + mWebViewVisibleState |= WebViewVisibleStateFlag::WINDOW_SHOW; + } + else + { + mWebViewVisibleState &= ~WebViewVisibleStateFlag::WINDOW_SHOW; + } + DevelWindow::VisibilityChangedSignal(window).Connect(this, &WebView::OnWindowVisibilityChanged); } + ApplyVisibilityCheck(); + Control::OnSceneConnection(depth); + EnableBlendMode(!mVideoHoleEnabled); } -void WebView::OnCertificateConfirm(std::shared_ptr certificate) +void WebView::OnSceneDisconnection() { - if(!mCertificateConfirmSignal.Empty()) + mWebViewVisibleState &= ~WebViewVisibleStateFlag::SCENE_ON; + mWebViewVisibleState &= ~WebViewVisibleStateFlag::WINDOW_SHOW; + mWebViewVisibleState &= ~WebViewVisibleStateFlag::PARENT_SHOW; + Window window = mPlacementWindow.GetHandle(); + if(window) { - Dali::Toolkit::WebView handle(GetOwner()); - mCertificateConfirmSignal.Emit(handle, std::move(certificate)); + DevelWindow::VisibilityChangedSignal(window).Disconnect(this, &WebView::OnWindowVisibilityChanged); + mPlacementWindow.Reset(); } + ApplyVisibilityCheck(); + Control::OnSceneDisconnection(); } -void WebView::OnSslCertificateChanged(std::shared_ptr certificate) +bool WebView::OnTouchEvent(Actor actor, const Dali::TouchEvent& touch) { - if(!mSslCertificateChangedSignal.Empty()) + bool result = false; + + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mSslCertificateChangedSignal.Emit(handle, std::move(certificate)); + result = mWebEngine.SendTouchEvent(touch); } + return result; } -void WebView::OnHttpAuthenticationRequest(std::shared_ptr handler) +bool WebView::OnKeyEvent(const Dali::KeyEvent& event) { - if(!mHttpAuthHandlerSignal.Empty()) + bool result = false; + + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mHttpAuthHandlerSignal.Emit(handle, std::move(handler)); + result = mWebEngine.SendKeyEvent(event); } + return result; } -void WebView::OnContextMenuCustomized(std::shared_ptr menu) +bool WebView::OnHoverEvent(Actor actor, const Dali::HoverEvent& hover) { - if(!mContextMenuCustomizedSignal.Empty()) + bool result = false; + if(mWebEngine && mMouseEventsEnabled) { - Dali::Toolkit::WebView handle(GetOwner()); - mContextMenuCustomizedSignal.Emit(handle, std::move(menu)); + result = mWebEngine.SendHoverEvent(hover); } + return result; } -void WebView::OnContextMenuItemSelected(std::shared_ptr item) +bool WebView::OnWheelEvent(Actor actor, const Dali::WheelEvent& wheel) { - if(!mContextMenuItemSelectedSignal.Empty()) + bool result = false; + if(mWebEngine && mMouseEventsEnabled) { - Dali::Toolkit::WebView handle(GetOwner()); - mContextMenuItemSelectedSignal.Emit(handle, std::move(item)); + result = mWebEngine.SendWheelEvent(wheel); } + return result; } -bool WebView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor) +void WebView::OnKeyInputFocusGained() { - Dali::BaseHandle handle(object); - - bool connected = false; - Toolkit::WebView webView = Toolkit::WebView::DownCast(handle); - - 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.PageLoadFinishedSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_ERROR_SIGNAL)) - { - 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; - } - else if(0 == strcmp(signalName.c_str(), URL_CHANGED_SIGNAL)) - { - webView.UrlChangedSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), FORM_REPOST_DECISION_SIGNAL)) - { - webView.FormRepostDecisionSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), FRAME_RENDERED_SIGNAL)) - { - webView.FrameRenderedSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), REQUEST_INTERCEPTOR_SIGNAL)) - { - webView.RequestInterceptorSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), CONSOLE_MESSAGE_SIGNAL)) - { - webView.ConsoleMessageSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), POLICY_DECISION)) - { - webView.PolicyDecisionSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), CERTIFICATE_CONFIRM_SIGNAL)) - { - webView.CertificateConfirmSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), SSL_CERTIFICATE_CHANGED_SIGNAL)) - { - webView.SslCertificateChangedSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), HTTP_AUTH_REQUEST_SIGNAL)) - { - webView.HttpAuthHandlerSignal().Connect(tracker, functor); - connected = true; - } - else if(0 == strcmp(signalName.c_str(), CONTEXT_MENU_CUSTOMIZED_SIGNAL)) + if(mWebEngine) { - webView.ContextMenuCustomizedSignal().Connect(tracker, functor); - connected = true; + mWebEngine.SetFocus(true); } - else if(0 == strcmp(signalName.c_str(), CONTEXT_MENU_ITEM_SELECTED_SIGNAL)) + + EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last. +} + +void WebView::OnKeyInputFocusLost() +{ + if(mWebEngine) { - webView.ContextMenuItemSelectedSignal().Connect(tracker, functor); - connected = true; + mWebEngine.SetFocus(false); } - return connected; + EmitKeyInputFocusSignal(false); // Calls back into the Control hence done last. } Vector3 WebView::GetNaturalSize() @@ -1038,13 +1074,6 @@ Vector3 WebView::GetNaturalSize() return Vector3(mWebViewSize); } -void WebView::OnSceneConnection(int depth) -{ - Control::OnSceneConnection(depth); - - EnableBlendMode(!mVideoHoleEnabled); -} - void WebView::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value) { Toolkit::WebView webView = Toolkit::WebView::DownCast(Dali::BaseHandle(object)); @@ -1181,7 +1210,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: @@ -1252,69 +1281,7 @@ Property::Value WebView::GetProperty(BaseObject* object, Property::Index propert return value; } -bool WebView::OnTouchEvent(Actor actor, const Dali::TouchEvent& touch) -{ - bool result = false; - - if(mWebEngine) - { - result = mWebEngine.SendTouchEvent(touch); - } - return result; -} - -bool WebView::OnKeyEvent(const Dali::KeyEvent& event) -{ - bool result = false; - - if(mWebEngine) - { - result = mWebEngine.SendKeyEvent(event); - } - return result; -} - -bool WebView::OnHoverEvent(Actor actor, const Dali::HoverEvent& hover) -{ - bool result = false; - if(mWebEngine) - { - result = mWebEngine.SendHoverEvent(hover); - } - return result; -} - -bool WebView::OnWheelEvent(Actor actor, const Dali::WheelEvent& wheel) -{ - bool result = false; - if(mWebEngine) - { - result = mWebEngine.SendWheelEvent(wheel); - } - return result; -} - -void WebView::OnKeyInputFocusGained() -{ - if(mWebEngine) - { - mWebEngine.SetFocus(true); - } - - EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last. -} - -void WebView::OnKeyInputFocusLost() -{ - if(mWebEngine) - { - mWebEngine.SetFocus(false); - } - - EmitKeyInputFocusSignal(false); // Calls back into the Control hence done last. -} - -void WebView::SetScrollPosition(int x, int y) +void WebView::SetScrollPosition(int32_t x, int32_t y) { if(mWebEngine) { @@ -1339,7 +1306,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) @@ -1376,12 +1343,17 @@ void WebView::EnableCursorByClient(bool enabled) std::string WebView::GetSelectedText() const { - return mWebEngine ? mWebEngine.GetSelectedText() : kEmptyString; + return mWebEngine ? mWebEngine.GetSelectedText() : std::string(); } -const std::string& WebView::GetUserAgent() const +std::string WebView::GetUrl() const { - return mWebEngine ? mWebEngine.GetUserAgent() : kEmptyString; + return mWebEngine ? mWebEngine.GetUrl() : std::string(); +} + +std::string WebView::GetUserAgent() const +{ + return mWebEngine ? mWebEngine.GetUserAgent() : std::string(); } void WebView::SetUserAgent(const std::string& userAgent) @@ -1446,8 +1418,81 @@ bool WebView::SetVisibility(bool visible) return mWebEngine ? mWebEngine.SetVisibility(visible) : false; } -#undef GET_ENUM_STRING -#undef GET_ENUM_VALUE +void WebView::ApplyVisibilityCheck() +{ + SetVisibility(mWebViewVisibleState == WebViewVisibleStateFlag::VISIBLE); +} + +WebView::WebViewAccessible::WebViewAccessible(Dali::Actor self, Dali::WebEngine& webEngine) +: ControlAccessible(self), + mRemoteChild{}, + mWebEngine{webEngine} +{ + mRemoteChild.SetParent(this); + + Dali::Accessibility::Bridge::EnabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityEnabled); + Dali::Accessibility::Bridge::DisabledSignal().Connect(this, &WebViewAccessible::OnAccessibilityDisabled); + + if(Dali::Accessibility::IsUp()) + { + OnAccessibilityEnabled(); + } + else + { + OnAccessibilityDisabled(); + } +} + +Dali::Accessibility::Attributes WebView::WebViewAccessible::GetAttributes() const +{ + auto attributes = DevelControl::ControlAccessible::GetAttributes(); + + if(mRemoteChild.GetAddress()) + { + attributes.insert_or_assign("child_bus", mRemoteChild.GetAddress().GetBus()); + } + + return attributes; +} + +void WebView::WebViewAccessible::DoGetChildren(std::vector& children) +{ + if(mRemoteChild.GetAddress()) + { + // DoGetChildren is called at most once per every OnChildrenChanged. + // We have only one OnChildrenChanged in this case, so EmbedAtkSocket will be called only once. + Accessibility::Bridge::GetCurrentBridge()->EmbedAtkSocket(GetAddress(), mRemoteChild.GetAddress()); + children.push_back(&mRemoteChild); + } +} + +void WebView::WebViewAccessible::OnAccessibilityEnabled() +{ + if(!mWebEngine) + { + return; + } + + mWebEngine.ActivateAccessibility(true); + SetRemoteChildAddress(mWebEngine.GetAccessibilityAddress()); +} + +void WebView::WebViewAccessible::OnAccessibilityDisabled() +{ + if(!mWebEngine) + { + return; + } + + SetRemoteChildAddress({}); + mWebEngine.ActivateAccessibility(false); +} + +void WebView::WebViewAccessible::SetRemoteChildAddress(Dali::Accessibility::Address address) +{ + mRemoteChild.SetAddress(address); + OnChildrenChanged(); +} } // namespace Internal