projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes Icc3e3c9f,I2e268700,I89760410,Ibcf4f854 into devel/master
[platform/core/uifw/dali-adaptor.git]
/
dali
/
devel-api
/
adaptor-framework
/
web-engine.cpp
diff --git
a/dali/devel-api/adaptor-framework/web-engine.cpp
b/dali/devel-api/adaptor-framework/web-engine.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
b0bb39b
..
69c2b79
--- a/
dali/devel-api/adaptor-framework/web-engine.cpp
+++ b/
dali/devel-api/adaptor-framework/web-engine.cpp
@@
-23,13
+23,12
@@
namespace Dali
{
namespace Dali
{
-
WebEngine::WebEngine()
{
}
WebEngine::WebEngine()
{
}
-WebEngine::WebEngine(
Internal::Adaptor::WebEngine* internal
)
-: BaseHandle(
internal
)
+WebEngine::WebEngine(
Internal::Adaptor::WebEngine* internal
)
+: BaseHandle(
internal
)
{
}
{
}
@@
-41,222
+40,226
@@
WebEngine WebEngine::New()
{
Internal::Adaptor::WebEnginePtr engine = Internal::Adaptor::WebEngine::New();
{
Internal::Adaptor::WebEnginePtr engine = Internal::Adaptor::WebEngine::New();
- return WebEngine(
engine.Get()
);
+ return WebEngine(
engine.Get()
);
}
}
-WebEngine::WebEngine(
const WebEngine& webEngine
)
-: BaseHandle(
webEngine
)
+WebEngine::WebEngine(
const WebEngine& webEngine
)
+: BaseHandle(
webEngine
)
{
}
{
}
-WebEngine& WebEngine::operator=(
const WebEngine& webEngine
)
+WebEngine& WebEngine::operator=(
const WebEngine& webEngine
)
{
{
- if(
*this != webEngine
)
+ if(
*this != webEngine
)
{
{
- BaseHandle::operator=(
webEngine
);
+ BaseHandle::operator=(
webEngine
);
}
return *this;
}
}
return *this;
}
-WebEngine WebEngine::DownCast(
BaseHandle handle
)
+WebEngine WebEngine::DownCast(
BaseHandle handle
)
{
{
- return WebEngine(
dynamic_cast< Internal::Adaptor::WebEngine* >( handle.GetObjectPtr() )
);
+ return WebEngine(
dynamic_cast<Internal::Adaptor::WebEngine*>(handle.GetObjectPtr())
);
}
}
-void WebEngine::Create(
int width, int height, const std::string& locale, const std::string& timezoneId
)
+void WebEngine::Create(
int width, int height, const std::string& locale, const std::string& timezoneId
)
{
{
- GetImplementation(
*this ).Create( width, height, locale, timezoneId
);
+ GetImplementation(
*this).Create(width, height, locale, timezoneId
);
}
void WebEngine::Destroy()
{
}
void WebEngine::Destroy()
{
- GetImplementation(
*this
).Destroy();
+ GetImplementation(
*this
).Destroy();
}
NativeImageInterfacePtr WebEngine::GetNativeImageSource()
{
}
NativeImageInterfacePtr WebEngine::GetNativeImageSource()
{
- return GetImplementation(
*this
).GetNativeImageSource();
+ return GetImplementation(
*this
).GetNativeImageSource();
}
}
-void WebEngine::LoadUrl(
const std::string& url
)
+void WebEngine::LoadUrl(
const std::string& url
)
{
{
- return GetImplementation(
*this ).LoadUrl( url
);
+ return GetImplementation(
*this).LoadUrl(url
);
}
const std::string& WebEngine::GetUrl()
{
}
const std::string& WebEngine::GetUrl()
{
- return GetImplementation(
*this
).GetUrl();
+ return GetImplementation(
*this
).GetUrl();
}
}
-void WebEngine::LoadHTMLString(
const std::string& htmlString
)
+void WebEngine::LoadHTMLString(
const std::string& htmlString
)
{
{
- GetImplementation(
*this ).LoadHTMLString( htmlString
);
+ GetImplementation(
*this).LoadHTMLString(htmlString
);
}
void WebEngine::Reload()
{
}
void WebEngine::Reload()
{
- GetImplementation(
*this
).Reload();
+ GetImplementation(
*this
).Reload();
}
void WebEngine::StopLoading()
{
}
void WebEngine::StopLoading()
{
- GetImplementation(
*this
).StopLoading();
+ GetImplementation(
*this
).StopLoading();
}
void WebEngine::Suspend()
{
}
void WebEngine::Suspend()
{
- GetImplementation(
*this
).Suspend();
+ GetImplementation(
*this
).Suspend();
}
void WebEngine::Resume()
{
}
void WebEngine::Resume()
{
- GetImplementation(
*this
).Resume();
+ GetImplementation(
*this
).Resume();
}
bool WebEngine::CanGoForward()
{
}
bool WebEngine::CanGoForward()
{
- return GetImplementation(
*this
).CanGoForward();
+ return GetImplementation(
*this
).CanGoForward();
}
void WebEngine::GoForward()
{
}
void WebEngine::GoForward()
{
- GetImplementation(
*this
).GoForward();
+ GetImplementation(
*this
).GoForward();
}
bool WebEngine::CanGoBack()
{
}
bool WebEngine::CanGoBack()
{
- return GetImplementation(
*this
).CanGoBack();
+ return GetImplementation(
*this
).CanGoBack();
}
void WebEngine::GoBack()
{
}
void WebEngine::GoBack()
{
- GetImplementation(
*this
).GoBack();
+ GetImplementation(
*this
).GoBack();
}
}
-void WebEngine::EvaluateJavaScript(
const std::string& script, std::function< void( const std::string& ) > resultHandler
)
+void WebEngine::EvaluateJavaScript(
const std::string& script, std::function<void(const std::string&)> resultHandler
)
{
{
- GetImplementation(
*this ).EvaluateJavaScript( script, resultHandler
);
+ GetImplementation(
*this).EvaluateJavaScript(script, resultHandler
);
}
}
-void WebEngine::AddJavaScriptMessageHandler(
const std::string& exposedObjectName, std::function< void( const std::string& ) > handler
)
+void WebEngine::AddJavaScriptMessageHandler(
const std::string& exposedObjectName, std::function<void(const std::string&)> handler
)
{
{
- GetImplementation(
*this ).AddJavaScriptMessageHandler( exposedObjectName, handler
);
+ GetImplementation(
*this).AddJavaScriptMessageHandler(exposedObjectName, handler
);
}
void WebEngine::ClearHistory()
{
}
void WebEngine::ClearHistory()
{
- return GetImplementation(
*this
).ClearHistory();
+ return GetImplementation(
*this
).ClearHistory();
}
void WebEngine::ClearCache()
{
}
void WebEngine::ClearCache()
{
- return GetImplementation(
*this
).ClearCache();
+ return GetImplementation(
*this
).ClearCache();
}
void WebEngine::ClearCookies()
{
}
void WebEngine::ClearCookies()
{
- return GetImplementation(
*this
).ClearCookies();
+ return GetImplementation(
*this
).ClearCookies();
}
Dali::WebEnginePlugin::CacheModel WebEngine::GetCacheModel() const
{
}
Dali::WebEnginePlugin::CacheModel WebEngine::GetCacheModel() const
{
- return GetImplementation(
*this
).GetCacheModel();
+ return GetImplementation(
*this
).GetCacheModel();
}
}
-void WebEngine::SetCacheModel(
Dali::WebEnginePlugin::CacheModel cacheModel
)
+void WebEngine::SetCacheModel(
Dali::WebEnginePlugin::CacheModel cacheModel
)
{
{
- GetImplementation(
*this ).SetCacheModel( cacheModel
);
+ GetImplementation(
*this).SetCacheModel(cacheModel
);
}
Dali::WebEnginePlugin::CookieAcceptPolicy WebEngine::GetCookieAcceptPolicy() const
{
}
Dali::WebEnginePlugin::CookieAcceptPolicy WebEngine::GetCookieAcceptPolicy() const
{
- return GetImplementation(
*this
).GetCookieAcceptPolicy();
+ return GetImplementation(
*this
).GetCookieAcceptPolicy();
}
}
-void WebEngine::SetCookieAcceptPolicy(
Dali::WebEnginePlugin::CookieAcceptPolicy policy
)
+void WebEngine::SetCookieAcceptPolicy(
Dali::WebEnginePlugin::CookieAcceptPolicy policy
)
{
{
- GetImplementation(
*this ).SetCookieAcceptPolicy( policy
);
+ GetImplementation(
*this).SetCookieAcceptPolicy(policy
);
}
const std::string& WebEngine::GetUserAgent() const
{
}
const std::string& WebEngine::GetUserAgent() const
{
- return GetImplementation(
*this
).GetUserAgent();
+ return GetImplementation(
*this
).GetUserAgent();
}
}
-void WebEngine::SetUserAgent(
const std::string& userAgent
)
+void WebEngine::SetUserAgent(
const std::string& userAgent
)
{
{
- GetImplementation(
*this ).SetUserAgent( userAgent
);
+ GetImplementation(
*this).SetUserAgent(userAgent
);
}
bool WebEngine::IsJavaScriptEnabled() const
{
}
bool WebEngine::IsJavaScriptEnabled() const
{
- return GetImplementation(
*this
).IsJavaScriptEnabled();
+ return GetImplementation(
*this
).IsJavaScriptEnabled();
}
}
-void WebEngine::EnableJavaScript(
bool enabled
)
+void WebEngine::EnableJavaScript(
bool enabled
)
{
{
- GetImplementation(
*this ).EnableJavaScript( enabled
);
+ GetImplementation(
*this).EnableJavaScript(enabled
);
}
bool WebEngine::AreImagesAutomaticallyLoaded() const
{
}
bool WebEngine::AreImagesAutomaticallyLoaded() const
{
- return GetImplementation(
*this
).AreImagesAutomaticallyLoaded();
+ return GetImplementation(
*this
).AreImagesAutomaticallyLoaded();
}
}
-void WebEngine::LoadImagesAutomatically(
bool automatic
)
+void WebEngine::LoadImagesAutomatically(
bool automatic
)
{
{
- GetImplementation(
*this ).LoadImagesAutomatically( automatic
);
+ GetImplementation(
*this).LoadImagesAutomatically(automatic
);
}
const std::string& WebEngine::GetDefaultTextEncodingName() const
{
}
const std::string& WebEngine::GetDefaultTextEncodingName() const
{
- return GetImplementation(
*this
).GetDefaultTextEncodingName();
+ return GetImplementation(
*this
).GetDefaultTextEncodingName();
}
}
-void WebEngine::SetDefaultTextEncodingName(
const std::string& defaultTextEncodingName
)
+void WebEngine::SetDefaultTextEncodingName(
const std::string& defaultTextEncodingName
)
{
{
- GetImplementation(
*this ).SetDefaultTextEncodingName( defaultTextEncodingName
);
+ GetImplementation(
*this).SetDefaultTextEncodingName(defaultTextEncodingName
);
}
int WebEngine::GetDefaultFontSize() const
{
}
int WebEngine::GetDefaultFontSize() const
{
- return GetImplementation(
*this
).GetDefaultFontSize();
+ return GetImplementation(
*this
).GetDefaultFontSize();
}
}
-void WebEngine::SetDefaultFontSize(
int defaultFontSize
)
+void WebEngine::SetDefaultFontSize(
int defaultFontSize
)
{
{
- GetImplementation(
*this ).SetDefaultFontSize( defaultFontSize
);
+ GetImplementation(
*this).SetDefaultFontSize(defaultFontSize
);
}
}
-void WebEngine::SetSize(
int width, int height
)
+void WebEngine::SetSize(
int width, int height
)
{
{
- return GetImplementation(
*this ).SetSize( width, height
);
+ return GetImplementation(
*this).SetSize(width, height
);
}
}
-bool WebEngine::SendTouchEvent(
const TouchEvent& touch
)
+bool WebEngine::SendTouchEvent(
const TouchEvent& touch
)
{
{
- return GetImplementation(
*this ).SendTouchEvent( touch
);
+ return GetImplementation(
*this).SendTouchEvent(touch
);
}
}
-bool WebEngine::SendKeyEvent(
const KeyEvent& event
)
+bool WebEngine::SendKeyEvent(
const KeyEvent& event
)
{
{
- return GetImplementation( *this ).SendKeyEvent( event );
+ return GetImplementation(*this).SendKeyEvent(event);
+}
+
+void WebEngine::SetFocus( bool focused )
+{
+ GetImplementation( *this ).SetFocus( focused );
}
Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadStartedSignal()
{
}
Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadStartedSignal()
{
- return GetImplementation(
*this
).PageLoadStartedSignal();
+ return GetImplementation(
*this
).PageLoadStartedSignal();
}
Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadFinishedSignal()
{
}
Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadFinishedSignal()
{
- return GetImplementation(
*this
).PageLoadFinishedSignal();
+ return GetImplementation(
*this
).PageLoadFinishedSignal();
}
Dali::WebEnginePlugin::WebEnginePageLoadErrorSignalType& WebEngine::PageLoadErrorSignal()
{
}
Dali::WebEnginePlugin::WebEnginePageLoadErrorSignalType& WebEngine::PageLoadErrorSignal()
{
- return GetImplementation(
*this
).PageLoadErrorSignal();
+ return GetImplementation(
*this
).PageLoadErrorSignal();
}
}
-} // namespace Dali;
-
+} // namespace Dali