X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fweb-view%2Fweb-view-impl.cpp;h=d2fe130e5f4c394363c09058664b28047be0edc3;hb=a55079df3e5c5f1774b8f5dcef457351d5c8e199;hp=ded91c538376d791d78fdc9d83ecac3a3b8402be;hpb=1f01d1789c381b621845708f46d382e242a9256b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 ded91c5..d2fe130 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -39,7 +39,6 @@ #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