summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunchan Cho <yunchan.cho@samsung.com>2013-03-27 23:40:04 +0900
committerYunchan Cho <yunchan.cho@samsung.com>2013-03-29 23:32:10 +0900
commitf1a7a1150d662546cb9078ee623f821dccf6dbab (patch)
treef9b1c2e5f76126c1279d7930f3986486bede101f
parentda735acf34550c03dae2d28ecc9bdd94e3286398 (diff)
downloadweb-provider-f1a7a1150d662546cb9078ee623f821dccf6dbab.tar.gz
web-provider-f1a7a1150d662546cb9078ee623f821dccf6dbab.tar.bz2
web-provider-f1a7a1150d662546cb9078ee623f821dccf6dbab.zip
[Release] livebox.web-provider-1.5
Change-Id: I12f78b9a2e7721a0cd3fc6f54f6de8de763d3c15
-rw-r--r--packaging/livebox.web-provider.spec2
-rw-r--r--src/Core/Buffer/IRenderBuffer.h4
-rw-r--r--src/Core/Buffer/RenderBuffer.h5
-rw-r--r--src/Core/IBox.h3
-rw-r--r--src/Core/Service/PeriodChanger.h4
-rw-r--r--src/Core/View/IPdHelper.h4
-rw-r--r--src/Core/View/IRenderView.h4
-rw-r--r--src/Core/View/PdHelper.h3
-rw-r--r--src/Core/View/WebView.h4
-rw-r--r--src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp4
-rw-r--r--src/Plugin/IBoxPluginFactory.h6
11 files changed, 15 insertions, 28 deletions
diff --git a/packaging/livebox.web-provider.spec b/packaging/livebox.web-provider.spec
index 55ce494..b062a2e 100644
--- a/packaging/livebox.web-provider.spec
+++ b/packaging/livebox.web-provider.spec
@@ -1,6 +1,6 @@
Name: livebox.web-provider
Summary: web framework for livebox
-Version: 1.4
+Version: 1.5
Release: 1
Group: main/app
License: Apache License, Version 2.0
diff --git a/src/Core/Buffer/IRenderBuffer.h b/src/Core/Buffer/IRenderBuffer.h
index 6b70271..5c03df2 100644
--- a/src/Core/Buffer/IRenderBuffer.h
+++ b/src/Core/Buffer/IRenderBuffer.h
@@ -21,11 +21,9 @@
#define I_RENDER_BUFFER_H
#include <memory>
+#include <Evas.h>
#include <Util/Noncopyable.h>
-struct _Evas_Object;
-typedef _Evas_Object Evas_Object;
-
class IRenderBuffer: Noncopyable {
public:
virtual bool allocate() = 0;
diff --git a/src/Core/Buffer/RenderBuffer.h b/src/Core/Buffer/RenderBuffer.h
index 61e8bd4..8c8d8d7 100644
--- a/src/Core/Buffer/RenderBuffer.h
+++ b/src/Core/Buffer/RenderBuffer.h
@@ -21,14 +21,11 @@
#define RENDER_BUFFER_H
#include <memory>
+#include <Evas.h>
#include "IRenderBuffer.h"
// forward declaration
-struct _Evas_Object;
-struct _Evas;
struct livebox_buffer;
-typedef _Evas_Object Evas_Object;
-typedef _Evas Evas;
// type definition
typedef struct livebox_buffer* BufferInfoPtr;
diff --git a/src/Core/IBox.h b/src/Core/IBox.h
index 2746181..826cad0 100644
--- a/src/Core/IBox.h
+++ b/src/Core/IBox.h
@@ -20,8 +20,7 @@
#ifndef I_BOX_H
#define I_BOX_H
-struct _Ewk_Context;
-typedef _Ewk_Context Ewk_Context;
+#include <ewk_context.h>
class IBox {
public:
diff --git a/src/Core/Service/PeriodChanger.h b/src/Core/Service/PeriodChanger.h
index 21cdd71..0d49f07 100644
--- a/src/Core/Service/PeriodChanger.h
+++ b/src/Core/Service/PeriodChanger.h
@@ -22,9 +22,7 @@
#include <string>
#include <memory>
-
-struct _Evas_Object;
-typedef _Evas_Object Evas_Object;
+#include <Evas.h>
namespace Service {
class PeriodChanger;
diff --git a/src/Core/View/IPdHelper.h b/src/Core/View/IPdHelper.h
index 047d397..5e90bdf 100644
--- a/src/Core/View/IPdHelper.h
+++ b/src/Core/View/IPdHelper.h
@@ -20,9 +20,7 @@
#ifndef I_PD_HELPER_H
#define I_PD_HELPER_H
-// forward declaration
-struct _Evas_Object;
-typedef _Evas_Object Evas_Object;
+#include <Evas.h>
class IPdHelper {
public:
diff --git a/src/Core/View/IRenderView.h b/src/Core/View/IRenderView.h
index 49f614b..0ad7c34 100644
--- a/src/Core/View/IRenderView.h
+++ b/src/Core/View/IRenderView.h
@@ -22,9 +22,7 @@
#include <string>
#include <memory>
-
-struct _Evas_Object;
-typedef _Evas_Object Evas_Object;
+#include <Evas.h>
struct RenderInfo {
int width;
diff --git a/src/Core/View/PdHelper.h b/src/Core/View/PdHelper.h
index 938d7c9..0ee987d 100644
--- a/src/Core/View/PdHelper.h
+++ b/src/Core/View/PdHelper.h
@@ -20,11 +20,10 @@
*/
#include <string>
+#include <Evas.h>
#include "IRenderView.h"
#include "IPdHelper.h"
-struct _Evas_Object;
-typedef _Evas_Object Evas_Object;
#define EXPORT_CLASS __attribute__ ((visibility("default"))
class EXPORT_CLASS PdHelper: public IPdHelper {
diff --git a/src/Core/View/WebView.h b/src/Core/View/WebView.h
index ca7c220..4beb8e2 100644
--- a/src/Core/View/WebView.h
+++ b/src/Core/View/WebView.h
@@ -24,11 +24,9 @@
#include <map>
#include <Eina.h>
#include <Evas.h>
+#include <ewk_context.h>
#include "IWebView.h"
-struct _Ewk_Context;
-typedef _Ewk_Context Ewk_Context;
-
#define EXPORT_CLASS __attribute__ ((visibility("default"))
class EXPORT_CLASS WebView: public IWebView {
diff --git a/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp b/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
index be75a58..186fbb8 100644
--- a/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
+++ b/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
@@ -365,11 +365,15 @@ void AppBoxRenderView::createWindowAfterCallback(Evas_Object* parent, Evas_Objec
Evas* childCanvas = evas_object_evas_get(child);
if (parentCanvas != childCanvas) {
+ // wrt-core change visibility value to false internally
+ // So plugin should reset this value to true for painting parent webview
+ ewk_view_visibility_set(parent, EINA_TRUE);
evas_object_show(parent);
m_pdHelper->finishOpen(child);
}
}
+ ewk_view_visibility_set(child, EINA_TRUE);
evas_object_show(child);
}
diff --git a/src/Plugin/IBoxPluginFactory.h b/src/Plugin/IBoxPluginFactory.h
index 5751702..458bafb 100644
--- a/src/Plugin/IBoxPluginFactory.h
+++ b/src/Plugin/IBoxPluginFactory.h
@@ -22,14 +22,12 @@
#include <string>
#include <memory>
+#include <Evas.h>
+#include <ewk_context.h>
// forward declaration
class IRenderView;
class IRenderBuffer;
-struct _Ewk_Context;
-struct _Evas_Object;
-typedef _Ewk_Context Ewk_Context;
-typedef _Evas_Object Evas_Object;
class IBoxPluginFactory {
public: