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=f791349b80d4d45bc478f3c50da6155b369ec29b;hp=c4bf4e9da4186280399ac9a5c65f803ff268cc8f;hb=3cdcf62978e0a6794578caa5054238c104cef855;hpb=fd25921c0f007bcedae97c5c130529f6646ee647 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 c4bf4e9..f791349 100755 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp @@ -20,8 +20,17 @@ // EXTERNAL INCLUDES #include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -30,6 +39,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -37,9 +47,9 @@ #include #include #include -#include #include #include +#include #include namespace Dali @@ -72,19 +82,13 @@ DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "tilesClearedWhenHidden", BOOLEAN, DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "tileCoverAreaMultiplier", FLOAT, TILE_COVER_AREA_MULTIPLIER) DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "cursorEnabledByClient", BOOLEAN, CURSOR_ENABLED_BY_CLIENT ) DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "selectedText", STRING, SELECTED_TEXT ) - -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_PROPERTY_REGISTRATION(Toolkit, WebView, "pageZoomFactor", FLOAT, PAGE_ZOOM_FACTOR ) +DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "textZoomFactor", FLOAT, TEXT_ZOOM_FACTOR ) +DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "loadProgressPercentage", FLOAT, LOAD_PROGRESS_PERCENTAGE ) DALI_TYPE_REGISTRATION_END() // clang-format on -const std::string kEmptyString; - } // namespace #define GET_ENUM_STRING(structName, inputExp) \ @@ -95,18 +99,14 @@ 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(), - mPageLoadStartedSignal(), - mPageLoadFinishedSignal(), - mPageLoadErrorSignal(), - mUrlChangedSignal(), - mVideoHoleEnabled(true), mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), + mVideoHoleEnabled(false), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mScreenshotCapturedCallback(nullptr) { mWebEngine = Dali::WebEngine::New(); @@ -117,20 +117,16 @@ 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(), - mVideoHoleEnabled(true), mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height), + mVideoHoleEnabled(false), mMouseEventsEnabled(true), - mKeyEventsEnabled(true) + mKeyEventsEnabled(true), + mScreenshotCapturedCallback(nullptr) { mWebEngine = Dali::WebEngine::New(); @@ -150,6 +146,7 @@ WebView::~WebView() { if(mWebEngine) { + mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnFrameRendered); mWebEngine.Destroy(); } } @@ -172,7 +169,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); @@ -186,9 +183,11 @@ 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); mPositionUpdateNotification = self.AddPropertyNotification(Actor::Property::WORLD_POSITION, StepCondition(1.0f, 1.0f)); mSizeUpdateNotification = self.AddPropertyNotification(Actor::Property::SIZE, StepCondition(1.0f, 1.0f)); @@ -199,13 +198,7 @@ void WebView::OnInitialize() 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.FrameRenderedSignal().Connect(this, &WebView::OnFrameRendered); mWebContext = std::unique_ptr(new WebContext(mWebEngine.GetContext())); mWebCookieManager = std::unique_ptr(new WebCookieManager(mWebEngine.GetCookieManager())); mWebSettings = std::unique_ptr(new WebSettings(mWebEngine.GetSettings())); @@ -233,41 +226,27 @@ 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(); - std::string url = Dali::Toolkit::Image::GenerateUrl(pixelData); - mFaviconView = Dali::Toolkit::ImageView::New(url); - mFaviconView.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS); - mFaviconView.SetProperty(Dali::Actor::Property::SIZE, Vector2(pixelData.GetWidth(), pixelData.GetHeight())); + 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) + 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); } } @@ -275,23 +254,39 @@ 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); + } +} + +bool WebView::LoadHtmlStringOverrideCurrentEntry(const std::string& html, const std::string& basicUri, const std::string& unreachableUrl) +{ + if(!mWebEngine) + return false; + + if(!mVisual) + { + mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); + } + + 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) +{ + if(!mWebEngine) + return false; + + if(!mVisual) + { + mWebEngine.FrameRenderedSignal().Connect(this, &WebView::OnInitialFrameRendered); } + + return mWebEngine.LoadContents(contents, contentSize, mimeType, encoding, baseUri); } void WebView::Reload() @@ -302,6 +297,11 @@ void WebView::Reload() } } +bool WebView::ReloadWithoutCache() +{ + return mWebEngine ? mWebEngine.ReloadWithoutCache() : false; +} + void WebView::StopLoading() { if(mWebEngine) @@ -326,7 +326,43 @@ void WebView::Resume() } } -void WebView::ScrollBy(int deltaX, int deltaY) +void WebView::SuspendNetworkLoading() +{ + if(mWebEngine) + { + mWebEngine.SuspendNetworkLoading(); + } +} + +void WebView::ResumeNetworkLoading() +{ + if(mWebEngine) + { + mWebEngine.ResumeNetworkLoading(); + } +} + +bool WebView::AddCustomHeader(const std::string& name, const std::string& value) +{ + return mWebEngine ? mWebEngine.AddCustomHeader(name, value) : false; +} + +bool WebView::RemoveCustomHeader(const std::string& name) +{ + return mWebEngine ? mWebEngine.RemoveCustomHeader(name) : false; +} + +uint32_t WebView::StartInspectorServer(uint32_t port) +{ + return mWebEngine ? mWebEngine.StartInspectorServer(port) : false; +} + +bool WebView::StopInspectorServer() +{ + return mWebEngine ? mWebEngine.StopInspectorServer() : false; +} + +void WebView::ScrollBy(int32_t deltaX, int32_t deltaY) { if(mWebEngine) { @@ -334,6 +370,11 @@ void WebView::ScrollBy(int deltaX, int deltaY) } } +bool WebView::ScrollEdgeBy(int32_t deltaX, int32_t deltaY) +{ + return mWebEngine ? mWebEngine.ScrollEdgeBy(deltaX, deltaY) : false; +} + bool WebView::CanGoForward() { return mWebEngine ? mWebEngine.CanGoForward() : false; @@ -424,6 +465,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) @@ -432,6 +494,86 @@ void WebView::ClearHistory() } } +void WebView::ClearAllTilesResources() +{ + if(mWebEngine) + { + mWebEngine.ClearAllTilesResources(); + } +} + +void WebView::SetScaleFactor(float scaleFactor, Dali::Vector2 point) +{ + if(mWebEngine) + { + mWebEngine.SetScaleFactor(scaleFactor, point); + } +} + +float WebView::GetScaleFactor() const +{ + return mWebEngine ? mWebEngine.GetScaleFactor() : 0.0f; +} + +void WebView::ActivateAccessibility(bool activated) +{ + if(mWebEngine) + { + mWebEngine.ActivateAccessibility(activated); + } +} + +bool WebView::HighlightText(const std::string& text, Dali::WebEnginePlugin::FindOption options, uint32_t maxMatchCount) +{ + return mWebEngine ? mWebEngine.HighlightText(text, options, maxMatchCount) : false; +} + +void WebView::AddDynamicCertificatePath(const std::string& host, const std::string& certPath) +{ + if(mWebEngine) + { + mWebEngine.AddDynamicCertificatePath(host, certPath); + } +} + +Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect viewArea, float scaleFactor) +{ + Dali::Toolkit::ImageView imageView; + if(mWebEngine) + { + Dali::PixelData pixelData = mWebEngine.GetScreenshot(viewArea, scaleFactor); + imageView = CreateImageView(pixelData); + } + return imageView; +} + +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; +} + +bool WebView::CheckVideoPlayingAsynchronously(Dali::WebEnginePlugin::VideoPlayingCallback callback) +{ + return mWebEngine ? mWebEngine.CheckVideoPlayingAsynchronously(callback) : false; +} + +void WebView::RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterGeolocationPermissionCallback(callback); + } +} + +void WebView::SetTtsFocus(bool focused) +{ + if(mWebEngine && !HasKeyInputFocus()) + { + mWebEngine.SetFocus(focused); + } +} + void WebView::UpdateDisplayArea(Dali::PropertyNotification& /*source*/) { if(!mWebEngine) @@ -444,7 +586,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; @@ -485,137 +627,249 @@ void WebView::EnableBlendMode(bool blendEnabled) } } -void WebView::ClearAllTilesResources() +Dali::Toolkit::ImageView WebView::CreateImageView(Dali::PixelData pixel) const +{ + 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; +} + +void WebView::RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) { if(mWebEngine) { - mWebEngine.ClearAllTilesResources(); + mWebEngine.RegisterPageLoadStartedCallback(callback); } } -Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadStartedSignal() +void WebView::RegisterPageLoadInProgressCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) { - return mPageLoadStartedSignal; + if(mWebEngine) + { + mWebEngine.RegisterPageLoadInProgressCallback(callback); + } } -Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadInProgressSignal() +void WebView::RegisterPageLoadFinishedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback) { - return mPageLoadInProgressSignal; + if(mWebEngine) + { + mWebEngine.RegisterPageLoadFinishedCallback(callback); + } +} + +void WebView::RegisterPageLoadErrorCallback(Dali::WebEnginePlugin::WebEnginePageLoadErrorCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterPageLoadErrorCallback(callback); + } } -Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadFinishedSignal() +void WebView::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback) { - return mPageLoadFinishedSignal; + if(mWebEngine) + { + mWebEngine.RegisterScrollEdgeReachedCallback(callback); + } +} + +void WebView::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterUrlChangedCallback(callback); + } +} + +void WebView::RegisterFormRepostDecidedCallback(Dali::WebEnginePlugin::WebEngineFormRepostDecidedCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterFormRepostDecidedCallback(callback); + } } -Dali::Toolkit::WebView::WebViewPageLoadErrorSignalType& WebView::PageLoadErrorSignal() +void WebView::RegisterFrameRenderedCallback(Dali::WebEnginePlugin::WebEngineFrameRenderedCallback callback) { - return mPageLoadErrorSignal; + mFrameRenderedCallback = callback; +} + +void WebView::RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterConsoleMessageReceivedCallback(callback); + } +} + +void WebView::RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterResponsePolicyDecidedCallback(callback); + } +} + +void WebView::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterCertificateConfirmedCallback(callback); + } +} + +void WebView::RegisterSslCertificateChangedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback) +{ + if(mWebEngine) + { + mWebEngine.RegisterSslCertificateChangedCallback(callback); + } } -Dali::Toolkit::WebView::WebViewScrollEdgeReachedSignalType& WebView::ScrollEdgeReachedSignal() +void WebView::RegisterHttpAuthHandlerCallback(Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback callback) { - return mScrollEdgeReachedSignal; + if(mWebEngine) + { + mWebEngine.RegisterHttpAuthHandlerCallback(callback); + } } -Dali::Toolkit::WebView::WebViewUrlChangedSignalType& WebView::UrlChangedSignal() +void WebView::RegisterContextMenuShownCallback(Dali::WebEnginePlugin::WebEngineContextMenuShownCallback callback) { - return mUrlChangedSignal; + if(mWebEngine) + { + mWebEngine.RegisterContextMenuShownCallback(callback); + } } -void WebView::OnPageLoadStarted(const std::string& url) +void WebView::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback) { - if(!mPageLoadStartedSignal.Empty()) + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadStartedSignal.Emit(handle, url); + mWebEngine.RegisterContextMenuHiddenCallback(callback); } } -void WebView::OnPageLoadInProgress(const std::string& url) +void WebView::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback) { - if(!mPageLoadInProgressSignal.Empty()) + if(mWebEngine) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadInProgressSignal.Emit(handle, url); + mWebEngine.GetPlainTextAsynchronously(callback); } } -void WebView::OnPageLoadFinished(const std::string& url) +void WebView::OnFrameRendered() { - if(!mPageLoadFinishedSignal.Empty()) + if(mFrameRenderedCallback) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadFinishedSignal.Emit(handle, url); + mFrameRenderedCallback(); } } -void WebView::OnPageLoadError(const std::string& url, int errorCode) +void WebView::OnInitialFrameRendered() { - if(!mPageLoadErrorSignal.Empty()) + mWebEngine.FrameRenderedSignal().Disconnect(this, &WebView::OnInitialFrameRendered); + + 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) { - Dali::Toolkit::WebView handle(GetOwner()); - mPageLoadErrorSignal.Emit(handle, url, static_cast(errorCode)); + DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual); + EnableBlendMode(!mVideoHoleEnabled); } } -void WebView::OnScrollEdgeReached(Dali::WebEnginePlugin::ScrollEdge edge) +void WebView::OnVisibilityChanged(Actor actor, bool isVisible, Dali::DevelActor::VisibilityChange::Type type) { - if(!mScrollEdgeReachedSignal.Empty()) + if(type == Dali::DevelActor::VisibilityChange::Type::SELF) { - Dali::Toolkit::WebView handle(GetOwner()); - mScrollEdgeReachedSignal.Emit(handle, edge); + SetVisibility(isVisible); } } -void WebView::OnUrlChanged(const std::string& url) +void WebView::OnScreenshotCaptured(Dali::PixelData pixel) { - if(!mUrlChangedSignal.Empty()) + if(mScreenshotCapturedCallback) { - Dali::Toolkit::WebView handle(GetOwner()); - mUrlChangedSignal.Emit(handle, url); + Dali::Toolkit::ImageView imageView = CreateImageView(pixel); + mScreenshotCapturedCallback(imageView); } } -bool WebView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor) +void WebView::OnSceneConnection(int depth) { - Dali::BaseHandle handle(object); + Control::OnSceneConnection(depth); + EnableBlendMode(!mVideoHoleEnabled); +} - bool connected = false; - Toolkit::WebView webView = Toolkit::WebView::DownCast(handle); +bool WebView::OnTouchEvent(Actor actor, const Dali::TouchEvent& touch) +{ + bool result = false; - if(0 == strcmp(signalName.c_str(), PAGE_LOAD_STARTED_SIGNAL)) + if(mWebEngine) { - webView.PageLoadStartedSignal().Connect(tracker, functor); - connected = true; + result = mWebEngine.SendTouchEvent(touch); } - else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_IN_PROGRESS_SIGNAL)) + return result; +} + +bool WebView::OnKeyEvent(const Dali::KeyEvent& event) +{ + bool result = false; + + if(mWebEngine) { - webView.PageLoadInProgressSignal().Connect(tracker, functor); - connected = true; + result = mWebEngine.SendKeyEvent(event); } - else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_FINISHED_SIGNAL)) + return result; +} + +bool WebView::OnHoverEvent(Actor actor, const Dali::HoverEvent& hover) +{ + bool result = false; + if(mWebEngine && mMouseEventsEnabled) { - webView.PageLoadFinishedSignal().Connect(tracker, functor); - connected = true; + result = mWebEngine.SendHoverEvent(hover); } - else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_ERROR_SIGNAL)) + return result; +} + +bool WebView::OnWheelEvent(Actor actor, const Dali::WheelEvent& wheel) +{ + bool result = false; + if(mWebEngine && mMouseEventsEnabled) { - webView.PageLoadErrorSignal().Connect(tracker, functor); - connected = true; + result = mWebEngine.SendWheelEvent(wheel); } - else if(0 == strcmp(signalName.c_str(), SCROLL_EDGE_REACHED_SIGNAL)) + return result; +} + +void WebView::OnKeyInputFocusGained() +{ + if(mWebEngine) { - webView.ScrollEdgeReachedSignal().Connect(tracker, functor); - connected = true; + mWebEngine.SetFocus(true); } - else if(0 == strcmp(signalName.c_str(), URL_CHANGED_SIGNAL)) + + EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last. +} + +void WebView::OnKeyInputFocusLost() +{ + if(mWebEngine) { - webView.UrlChangedSignal().Connect(tracker, functor); - connected = true; + mWebEngine.SetFocus(false); } - return connected; + EmitKeyInputFocusSignal(false); // Calls back into the Control hence done last. } Vector3 WebView::GetNaturalSize() @@ -630,13 +884,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)); @@ -736,6 +983,26 @@ void WebView::SetProperty(BaseObject* object, Property::Index index, const Prope } break; } + case Toolkit::WebView::Property::PAGE_ZOOM_FACTOR: + { + float input; + if(value.Get(input)) + { + impl.SetPageZoomFactor(input); + } + break; + } + case Toolkit::WebView::Property::TEXT_ZOOM_FACTOR: + { + float input; + if(value.Get(input)) + { + impl.SetTextZoomFactor(input); + } + break; + } + default: + break; } } } @@ -753,7 +1020,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: @@ -801,6 +1068,21 @@ Property::Value WebView::GetProperty(BaseObject* object, Property::Index propert value = impl.GetSelectedText(); break; } + case Toolkit::WebView::Property::PAGE_ZOOM_FACTOR: + { + value = impl.GetPageZoomFactor(); + break; + } + case Toolkit::WebView::Property::TEXT_ZOOM_FACTOR: + { + value = impl.GetTextZoomFactor(); + break; + } + case Toolkit::WebView::Property::LOAD_PROGRESS_PERCENTAGE: + { + value = impl.GetLoadProgressPercentage(); + break; + } default: break; } @@ -809,69 +1091,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) { @@ -896,7 +1116,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) @@ -933,12 +1153,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) @@ -967,6 +1192,42 @@ void WebView::EnableKeyEvents(bool enabled) } } +void WebView::SetPageZoomFactor(float zoomFactor) +{ + if(mWebEngine) + { + mWebEngine.SetPageZoomFactor(zoomFactor); + } +} + +float WebView::GetPageZoomFactor() const +{ + return mWebEngine ? mWebEngine.GetPageZoomFactor() : 0.0f; +} + +void WebView::SetTextZoomFactor(float zoomFactor) +{ + if(mWebEngine) + { + mWebEngine.SetTextZoomFactor(zoomFactor); + } +} + +float WebView::GetTextZoomFactor() const +{ + return mWebEngine ? mWebEngine.GetTextZoomFactor() : 0.0f; +} + +float WebView::GetLoadProgressPercentage() const +{ + return mWebEngine ? mWebEngine.GetLoadProgressPercentage() : 0.0f; +} + +bool WebView::SetVisibility(bool visible) +{ + return mWebEngine ? mWebEngine.SetVisibility(visible) : false; +} + #undef GET_ENUM_STRING #undef GET_ENUM_VALUE