X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fweb-view%2Fweb-view-impl.cpp;h=bf85d8d116a39678272c401880f449d59b959d1a;hb=78c772dd32c14bd500d6d3378ffa3a6e87dc60fa;hp=0dd6834c33b1a502cb6202363d2b0bd345aa8921;hpb=ce0f6a98e157fda761dd9c3d0514609be937f388;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 old mode 100644 new mode 100755 index 0dd6834..bf85d8d --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -46,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -97,7 +97,7 @@ DALI_SIGNAL_REGISTRATION(Toolkit, WebView, "formRepostDecision", FORM_REPOS 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, "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 ) @@ -130,7 +130,8 @@ WebView::WebView(const std::string& locale, const std::string& timezoneId) mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), mVideoHoleEnabled(true), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mScreenshotCapturedCallback(nullptr) { mWebEngine = Dali::WebEngine::New(); @@ -141,7 +142,7 @@ 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(), @@ -154,7 +155,8 @@ WebView::WebView(int argc, char** argv) mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), mVideoHoleEnabled(true), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mScreenshotCapturedCallback(nullptr) { mWebEngine = Dali::WebEngine::New(); @@ -196,7 +198,7 @@ Toolkit::WebView WebView::New(const std::string& locale, const std::string& time 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); @@ -234,7 +236,7 @@ void WebView::OnInitialize() 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.ResponsePolicyDecisionSignal().Connect(this, &WebView::OnResponsePolicyDecided); mWebEngine.CertificateConfirmSignal().Connect(this, &WebView::OnCertificateConfirm); mWebEngine.SslCertificateChangedSignal().Connect(this, &WebView::OnSslCertificateChanged); mWebEngine.HttpAuthHandlerSignal().Connect(this, &WebView::OnHttpAuthenticationRequest); @@ -268,14 +270,15 @@ Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const return mWebBackForwardList.get(); } -Dali::Toolkit::ImageView& WebView::GetFavicon() +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) @@ -449,7 +452,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 +460,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; } @@ -552,6 +555,27 @@ void WebView::JavaScriptPromptReply(const std::string& result) } } +std::unique_ptr 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, callback); + } + return result; +} + void WebView::ClearHistory() { if(mWebEngine) @@ -602,7 +626,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,7 +637,7 @@ 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; return mWebEngine ? mWebEngine.GetScreenshotAsynchronously(viewArea, scaleFactor, std::bind(&WebView::OnScreenshotCaptured, this, std::placeholders::_1)) : false; @@ -644,7 +668,7 @@ void WebView::UpdateDisplayArea(Dali::PropertyNotification& /*source*/) Vector3 anchorPointOffSet = actorSize * (positionUsesAnchorPoint ? self.GetCurrentProperty(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT); Vector2 screenPosition = self.GetProperty(Actor::Property::SCREEN_POSITION); - Dali::Rect displayArea; + Dali::Rect displayArea; displayArea.x = screenPosition.x - anchorPointOffSet.x; displayArea.y = screenPosition.y - anchorPointOffSet.y; displayArea.width = actorSize.x; @@ -685,8 +709,13 @@ void WebView::EnableBlendMode(bool blendEnabled) } } -Dali::Toolkit::ImageView WebView::CreateImageView(Dali::PixelData pixel) +Dali::Toolkit::ImageView WebView::CreateImageView(Dali::PixelData pixel) const { + if(!pixel) + { + return Dali::Toolkit::ImageView(); + } + std::string url = Dali::Toolkit::Image::GenerateUrl(pixel); Dali::Toolkit::ImageView imageView = Dali::Toolkit::ImageView::New(url); imageView.SetProperty(Dali::Actor::Property::SIZE, Vector2(pixel.GetWidth(), pixel.GetHeight())); @@ -743,9 +772,9 @@ Dali::Toolkit::WebView::WebViewConsoleMessageSignalType& WebView::ConsoleMessage return mConsoleMessageSignal; } -Dali::Toolkit::WebView::WebViewPolicyDecisionSignalType& WebView::PolicyDecisionSignal() +Dali::Toolkit::WebView::WebViewResponsePolicyDecisionSignalType& WebView::ResponsePolicyDecisionSignal() { - return mPolicyDecisionSignal; + return mResponsePolicyDecisionSignal; } Dali::Toolkit::WebView::WebViewCertificateSignalType& WebView::CertificateConfirmSignal() @@ -831,9 +860,8 @@ void WebView::OnFormRepostDecision(std::shared_ptr repostDecision(new Dali::Toolkit::WebFormRepostDecision(decision)); - mFormRepostDecisionSignal.Emit(handle, std::move(repostDecision)); + Dali::Toolkit::WebView handle(GetOwner()); + mFormRepostDecisionSignal.Emit(handle, std::move(decision)); } } @@ -881,12 +909,12 @@ void WebView::OnConsoleMessage(std::shared_ptr me } } -void WebView::OnPolicyDecisionRequest(std::shared_ptr decision) +void WebView::OnResponsePolicyDecided(std::shared_ptr decision) { - if(!mPolicyDecisionSignal.Empty()) + if(!mResponsePolicyDecisionSignal.Empty()) { Dali::Toolkit::WebView handle(GetOwner()); - mPolicyDecisionSignal.Emit(handle, std::move(decision)); + mResponsePolicyDecisionSignal.Emit(handle, std::move(decision)); } } @@ -994,7 +1022,7 @@ bool WebView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tr } else if(0 == strcmp(signalName.c_str(), POLICY_DECISION)) { - webView.PolicyDecisionSignal().Connect(tracker, functor); + webView.ResponsePolicyDecisionSignal().Connect(tracker, functor); connected = true; } else if(0 == strcmp(signalName.c_str(), CERTIFICATE_CONFIRM_SIGNAL)) @@ -1277,7 +1305,7 @@ bool WebView::OnKeyEvent(const Dali::KeyEvent& event) bool WebView::OnHoverEvent(Actor actor, const Dali::HoverEvent& hover) { bool result = false; - if(mWebEngine) + if(mWebEngine && mMouseEventsEnabled) { result = mWebEngine.SendHoverEvent(hover); } @@ -1287,7 +1315,7 @@ bool WebView::OnHoverEvent(Actor actor, const Dali::HoverEvent& hover) bool WebView::OnWheelEvent(Actor actor, const Dali::WheelEvent& wheel) { bool result = false; - if(mWebEngine) + if(mWebEngine && mMouseEventsEnabled) { result = mWebEngine.SendWheelEvent(wheel); } @@ -1314,7 +1342,7 @@ void WebView::OnKeyInputFocusLost() 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) {