projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.0.11] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
web-view
/
web-view.cpp
diff --git
a/dali-toolkit/devel-api/controls/web-view/web-view.cpp
b/dali-toolkit/devel-api/controls/web-view/web-view.cpp
index
4c9de03
..
a0672ae
100755
(executable)
--- a/
dali-toolkit/devel-api/controls/web-view/web-view.cpp
+++ b/
dali-toolkit/devel-api/controls/web-view/web-view.cpp
@@
-20,6
+20,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/web-view/web-view-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/web-view/web-view-impl.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
namespace Dali
{
namespace Dali
{
@@
-58,6
+59,11
@@
WebView WebView::New(const std::string& locale, const std::string& timezoneId)
return Internal::WebView::New(locale, timezoneId);
}
return Internal::WebView::New(locale, timezoneId);
}
+WebView WebView::New( int argc, char** argv )
+{
+ return Internal::WebView::New( argc, argv );
+}
+
WebView WebView::DownCast(BaseHandle handle)
{
return Control::DownCast<WebView, Internal::WebView>(handle);
WebView WebView::DownCast(BaseHandle handle)
{
return Control::DownCast<WebView, Internal::WebView>(handle);
@@
-83,6
+89,11
@@
Dali::Toolkit::WebBackForwardList* WebView::GetBackForwardList() const
return Dali::Toolkit::GetImpl( *this ).GetBackForwardList();
}
return Dali::Toolkit::GetImpl( *this ).GetBackForwardList();
}
+Dali::Toolkit::ImageView& WebView::GetFavicon()
+{
+ return Dali::Toolkit::GetImpl( *this ).GetFavicon();
+}
+
void WebView::LoadUrl(const std::string& url)
{
Dali::Toolkit::GetImpl(*this).LoadUrl(url);
void WebView::LoadUrl(const std::string& url)
{
Dali::Toolkit::GetImpl(*this).LoadUrl(url);
@@
-153,6
+164,11
@@
void WebView::AddJavaScriptMessageHandler(const std::string& exposedObjectName,
Dali::Toolkit::GetImpl(*this).AddJavaScriptMessageHandler(exposedObjectName, handler);
}
Dali::Toolkit::GetImpl(*this).AddJavaScriptMessageHandler(exposedObjectName, handler);
}
+void WebView::ClearAllTilesResources()
+{
+ Dali::Toolkit::GetImpl( *this ).ClearAllTilesResources();
+}
+
void WebView::ClearHistory()
{
Dali::Toolkit::GetImpl(*this).ClearHistory();
void WebView::ClearHistory()
{
Dali::Toolkit::GetImpl(*this).ClearHistory();