/*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
#include "web-view-impl.h"
// EXTERNAL INCLUDES
-#include <cstring>
+#include <dali/devel-api/adaptor-framework/web-engine-back-forward-list.h>
+#include <dali/devel-api/adaptor-framework/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine-cookie-manager.h>
+#include <dali/devel-api/adaptor-framework/web-engine-settings.h>
+#include <dali/devel-api/common/stage.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
-#include <dali/public-api/common/stage.h>
-#include <dali/public-api/images/native-image.h>
#include <dali/public-api/adaptor-framework/native-image-source.h>
-#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry.h>
+#include <cstring>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-context.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
+#include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/public-api/image-loader/image.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
namespace Dali
{
-
namespace Toolkit
{
-
namespace Internal
{
-
namespace
{
-
BaseHandle Create()
{
return Toolkit::WebView::New();
}
-DALI_ENUM_TO_STRING_TABLE_BEGIN( CacheModel )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CacheModel, DOCUMENT_VIEWER )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CacheModel, DOCUMENT_BROWSER )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CacheModel, PRIMARY_WEB_BROWSER )
-DALI_ENUM_TO_STRING_TABLE_END( CacheModel )
-
-DALI_ENUM_TO_STRING_TABLE_BEGIN( CookieAcceptPolicy )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CookieAcceptPolicy, ALWAYS )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CookieAcceptPolicy, NEVER )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::WebView::CookieAcceptPolicy, NO_THIRD_PARTY )
-DALI_ENUM_TO_STRING_TABLE_END( CookieAcceptPolicy )
-
-DALI_TYPE_REGISTRATION_BEGIN( Toolkit::WebView, Toolkit::Control, Create )
-
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "url", STRING, URL )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "cacheModel", STRING, CACHE_MODEL )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "cookieAcceptPolicy", STRING, COOKIE_ACCEPT_POLICY )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "userAgent", STRING, USER_AGENT )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "enableJavaScript", BOOLEAN, ENABLE_JAVASCRIPT )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "loadImagesAutomatically", BOOLEAN, LOAD_IMAGES_AUTOMATICALLY )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "defaultTextEncodingName", STRING, DEFAULT_TEXT_ENCODING_NAME )
-DALI_PROPERTY_REGISTRATION( Toolkit, WebView, "defaultFontSize", INTEGER, DEFAULT_FONT_SIZE )
-
-DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadStarted", PAGE_LOAD_STARTED_SIGNAL )
-DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadFinished", PAGE_LOAD_FINISHED_SIGNAL )
-DALI_SIGNAL_REGISTRATION( Toolkit, WebView, "pageLoadError", PAGE_LOAD_ERROR_SIGNAL )
+// clang-format off
+DALI_TYPE_REGISTRATION_BEGIN(Toolkit::WebView, Toolkit::Control, Create)
+
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "url", STRING, URL )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "userAgent", STRING, USER_AGENT )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "scrollPosition", VECTOR2, SCROLL_POSITION )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "scrollSize", VECTOR2, SCROLL_SIZE )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "contentSize", VECTOR2, CONTENT_SIZE )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "title", STRING, TITLE )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "videoHoleEnabled", BOOLEAN, VIDEO_HOLE_ENABLED )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "mouseEventsEnabled", BOOLEAN, MOUSE_EVENTS_ENABLED )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "keyEventsEnabled", BOOLEAN, KEY_EVENTS_ENABLED )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "documentBackgroundColor", VECTOR4, DOCUMENT_BACKGROUND_COLOR )
+DALI_PROPERTY_REGISTRATION(Toolkit, WebView, "tilesClearedWhenHidden", BOOLEAN, TILES_CLEARED_WHEN_HIDDEN )
+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_TYPE_REGISTRATION_END()
+// clang-format on
const std::string kEmptyString;
-} // anonymous namepsace
+} // namespace
+
+#define GET_ENUM_STRING(structName, inputExp) \
+ Scripting::GetLinearEnumerationName<Toolkit::WebView::structName::Type>(static_cast<Toolkit::WebView::structName::Type>(inputExp), structName##_TABLE, structName##_TABLE_COUNT)
+
+#define GET_ENUM_VALUE(structName, inputExp, outputExp) \
+ Scripting::GetEnumerationProperty<Toolkit::WebView::structName::Type>(inputExp, structName##_TABLE, structName##_TABLE_COUNT, outputExp)
-#define GET_ENUM_STRING( structName, inputExp ) \
- Scripting::GetLinearEnumerationName< Toolkit::WebView::structName::Type >( static_cast< Toolkit::WebView::structName::Type >( inputExp ), structName##_TABLE, structName##_TABLE_COUNT )
+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),
+ mMouseEventsEnabled(true),
+ mKeyEventsEnabled(true)
+{
+ mWebEngine = Dali::WebEngine::New();
-#define GET_ENUM_VALUE( structName, inputExp, outputExp ) \
- Scripting::GetEnumerationProperty< Toolkit::WebView::structName::Type >( inputExp, structName##_TABLE, structName##_TABLE_COUNT, outputExp )
+ // WebEngine is empty when it is not properly initialized.
+ if(mWebEngine)
+ {
+ mWebEngine.Create(mWebViewSize.width, mWebViewSize.height, locale, timezoneId);
+ }
+}
-WebView::WebView( const std::string& locale, const std::string& timezoneId )
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS ) ),
+WebView::WebView(int argc, char** argv)
+: Control(ControlBehaviour(ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS)),
mUrl(),
mVisual(),
- mWebViewSize( Stage::GetCurrent().GetSize() ),
+ mWebViewSize(Stage::GetCurrent().GetSize()),
mWebEngine(),
mPageLoadStartedSignal(),
mPageLoadFinishedSignal(),
- mPageLoadErrorSignal()
+ mPageLoadErrorSignal(),
+ mUrlChangedSignal(),
+ mVideoHoleEnabled(true),
+ mWebViewArea(0, 0, mWebViewSize.width, mWebViewSize.height),
+ mMouseEventsEnabled(true),
+ mKeyEventsEnabled(true)
{
mWebEngine = Dali::WebEngine::New();
// WebEngine is empty when it is not properly initialized.
- if( mWebEngine )
+ if(mWebEngine)
{
- mWebEngine.Create( mWebViewSize.width, mWebViewSize.height, locale, timezoneId );
+ mWebEngine.Create(mWebViewSize.width, mWebViewSize.height, argc, argv);
}
}
WebView::WebView()
-: WebView( "", "" )
+: WebView("", "")
{
}
WebView::~WebView()
{
+ if(mWebEngine)
+ {
+ mWebEngine.Destroy();
+ }
}
Toolkit::WebView WebView::New()
{
- WebView* impl = new WebView();
- Toolkit::WebView handle = Toolkit::WebView( *impl );
+ WebView* impl = new WebView();
+ Toolkit::WebView handle = Toolkit::WebView(*impl);
impl->Initialize();
return handle;
}
-Toolkit::WebView WebView::New( const std::string& locale, const std::string& timezoneId )
+Toolkit::WebView WebView::New(const std::string& locale, const std::string& timezoneId)
{
- WebView* impl = new WebView( locale, timezoneId );
- Toolkit::WebView handle = Toolkit::WebView( *impl );
+ WebView* impl = new WebView(locale, timezoneId);
+ Toolkit::WebView handle = Toolkit::WebView(*impl);
+
+ impl->Initialize();
+ return handle;
+}
+
+Toolkit::WebView WebView::New(int argc, char** argv)
+{
+ WebView* impl = new WebView(argc, argv);
+ Toolkit::WebView handle = Toolkit::WebView(*impl);
impl->Initialize();
return handle;
void WebView::OnInitialize()
{
- Self().SetKeyboardFocusable( true );
- Self().TouchSignal().Connect( this, &WebView::OnTouchEvent );
+ Actor self = Self();
+
+ self.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
+ self.TouchedSignal().Connect(this, &WebView::OnTouchEvent);
+ self.HoveredSignal().Connect(this, &WebView::OnHoverEvent);
+ self.WheelEventSignal().Connect(this, &WebView::OnWheelEvent);
+
+ 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 )
+ if(mWebEngine)
{
- mWebEngine.PageLoadStartedSignal().Connect( this, &WebView::OnPageLoadStarted );
- mWebEngine.PageLoadFinishedSignal().Connect( this, &WebView::OnPageLoadFinished );
- mWebEngine.PageLoadErrorSignal().Connect( this, &WebView::OnPageLoadError );
+ 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);
+
+ mWebContext = std::unique_ptr<Dali::Toolkit::WebContext>(new WebContext(mWebEngine.GetContext()));
+ mWebCookieManager = std::unique_ptr<Dali::Toolkit::WebCookieManager>(new WebCookieManager(mWebEngine.GetCookieManager()));
+ mWebSettings = std::unique_ptr<Dali::Toolkit::WebSettings>(new WebSettings(mWebEngine.GetSettings()));
+ mWebBackForwardList = std::unique_ptr<Dali::Toolkit::WebBackForwardList>(new WebBackForwardList(mWebEngine.GetBackForwardList()));
}
}
-void WebView::LoadUrl( const std::string& url )
+Dali::Toolkit::WebSettings* WebView::GetSettings() const
+{
+ return mWebSettings.get();
+}
+
+Dali::Toolkit::WebContext* WebView::GetContext() const
+{
+ return mWebContext.get();
+}
+
+Dali::Toolkit::WebCookieManager* WebView::GetCookieManager() const
+{
+ return mWebCookieManager.get();
+}
+
+Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
+{
+ return mWebBackForwardList.get();
+}
+
+Dali::Toolkit::ImageView& WebView::GetFavicon()
+{
+ 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()));
+ }
+ return mFaviconView;
+}
+
+void WebView::LoadUrl(const std::string& url)
{
mUrl = url;
- if( mWebEngine )
+ 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 } } );
+ 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 );
+ DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
+ mWebEngine.LoadUrl(url);
+ }
+
+ if(mVideoHoleEnabled)
+ {
+ EnableBlendMode(false);
}
}
}
-void WebView::LoadHTMLString( const std::string& htmlString )
+void WebView::LoadHtmlString(const std::string& htmlString)
{
- if( mWebEngine )
+ if(mWebEngine)
{
- Texture texture = Dali::Texture::New( *mWebEngine.GetNativeImageSource() );
- const std::string nativeImageUrl = Dali::Toolkit::TextureManager::AddTexture( texture );
+ 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}});
- 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( mVisual )
+ if(mVideoHoleEnabled)
{
- DevelControl::RegisterVisual( *this, Toolkit::WebView::Property::URL, mVisual );
- mWebEngine.LoadHTMLString( htmlString );
+ EnableBlendMode(false);
}
}
}
void WebView::Reload()
{
- if( mWebEngine )
+ if(mWebEngine)
{
mWebEngine.Reload();
}
void WebView::StopLoading()
{
- if( mWebEngine )
+ if(mWebEngine)
{
mWebEngine.StopLoading();
}
void WebView::Suspend()
{
- if( mWebEngine )
+ if(mWebEngine)
{
mWebEngine.Suspend();
}
void WebView::Resume()
{
- if( mWebEngine )
+ if(mWebEngine)
{
mWebEngine.Resume();
}
}
+void WebView::ScrollBy(int deltaX, int deltaY)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.ScrollBy(deltaX, deltaY);
+ }
+}
+
bool WebView::CanGoForward()
{
return mWebEngine ? mWebEngine.CanGoForward() : false;
void WebView::GoForward()
{
- if( mWebEngine )
+ if(mWebEngine)
{
mWebEngine.GoForward();
}
void WebView::GoBack()
{
- if( mWebEngine )
+ if(mWebEngine)
{
mWebEngine.GoBack();
}
}
-void WebView::EvaluateJavaScript( const std::string& script, std::function< void( const std::string& ) > resultHandler )
+void WebView::EvaluateJavaScript(const std::string& script, std::function<void(const std::string&)> resultHandler)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.EvaluateJavaScript(script, resultHandler);
+ }
+}
+
+void WebView::AddJavaScriptMessageHandler(const std::string& exposedObjectName, std::function<void(const std::string&)> handler)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.AddJavaScriptMessageHandler(exposedObjectName, handler);
+ }
+}
+
+void WebView::RegisterJavaScriptAlertCallback(Dali::WebEnginePlugin::JavaScriptAlertCallback callback)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.RegisterJavaScriptAlertCallback(callback);
+ }
+}
+
+void WebView::JavaScriptAlertReply()
+{
+ if(mWebEngine)
+ {
+ mWebEngine.JavaScriptAlertReply();
+ }
+}
+
+void WebView::RegisterJavaScriptConfirmCallback(Dali::WebEnginePlugin::JavaScriptConfirmCallback callback)
{
- if( mWebEngine )
+ if(mWebEngine)
{
- mWebEngine.EvaluateJavaScript( script, resultHandler );
+ mWebEngine.RegisterJavaScriptConfirmCallback(callback);
}
}
-void WebView::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler )
+void WebView::JavaScriptConfirmReply(bool confirmed)
{
- if( mWebEngine )
+ if(mWebEngine)
{
- mWebEngine.AddJavaScriptMessageHandler( exposedObjectName, handler );
+ mWebEngine.JavaScriptConfirmReply(confirmed);
+ }
+}
+
+void WebView::RegisterJavaScriptPromptCallback(Dali::WebEnginePlugin::JavaScriptPromptCallback callback)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.RegisterJavaScriptPromptCallback(callback);
+ }
+}
+
+void WebView::JavaScriptPromptReply(const std::string& result)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.JavaScriptPromptReply(result);
}
}
void WebView::ClearHistory()
{
- if( mWebEngine )
+ if(mWebEngine)
{
mWebEngine.ClearHistory();
}
}
-void WebView::ClearCache()
+void WebView::UpdateDisplayArea(Dali::PropertyNotification& /*source*/)
{
- if( mWebEngine )
+ if(!mWebEngine)
+ return;
+
+ Actor self(Self());
+
+ bool positionUsesAnchorPoint = self.GetProperty<bool>(Actor::Property::POSITION_USES_ANCHOR_POINT);
+ Vector3 actorSize = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE) * self.GetCurrentProperty<Vector3>(Actor::Property::SCALE);
+ Vector3 anchorPointOffSet = actorSize * (positionUsesAnchorPoint ? self.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
+ Vector2 screenPosition = self.GetProperty<Vector2>(Actor::Property::SCREEN_POSITION);
+
+ Dali::Rect<int> 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)
{
- mWebEngine.ClearCache();
+ mWebViewSize = displaySize;
+ }
+
+ if(mWebViewArea != displayArea)
+ {
+ mWebViewArea = displayArea;
+ mWebEngine.UpdateDisplayArea(mWebViewArea);
}
}
-void WebView::ClearCookies()
+void WebView::EnableVideoHole(bool enabled)
{
- if( mWebEngine )
+ mVideoHoleEnabled = enabled;
+
+ EnableBlendMode(!mVideoHoleEnabled);
+
+ if(mWebEngine)
{
- mWebEngine.ClearCookies();
+ mWebEngine.EnableVideoHole(mVideoHoleEnabled);
+ }
+}
+
+void WebView::EnableBlendMode(bool blendEnabled)
+{
+ Actor self = Self();
+ for(uint32_t i = 0; i < self.GetRendererCount(); i++)
+ {
+ Dali::Renderer render = self.GetRendererAt(i);
+ render.SetProperty(Renderer::Property::BLEND_MODE, blendEnabled ? BlendMode::ON : BlendMode::OFF);
+ }
+}
+
+void WebView::ClearAllTilesResources()
+{
+ if(mWebEngine)
+ {
+ mWebEngine.ClearAllTilesResources();
}
}
return mPageLoadStartedSignal;
}
+Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadInProgressSignal()
+{
+ return mPageLoadInProgressSignal;
+}
+
Dali::Toolkit::WebView::WebViewPageLoadSignalType& WebView::PageLoadFinishedSignal()
{
return mPageLoadFinishedSignal;
return mPageLoadErrorSignal;
}
-void WebView::OnPageLoadStarted( const std::string& url )
+Dali::Toolkit::WebView::WebViewScrollEdgeReachedSignalType& WebView::ScrollEdgeReachedSignal()
+{
+ return mScrollEdgeReachedSignal;
+}
+
+Dali::Toolkit::WebView::WebViewUrlChangedSignalType& WebView::UrlChangedSignal()
+{
+ return mUrlChangedSignal;
+}
+
+void WebView::OnPageLoadStarted(const std::string& url)
+{
+ if(!mPageLoadStartedSignal.Empty())
+ {
+ Dali::Toolkit::WebView handle(GetOwner());
+ mPageLoadStartedSignal.Emit(handle, url);
+ }
+}
+
+void WebView::OnPageLoadInProgress(const std::string& url)
+{
+ if(!mPageLoadInProgressSignal.Empty())
+ {
+ Dali::Toolkit::WebView handle(GetOwner());
+ mPageLoadInProgressSignal.Emit(handle, url);
+ }
+}
+
+void WebView::OnPageLoadFinished(const std::string& url)
{
- if( !mPageLoadStartedSignal.Empty() )
+ if(!mPageLoadFinishedSignal.Empty())
{
- Dali::Toolkit::WebView handle( GetOwner() );
- mPageLoadStartedSignal.Emit( handle, url );
+ Dali::Toolkit::WebView handle(GetOwner());
+ mPageLoadFinishedSignal.Emit(handle, url);
}
}
-void WebView::OnPageLoadFinished( const std::string& url )
+void WebView::OnPageLoadError(const std::string& url, int errorCode)
{
- if( !mPageLoadFinishedSignal.Empty() )
+ if(!mPageLoadErrorSignal.Empty())
{
- Dali::Toolkit::WebView handle( GetOwner() );
- mPageLoadFinishedSignal.Emit( handle, url );
+ Dali::Toolkit::WebView handle(GetOwner());
+ mPageLoadErrorSignal.Emit(handle, url, static_cast<Toolkit::WebView::LoadErrorCode>(errorCode));
}
}
-void WebView::OnPageLoadError( const std::string& url, int errorCode )
+void WebView::OnScrollEdgeReached(Dali::WebEnginePlugin::ScrollEdge edge)
{
- if( !mPageLoadErrorSignal.Empty() )
+ if(!mScrollEdgeReachedSignal.Empty())
{
- Dali::Toolkit::WebView handle( GetOwner() );
- mPageLoadErrorSignal.Emit( handle, url, static_cast< Toolkit::WebView::LoadErrorCode >( errorCode ) );
+ Dali::Toolkit::WebView handle(GetOwner());
+ mScrollEdgeReachedSignal.Emit(handle, edge);
}
}
-bool WebView::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+void WebView::OnUrlChanged(const std::string& url)
{
- Dali::BaseHandle handle( object );
+ if(!mUrlChangedSignal.Empty())
+ {
+ Dali::Toolkit::WebView handle(GetOwner());
+ mUrlChangedSignal.Emit(handle, url);
+ }
+}
- bool connected = false;
- Toolkit::WebView webView = Toolkit::WebView::DownCast( handle );
+bool WebView::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
+{
+ Dali::BaseHandle handle(object);
- if( 0 == strcmp( signalName.c_str(), PAGE_LOAD_STARTED_SIGNAL ) )
+ 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 );
+ webView.PageLoadStartedSignal().Connect(tracker, functor);
connected = true;
}
- else if( 0 == strcmp( signalName.c_str(), PAGE_LOAD_FINISHED_SIGNAL ) )
+ else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_IN_PROGRESS_SIGNAL))
{
- webView.PageLoadFinishedSignal().Connect( tracker, functor );
+ webView.PageLoadInProgressSignal().Connect(tracker, functor);
connected = true;
}
- else if( 0 == strcmp( signalName.c_str(), PAGE_LOAD_ERROR_SIGNAL ) )
+ else if(0 == strcmp(signalName.c_str(), PAGE_LOAD_FINISHED_SIGNAL))
{
- webView.PageLoadErrorSignal().Connect( tracker, functor );
+ 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;
}
Vector3 WebView::GetNaturalSize()
{
- if( mVisual )
+ if(mVisual)
{
Vector2 rendererNaturalSize;
- mVisual.GetNaturalSize( rendererNaturalSize );
- return Vector3( rendererNaturalSize );
+ mVisual.GetNaturalSize(rendererNaturalSize);
+ return Vector3(rendererNaturalSize);
}
- return Vector3( mWebViewSize );
+ return Vector3(mWebViewSize);
}
-void WebView::OnRelayout( const Vector2& size, RelayoutContainer& container )
+void WebView::OnSceneConnection(int depth)
{
- Control::OnRelayout( size, container );
+ Control::OnSceneConnection(depth);
- if( size.width > 0 && size.height > 0 && mWebViewSize != size )
- {
- mWebViewSize = size;
-
- if( mWebEngine )
- {
- mWebEngine.SetSize( size.width, size.height );
- }
- }
+ EnableBlendMode(!mVideoHoleEnabled);
}
-void WebView::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
+void WebView::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
{
- Toolkit::WebView webView = Toolkit::WebView::DownCast( Dali::BaseHandle( object ) );
+ Toolkit::WebView webView = Toolkit::WebView::DownCast(Dali::BaseHandle(object));
- if( webView )
+ if(webView)
{
- WebView& impl = GetImpl( webView );
- switch( index )
+ WebView& impl = GetImpl(webView);
+ switch(index)
{
case Toolkit::WebView::Property::URL:
{
std::string url;
- if( value.Get( url ) )
+ if(value.Get(url))
{
- impl.LoadUrl( url );
+ impl.LoadUrl(url);
}
break;
}
- case Toolkit::WebView::Property::CACHE_MODEL:
+ case Toolkit::WebView::Property::USER_AGENT:
{
- Toolkit::WebView::CacheModel::Type output = impl.GetCacheModel();
- GET_ENUM_VALUE( CacheModel, value, output );
- impl.SetCacheModel( output );
+ std::string input;
+ if(value.Get(input))
+ {
+ impl.SetUserAgent(input);
+ }
break;
}
- case Toolkit::WebView::Property::COOKIE_ACCEPT_POLICY:
+ case Toolkit::WebView::Property::SCROLL_POSITION:
{
- Toolkit::WebView::CookieAcceptPolicy::Type output = impl.GetCookieAcceptPolicy();
- GET_ENUM_VALUE( CookieAcceptPolicy, value, output );
- impl.SetCookieAcceptPolicy( output );
+ Vector2 input;
+ if(value.Get(input))
+ {
+ impl.SetScrollPosition(input.x, input.y);
+ }
break;
}
- case Toolkit::WebView::Property::USER_AGENT:
+ case Toolkit::WebView::Property::VIDEO_HOLE_ENABLED:
{
- std::string input;
- if( value.Get( input ) )
+ bool input;
+ if(value.Get(input))
{
- impl.SetUserAgent( input );
+ impl.EnableVideoHole(input);
}
break;
}
- case Toolkit::WebView::Property::ENABLE_JAVASCRIPT:
+ case Toolkit::WebView::Property::MOUSE_EVENTS_ENABLED:
{
bool input;
- if( value.Get( input ) )
+ if(value.Get(input))
{
- impl.EnableJavaScript( input );
+ impl.EnableMouseEvents(input);
}
break;
}
- case Toolkit::WebView::Property::LOAD_IMAGES_AUTOMATICALLY:
+ case Toolkit::WebView::Property::KEY_EVENTS_ENABLED:
{
bool input;
- if( value.Get( input ) )
+ if(value.Get(input))
{
- impl.LoadImagesAutomatically( input );
+ impl.EnableKeyEvents(input);
}
break;
}
- case Toolkit::WebView::Property::DEFAULT_TEXT_ENCODING_NAME:
+ case Toolkit::WebView::Property::DOCUMENT_BACKGROUND_COLOR:
{
- std::string input;
- if( value.Get( input ) )
+ Vector4 input;
+ if(value.Get(input))
{
- impl.SetDefaultTextEncodingName( input );
+ impl.SetDocumentBackgroundColor(input);
}
break;
}
- case Toolkit::WebView::Property::DEFAULT_FONT_SIZE:
+ case Toolkit::WebView::Property::TILES_CLEARED_WHEN_HIDDEN:
{
- int input;
- if( value.Get( input ) )
+ bool input;
+ if(value.Get(input))
{
- impl.SetDefaultFontSize( input );
+ impl.ClearTilesWhenHidden(input);
+ }
+ break;
+ }
+ case Toolkit::WebView::Property::TILE_COVER_AREA_MULTIPLIER:
+ {
+ float input;
+ if(value.Get(input))
+ {
+ impl.SetTileCoverAreaMultiplier(input);
+ }
+ break;
+ }
+ case Toolkit::WebView::Property::CURSOR_ENABLED_BY_CLIENT:
+ {
+ bool input;
+ if(value.Get(input))
+ {
+ impl.EnableCursorByClient(input);
}
break;
}
}
}
-Property::Value WebView::GetProperty( BaseObject* object, Property::Index propertyIndex )
+Property::Value WebView::GetProperty(BaseObject* object, Property::Index propertyIndex)
{
Property::Value value;
- Toolkit::WebView webView = Toolkit::WebView::DownCast( Dali::BaseHandle( object ) );
+ Toolkit::WebView webView = Toolkit::WebView::DownCast(Dali::BaseHandle(object));
- if( webView )
+ if(webView)
{
- WebView& impl = GetImpl( webView );
- switch( propertyIndex )
+ WebView& impl = GetImpl(webView);
+ switch(propertyIndex)
{
case Toolkit::WebView::Property::URL:
{
value = impl.mUrl;
break;
}
- case Toolkit::WebView::Property::CACHE_MODEL:
+ case Toolkit::WebView::Property::USER_AGENT:
{
- value = GET_ENUM_STRING( CacheModel, impl.GetCacheModel() );
+ value = impl.GetUserAgent();
break;
}
- case Toolkit::WebView::Property::COOKIE_ACCEPT_POLICY:
+ case Toolkit::WebView::Property::SCROLL_POSITION:
{
- value = GET_ENUM_STRING( CookieAcceptPolicy, impl.GetCookieAcceptPolicy() );
+ value = impl.GetScrollPosition();
break;
}
- case Toolkit::WebView::Property::USER_AGENT:
+ case Toolkit::WebView::Property::SCROLL_SIZE:
{
- value = impl.GetUserAgent();
+ value = impl.GetScrollSize();
+ break;
+ }
+ case Toolkit::WebView::Property::CONTENT_SIZE:
+ {
+ value = impl.GetContentSize();
break;
}
- case Toolkit::WebView::Property::ENABLE_JAVASCRIPT:
+ case Toolkit::WebView::Property::TITLE:
{
- value = impl.IsJavaScriptEnabled();
+ value = impl.GetTitle();
break;
}
- case Toolkit::WebView::Property::LOAD_IMAGES_AUTOMATICALLY:
+ case Toolkit::WebView::Property::VIDEO_HOLE_ENABLED:
{
- value = impl.AreImagesAutomaticallyLoaded();
+ value = impl.mVideoHoleEnabled;
break;
}
- case Toolkit::WebView::Property::DEFAULT_TEXT_ENCODING_NAME:
+ case Toolkit::WebView::Property::MOUSE_EVENTS_ENABLED:
{
- value = impl.GetDefaultTextEncodingName();
+ value = impl.mMouseEventsEnabled;
break;
}
- case Toolkit::WebView::Property::DEFAULT_FONT_SIZE:
+ case Toolkit::WebView::Property::KEY_EVENTS_ENABLED:
{
- value = impl.GetDefaultFontSize();
+ value = impl.mKeyEventsEnabled;
+ break;
+ }
+ case Toolkit::WebView::Property::SELECTED_TEXT:
+ {
+ value = impl.GetSelectedText();
break;
}
default:
- break;
+ break;
}
}
return value;
}
-bool WebView::OnTouchEvent( Actor actor, const Dali::TouchData& touch )
+bool WebView::OnTouchEvent(Actor actor, const Dali::TouchEvent& touch)
{
bool result = false;
- if( mWebEngine )
+ if(mWebEngine)
{
- result = mWebEngine.SendTouchEvent( touch );
+ result = mWebEngine.SendTouchEvent(touch);
}
return result;
}
-bool WebView::OnKeyEvent( const Dali::KeyEvent& event )
+bool WebView::OnKeyEvent(const Dali::KeyEvent& event)
{
bool result = false;
- if( mWebEngine )
+ if(mWebEngine)
{
- result = mWebEngine.SendKeyEvent( event );
+ result = mWebEngine.SendKeyEvent(event);
}
return result;
}
-Toolkit::WebView::CacheModel::Type WebView::GetCacheModel() const
+bool WebView::OnHoverEvent(Actor actor, const Dali::HoverEvent& hover)
{
- return mWebEngine ? static_cast< Toolkit::WebView::CacheModel::Type >( mWebEngine.GetCacheModel() ) : Toolkit::WebView::CacheModel::DOCUMENT_VIEWER;
+ 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::SetCacheModel( Toolkit::WebView::CacheModel::Type cacheModel )
+void WebView::OnKeyInputFocusGained()
{
- if( mWebEngine )
+ if(mWebEngine)
{
- mWebEngine.SetCacheModel( static_cast< WebEnginePlugin::CacheModel >( cacheModel ) );
+ mWebEngine.SetFocus(true);
}
+
+ EmitKeyInputFocusSignal(true); // Calls back into the Control hence done last.
}
-Toolkit::WebView::CookieAcceptPolicy::Type WebView::GetCookieAcceptPolicy() const
+void WebView::OnKeyInputFocusLost()
{
- return mWebEngine ? static_cast< Toolkit::WebView::CookieAcceptPolicy::Type >( mWebEngine.GetCookieAcceptPolicy() ) : Toolkit::WebView::CookieAcceptPolicy::NO_THIRD_PARTY;
+ if(mWebEngine)
+ {
+ mWebEngine.SetFocus(false);
+ }
+
+ EmitKeyInputFocusSignal(false); // Calls back into the Control hence done last.
}
-void WebView::SetCookieAcceptPolicy( Toolkit::WebView::CookieAcceptPolicy::Type policy )
+void WebView::SetScrollPosition(int x, int y)
{
- if( mWebEngine )
+ if(mWebEngine)
{
- mWebEngine.SetCookieAcceptPolicy( static_cast< WebEnginePlugin::CookieAcceptPolicy >( policy ) );
+ mWebEngine.SetScrollPosition(x, y);
}
}
-const std::string& WebView::GetUserAgent() const
+Dali::Vector2 WebView::GetScrollPosition() const
{
- return mWebEngine ? mWebEngine.GetUserAgent() : kEmptyString;
+ return mWebEngine ? mWebEngine.GetScrollPosition() : Dali::Vector2::ZERO;
}
-void WebView::SetUserAgent( const std::string& userAgent )
+Dali::Vector2 WebView::GetScrollSize() const
{
- if( mWebEngine )
- {
- mWebEngine.SetUserAgent( userAgent );
- }
+ return mWebEngine ? mWebEngine.GetScrollSize() : Dali::Vector2::ZERO;
}
-bool WebView::IsJavaScriptEnabled() const
+Dali::Vector2 WebView::GetContentSize() const
{
- return mWebEngine ? mWebEngine.IsJavaScriptEnabled() : true;
+ return mWebEngine ? mWebEngine.GetContentSize() : Dali::Vector2::ZERO;
}
-void WebView::EnableJavaScript( bool enabled )
+std::string WebView::GetTitle() const
{
- if( mWebEngine )
+ return mWebEngine ? mWebEngine.GetTitle() : kEmptyString;
+}
+
+void WebView::SetDocumentBackgroundColor(Dali::Vector4 color)
+{
+ if(mWebEngine)
{
- mWebEngine.EnableJavaScript( enabled );
+ mWebEngine.SetDocumentBackgroundColor(color);
}
}
-bool WebView::AreImagesAutomaticallyLoaded() const
+void WebView::ClearTilesWhenHidden(bool cleared)
{
- return mWebEngine ? mWebEngine.AreImagesAutomaticallyLoaded() : true;
+ if(mWebEngine)
+ {
+ mWebEngine.ClearTilesWhenHidden(cleared);
+ }
}
-void WebView::LoadImagesAutomatically( bool automatic )
+void WebView::SetTileCoverAreaMultiplier(float multiplier)
{
- if( mWebEngine )
+ if(mWebEngine)
{
- mWebEngine.LoadImagesAutomatically( automatic );
+ mWebEngine.SetTileCoverAreaMultiplier(multiplier);
}
}
-const std::string& WebView::GetDefaultTextEncodingName() const
+void WebView::EnableCursorByClient(bool enabled)
{
- return mWebEngine ? mWebEngine.GetDefaultTextEncodingName() : kEmptyString;
+ if(mWebEngine)
+ {
+ mWebEngine.EnableCursorByClient(enabled);
+ }
}
-void WebView::SetDefaultTextEncodingName( const std::string& defaultTextEncodingName )
+std::string WebView::GetSelectedText() const
+{
+ return mWebEngine ? mWebEngine.GetSelectedText() : kEmptyString;
+}
+
+const std::string& WebView::GetUserAgent() const
{
- if( mWebEngine )
+ return mWebEngine ? mWebEngine.GetUserAgent() : kEmptyString;
+}
+
+void WebView::SetUserAgent(const std::string& userAgent)
+{
+ if(mWebEngine)
{
- mWebEngine.SetDefaultTextEncodingName( defaultTextEncodingName );
+ mWebEngine.SetUserAgent(userAgent);
}
}
-int WebView::GetDefaultFontSize() const
+void WebView::EnableMouseEvents(bool enabled)
{
- return mWebEngine ? mWebEngine.GetDefaultFontSize() : 0;
+ if(mWebEngine)
+ {
+ mMouseEventsEnabled = enabled;
+ mWebEngine.EnableMouseEvents(enabled);
+ }
}
-void WebView::SetDefaultFontSize( int defaultFontSize )
+void WebView::EnableKeyEvents(bool enabled)
{
- if( mWebEngine )
+ if(mWebEngine)
{
- mWebEngine.SetDefaultFontSize( defaultFontSize );
+ mKeyEventsEnabled = enabled;
+ mWebEngine.EnableKeyEvents(enabled);
}
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff