From 6fe2217005434ae601ca2b36501c7bba6dd537c7 Mon Sep 17 00:00:00 2001 From: "huayong.xu" Date: Thu, 15 Dec 2022 17:50:58 +0800 Subject: [PATCH] Add an API for 'create,window' event. Change-Id: I47915f69884b8f609cccda19b402dae7d1f29484 --- .../dali-toolkit-test-utils/toolkit-web-engine.cpp | 31 +++-- .../src/dali-toolkit/utc-Dali-WebView.cpp | 26 ++++ .../devel-api/controls/web-view/web-view.cpp | 10 ++ .../devel-api/controls/web-view/web-view.h | 17 ++- .../internal/controls/web-view/web-view-impl.cpp | 138 +++++++++------------ .../internal/controls/web-view/web-view-impl.h | 26 ++-- 6 files changed, 145 insertions(+), 103 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp index 6003749..3d84173 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-engine.cpp @@ -1229,7 +1229,7 @@ public: void EnableVideoHole(bool enabled) override {} bool SendHoverEvent(const HoverEvent& event) override { return false; } bool SendWheelEvent(const WheelEvent& event) override { return false; } - WebEngineFrameRenderedSignalType& FrameRenderedSignal() override { return frameRenderedSignal; } + void RegisterFrameRenderedCallback(WebEngineFrameRenderedCallback callback) override {} void RegisterPageLoadStartedCallback(WebEnginePageLoadCallback callback) override {} void RegisterPageLoadInProgressCallback(WebEnginePageLoadCallback callback) override {} void RegisterPageLoadFinishedCallback(WebEnginePageLoadCallback callback) override {} @@ -1240,6 +1240,7 @@ public: void RegisterConsoleMessageReceivedCallback(WebEngineConsoleMessageReceivedCallback callback) override {} void RegisterResponsePolicyDecidedCallback(WebEngineResponsePolicyDecidedCallback callback) override {} void RegisterNavigationPolicyDecidedCallback(WebEngineNavigationPolicyDecidedCallback callback) override {} + void RegisterNewWindowCreatedCallback(WebEngineNewWindowCreatedCallback callback) override {} void RegisterCertificateConfirmedCallback(WebEngineCertificateCallback callback) override {} void RegisterSslCertificateChangedCallback(WebEngineCertificateCallback callback) override {} void RegisterHttpAuthHandlerCallback(WebEngineHttpAuthHandlerCallback callback) override {} @@ -1249,7 +1250,6 @@ public: private: MockWebEngineSettings settings; MockWebEngineBackForwardList backForwardList; - WebEngineFrameRenderedSignalType frameRenderedSignal; }; Dali::WebEnginePlugin* GetWebEnginePlugin() @@ -1614,9 +1614,9 @@ public: } } - Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType& FrameRenderedSignal() + void RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback) { - return mFrameRenderedSignal; + mFrameRenderedCallback = callback; } void RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) @@ -1669,6 +1669,11 @@ public: mNavigationPolicyDecisionCallback = callback; } + void RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback) + { + mNewWindowCreatedCallback = callback; + } + void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback) { mCertificateConfirmCallback = callback; @@ -1708,8 +1713,6 @@ public: size_t mCurrentPlusOnePos; std::string mUserAgent; - Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType mFrameRenderedSignal; - bool mEvaluating; float mPageZoomFactor; float mTextZoomFactor; @@ -1734,6 +1737,7 @@ public: Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback mConsoleMessageCallback; Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback mResponsePolicyDecisionCallback; Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback mNavigationPolicyDecisionCallback; + Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback mNewWindowCreatedCallback; Dali::WebEnginePlugin::WebEngineCertificateCallback mCertificateConfirmCallback; Dali::WebEnginePlugin::WebEngineCertificateCallback mSslCertificateChangedCallback; Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback mHttpAuthHandlerCallback; @@ -1813,7 +1817,6 @@ bool OnLoadUrl() std::unique_ptr repostDecision(new MockWebEngineFormRepostDecision()); gInstance->mFormRepostDecidedCallback(std::move(repostDecision)); } - gInstance->mFrameRenderedSignal.Emit(); if (gInstance->mFrameRenderedCallback) { gInstance->mFrameRenderedCallback(); @@ -1833,6 +1836,11 @@ bool OnLoadUrl() std::unique_ptr policyDecision(new MockWebEnginePolicyDecision()); gInstance->mNavigationPolicyDecisionCallback(std::move(policyDecision)); } + if (gInstance->mNewWindowCreatedCallback) + { + Dali::WebEnginePlugin* plugin = 0; + gInstance->mNewWindowCreatedCallback(plugin); + } if (gInstance->mCertificateConfirmCallback) { std::unique_ptr certificate(new MockWebEngineCertificate()); @@ -2507,9 +2515,9 @@ void WebEngine::EnableKeyEvents( bool enabled ) { } -Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType& WebEngine::FrameRenderedSignal() +void WebEngine::RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback) { - return Internal::Adaptor::GetImplementation(*this).FrameRenderedSignal(); + Internal::Adaptor::GetImplementation(*this).RegisterFrameRenderedCallback(callback); } void WebEngine::RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) @@ -2562,6 +2570,11 @@ void WebEngine::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::W Internal::Adaptor::GetImplementation(*this).RegisterNavigationPolicyDecidedCallback(callback); } +void WebEngine::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback) +{ + Internal::Adaptor::GetImplementation(*this).RegisterNewWindowCreatedCallback(callback); +} + void WebEngine::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback) { Internal::Adaptor::GetImplementation( *this ).RegisterCertificateConfirmedCallback(callback); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp index 107582c..b494a44 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp @@ -79,6 +79,7 @@ static int gConso static std::unique_ptr gConsoleMessageInstance = nullptr; static int gResponsePolicyDecidedCallbackCalled = 0; static int gNavigationPolicyDecidedCallbackCalled = 0; +static int gNewWindowCreatedCallbackCalled = 0; static std::unique_ptr gResponsePolicyDecisionInstance = nullptr; static int gCertificateConfirmCallbackCalled = 0; static std::unique_ptr gCertificateConfirmInstance = nullptr; @@ -148,6 +149,13 @@ static void OnNavigationPolicyDecided(std::unique_ptr #include #include #include @@ -38,8 +39,6 @@ #include #include #include -#include -#include // INTERNAL INCLUDES #include @@ -50,6 +49,9 @@ #include #include +#include +#include + namespace Dali { namespace Toolkit @@ -89,12 +91,6 @@ DALI_TYPE_REGISTRATION_END() } // 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) - std::unordered_map> WebView::mPluginWebViewMap; WebView::WebView(const std::string& locale, const std::string& timezoneId) @@ -106,7 +102,8 @@ WebView::WebView(const std::string& locale, const std::string& timezoneId) mVideoHoleEnabled(false), mMouseEventsEnabled(true), mKeyEventsEnabled(true), - mScreenshotCapturedCallback(nullptr) + mScreenshotCapturedCallback{nullptr}, + mFrameRenderedCallback{nullptr} { mWebEngine = Dali::WebEngine::New(); @@ -126,7 +123,8 @@ WebView::WebView(uint32_t argc, char** argv) mVideoHoleEnabled(false), mMouseEventsEnabled(true), mKeyEventsEnabled(true), - mScreenshotCapturedCallback(nullptr) + mScreenshotCapturedCallback{nullptr}, + mFrameRenderedCallback{nullptr} { mWebEngine = Dali::WebEngine::New(); @@ -146,7 +144,6 @@ WebView::~WebView() { if(mWebEngine) { - mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnFrameRendered); auto iter = mPluginWebViewMap.find(mWebEngine.GetPlugin()); if (iter != mPluginWebViewMap.end()) { @@ -226,13 +223,13 @@ void WebView::OnInitialize() 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); + mPositionUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated); + mSizeUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated); + mScaleUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated); if(mWebEngine) { - mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnFrameRendered); + mWebEngine.RegisterFrameRenderedCallback(std::bind(&WebView::OnFrameRendered, this)); mWebSettings = std::unique_ptr(new WebSettings(mWebEngine.GetSettings())); mWebBackForwardList = std::unique_ptr(new WebBackForwardList(mWebEngine.GetBackForwardList())); } @@ -240,11 +237,6 @@ void WebView::OnInitialize() self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER); } -Dali::WebEnginePlugin* WebView::GetPlugin() const -{ - return mWebEngine ? mWebEngine.GetPlugin() : nullptr; -} - DevelControl::ControlAccessible* WebView::CreateAccessibleObject() { return new WebViewAccessible(Self(), mWebEngine); @@ -260,6 +252,11 @@ Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const return mWebBackForwardList.get(); } +Dali::WebEnginePlugin* WebView::GetPlugin() const +{ + return mWebEngine ? mWebEngine.GetPlugin() : nullptr; +} + Dali::Toolkit::ImageView WebView::GetFavicon() const { Dali::Toolkit::ImageView faviconView; @@ -275,11 +272,6 @@ void WebView::LoadUrl(const std::string& url) { if(mWebEngine) { - if(!mVisual) - { - mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); - } - mWebEngine.LoadUrl(url); } } @@ -288,11 +280,6 @@ void WebView::LoadHtmlString(const std::string& htmlString) { if(mWebEngine) { - if(!mVisual) - { - mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); - } - mWebEngine.LoadHtmlString(htmlString); } } @@ -302,11 +289,6 @@ bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const if(!mWebEngine) return false; - if(!mVisual) - { - mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); - } - return mWebEngine.LoadHtmlStringOverrideCurrentEntry(html, basicUri, unreachableUrl); } @@ -315,11 +297,6 @@ bool WebView::LoadContents(const std::string& contents, uint32_t contentSize, co if(!mWebEngine) return false; - if(!mVisual) - { - mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); - } - return mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri); } @@ -608,37 +585,6 @@ void WebView::SetTtsFocus(bool focused) } } -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; @@ -759,6 +705,14 @@ void WebView::RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::Web } } +void WebView::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterNewWindowCreatedCallback(callback); + } +} + void WebView::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback) { if(mWebEngine) @@ -813,15 +767,13 @@ void WebView::OnFrameRendered() { mFrameRenderedCallback(); } -} -void WebView::OnInitialFrameRendered() -{ - mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnInitialFrameRendered); + // Make sure that mVisual is created only once. + if (mVisual) + return; Dali::Toolkit::ImageUrl nativeImageUrl = Dali::Toolkit::Image::GenerateUrl(mWebEngine.GetNativeImageSource()); mVisual = Toolkit::VisualFactory::Get().CreateVisual({{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, {Toolkit::ImageVisual::Property::URL, nativeImageUrl.GetUrl()}}); - if(mVisual) { DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); @@ -829,6 +781,37 @@ void WebView::OnInitialFrameRendered() } } +void WebView::OnDisplayAreaUpdated(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::OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type) { if(type == Dali::DevelActor::VisibilityChange::Type::SELF) @@ -1339,9 +1322,6 @@ void WebView::WebViewAccessible::SetRemoteChildAddress(Dali::Accessibility::Addr OnChildrenChanged(); } -#undef GET_ENUM_STRING -#undef GET_ENUM_VALUE - } // namespace Internal } // namespace Toolkit diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.h b/dali-toolkit/internal/controls/web-view/web-view-impl.h index cfbb31e..fc5d06a 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.h +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.h @@ -99,6 +99,11 @@ public: Dali::Toolkit::WebBackForwardList* GetBackForwardList() const; /** + * @copydoc Dali::Toolkit::WebView::GetPlugin() + */ + Dali::WebEnginePlugin* GetPlugin() const; + + /** * @copydoc Dali::Toolkit::WebView::GetFavicon() */ Dali::Toolkit::ImageView GetFavicon() const; @@ -374,6 +379,11 @@ public: void RegisterNavigationPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNavigationPolicyDecidedCallback callback); /** + * @copydoc Dali::Toolkit::WebView::RegisterNewWindowCreatedCallback() + */ + void RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback); + + /** * @copydoc Dali::Toolkit::WebView::RegisterCertificateConfirmedCallback() */ void RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback); @@ -465,11 +475,6 @@ private: WebView& operator=(const WebView& webView); /** - * @brief Gets web engine plugin. - */ - Dali::WebEnginePlugin* GetPlugin() const; - - /** * @brief Set an absolute scroll of the given view. * @param[in] x The coordinate x of scroll * @param[in] y The coordinate y of scroll @@ -593,12 +598,6 @@ private: bool SetVisibility(bool visible); /** - * @brief Update display area of web view. - * @param[in] source The soource triggers Notification. - */ - void UpdateDisplayArea(Dali::PropertyNotification& source); - - /** * @brief Enable/Disable video hole for video playing. * @param[in] enabled True if video hole is enabled, false otherwise. */ @@ -661,9 +660,10 @@ private: void OnFrameRendered(); /** - * @brief Callback function to be called when frame is rendered. This is to check initial buffer is ready. + * @brief Callback for updating display area of web view. + * @param[in] source The soource triggers Notification. */ - void OnInitialFrameRendered(); + void OnDisplayAreaUpdated(Dali::PropertyNotification& source); /** * @brief Callback function to be called when visibility is changed. -- 2.7.4