[M40 Merge][Tizen 3.0][EWK API] Change argument of ewk_send_widget_info

Change argument's name and type: int => const char*

bug : http://107.108.218.239/bugzilla/show_bug.cgi?id=12806
Reviewed by: DONGJUN KiM, Hyunhak Kim, Jaesik Chang, Piotr Tworek, arno renevier

Change-Id: I270b86107c2a7e12f063a610119224851b027f8c
Signed-off-by: yh106.jung <yh106.jung@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
index 8e1b7ee..0acb26b 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
+++ b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h
@@ -131,7 +131,7 @@ IPC_ENUM_TRAITS(blink::WebViewMode)
 
 
 IPC_MESSAGE_CONTROL4(WrtMsg_SetWidgetInfo,
-                     int,            // result: widgetHandle
+                     std::string,            // result: tizen_id
                      double,         // result: scale
                      std::string,    // result: theme
                      std::string)    // result: encodedBundle

diff --git a/tizen_src/ewk/efl_integration/eweb_context.cc b/tizen_src/ewk/efl_integration/eweb_context.cc
index d659bc1..ba59819 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_context.cc
+++ b/tizen_src/ewk/efl_integration/eweb_context.cc
@@ -191,8 +191,8 @@ bool EwkMimeOverrideCallback::TriggerCallback(const std::string& url_spec,
   return result;
 }
 
-void EWebContext::SendWidgetInfo(int widget_id, double scale, const string &theme, const string &encoded_bundle) {
-  WrtWidgetHost::Get()->SetWidgetInfo(widget_id, scale, theme, encoded_bundle);
+void EWebContext::SendWidgetInfo(const std::string& tizen_id, double scale, const string &theme, const string &encoded_bundle) {
+  WrtWidgetHost::Get()->SetWidgetInfo(tizen_id, scale, theme, encoded_bundle);
 }
 
 void EWebContext::SendWrtMessage(const Ewk_Wrt_Message_Data& data) {

diff --git a/tizen_src/ewk/efl_integration/eweb_context.h b/tizen_src/ewk/efl_integration/eweb_context.h
index 46e27f0..088f95c 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_context.h
+++ b/tizen_src/ewk/efl_integration/eweb_context.h
@@ -91,7 +91,7 @@ class EWebContext {
   bool SetFaviconDatabasePath(const char *path);
   Evas_Object *AddFaviconObject(const char *uri, Evas *canvas) const;
 
-  void SendWidgetInfo(int widget_id, double scale, const std::string &theme, const std::string &encoded_bundle);
+  void SendWidgetInfo(const std::string& tizen_id, double scale, const std::string &theme, const std::string &encoded_bundle);
   void SendWrtMessage(const Ewk_Wrt_Message_Data& message);
 
   void SetMimeOverrideCallback(Ewk_Context_Override_Mime_For_Url_Callback callback,

diff --git a/tizen_src/ewk/efl_integration/private/ewk_context_private.cc b/tizen_src/ewk/efl_integration/private/ewk_context_private.cc
index 185ec9b..89e3e44 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_context_private.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_context_private.cc
@@ -237,8 +237,9 @@ Evas_Object * Ewk_Context::AddFaviconObject(const char *uri, Evas *canvas) const
   return impl->AddFaviconObject(uri, canvas);
 }
 
-void Ewk_Context::SendWidgetInfo(int widget_id, double scale, const std::string &theme, const std::string &encoded_bundle) {
-  impl->SendWidgetInfo(widget_id, scale, theme, encoded_bundle);
+void Ewk_Context::SendWidgetInfo(const std::string& tizen_id, double scale, const std::string &theme,
+                                 const std::string &encoded_bundle) {
+  impl->SendWidgetInfo(tizen_id, scale, theme, encoded_bundle);
 }
 
 int Ewk_Context::Pixmap() const {

diff --git a/tizen_src/ewk/efl_integration/private/ewk_context_private.h b/tizen_src/ewk/efl_integration/private/ewk_context_private.h
index 51f9ef1..6ee6f38 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_context_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_context_private.h
@@ -102,8 +102,8 @@ struct Ewk_Context : public base::RefCounted<Ewk_Context> {
   Evas_Object *AddFaviconObject(const char *uri, Evas *canvas) const;
 
   // Widget
-  void SendWidgetInfo(int widget_id, double scale, const std::string &theme,
-      const std::string &encoded_bundle);
+  void SendWidgetInfo(const std::string& tizen_id, double scale, const std::string &theme,
+                      const std::string &encoded_bundle);
   //void SendWrtMessage(const Ewk_IPC_Wrt_Message_Data& message);
 
   // Pixmap

diff --git a/tizen_src/ewk/efl_integration/public/ewk_context.cc b/tizen_src/ewk/efl_integration/public/ewk_context.cc
index 5658340..3c1e703 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_context.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_context.cc
@@ -518,7 +518,7 @@ Eina_Bool ewk_context_inspector_server_stop(Ewk_Context* ewkContext)
 }
 
 void ewk_send_widget_info(Ewk_Context *context,
-                          int widget_handle,
+                          const char* tizen_id,
                           double scale,
                           const char *theme,
                           const char *encodedBundle)
@@ -526,7 +526,7 @@ void ewk_send_widget_info(Ewk_Context *context,
   EINA_SAFETY_ON_NULL_RETURN(theme);
   EINA_SAFETY_ON_NULL_RETURN(encodedBundle);
   EINA_SAFETY_ON_NULL_RETURN(context);
-  context->SendWidgetInfo(widget_handle, scale, theme, encodedBundle);
+  context->SendWidgetInfo(tizen_id, scale, theme, encodedBundle);
 }
 
 #if defined(OS_TIZEN_TV)

diff --git a/tizen_src/ewk/efl_integration/public/ewk_context.h b/tizen_src/ewk/efl_integration/public/ewk_context.h
index 5c194a6..6a08bca 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_context.h
+++ b/tizen_src/ewk/efl_integration/public/ewk_context.h
@@ -885,7 +885,7 @@ EAPI Eina_Bool ewk_context_inspector_server_stop(Ewk_Context* context);
  */
 EAPI int ewk_context_pixmap_get(Ewk_Context *context);
 
-EAPI void ewk_send_widget_info(Ewk_Context *context, int widget_handle, double scale, const char *theme, const char *encodedBundle);
+EAPI void ewk_send_widget_info(Ewk_Context *context, const char* tizen_id, double scale, const char *theme, const char *encodedBundle);
 
 /**
  * Gets the application cache manager instance for this @a context.

diff --git a/tizen_src/ewk/efl_integration/wrt/dynamicplugin.cc b/tizen_src/ewk/efl_integration/wrt/dynamicplugin.cc
index 10b7c34..03047f8 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/dynamicplugin.cc
+++ b/tizen_src/ewk/efl_integration/wrt/dynamicplugin.cc
@@ -58,7 +58,7 @@ DynamicPlugin::DynamicPlugin()
   m_databaseAttach(1);
 }
 
-void DynamicPlugin::startSession(int widgetHandle,
+void DynamicPlugin::startSession(const char* tizen_id,
                                  v8::Handle<v8::Context> context,
                                  int routingHandle,
                                  double scaleFactor,
@@ -67,19 +67,21 @@ void DynamicPlugin::startSession(int widgetHandle,
                                  const char* baseURL) {
   if (!m_startSession || !m_databaseAttach)
     return;
-  m_startSession(widgetHandle, context, routingHandle, scaleFactor, encodedBundle, theme, baseURL);
+  m_startSession(tizen_id, context, routingHandle,
+                 scaleFactor, encodedBundle,
+                 theme, baseURL);
 }
 
-void DynamicPlugin::parseURL(std::string* old_url, std::string* new_url, int widget_id) {
+void DynamicPlugin::parseURL(std::string* old_url, std::string* new_url, const char* tizen_id) {
   if (!m_parseURL || !m_databaseAttach)
     return;
-  m_parseURL(old_url, new_url, widget_id);
+  m_parseURL(old_url, new_url, tizen_id);
 }
 
-void DynamicPlugin::setWidgetInfo(int widgetHandle) {
+void DynamicPlugin::setWidgetInfo(const std::string& tizen_id) {
   if (!m_setWidgetInfo)
     return;
-  m_setWidgetInfo(widgetHandle);
+  m_setWidgetInfo(tizen_id.c_str());
 }
 
 DynamicPlugin::~DynamicPlugin() {

diff --git a/tizen_src/ewk/efl_integration/wrt/dynamicplugin.h b/tizen_src/ewk/efl_integration/wrt/dynamicplugin.h
index d3687f2..29c9203 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/dynamicplugin.h
+++ b/tizen_src/ewk/efl_integration/wrt/dynamicplugin.h
@@ -11,7 +11,7 @@
 
 class Ewk_Wrt_Message_Data;
 
-typedef void (*startSessionFun)(int widgetHandle ,
+typedef void (*startSessionFun)(const char* tizen_id,
                                 v8::Handle<v8::Context> context,
                                 int routingHandle,
                                 double scaleFactor,
@@ -22,13 +22,13 @@ typedef void (*onIPCMessageFun)(
     const Ewk_Wrt_Message_Data& data);
 typedef void (*parseUrlFun)(std::string* old_url,
                             std::string* new_url,
-                            int widget_id);
-typedef void (*setWidgetInfoFun)(int widgetHandle);
+                            const char* tizen_id);
+typedef void (*setWidgetInfoFun)(const char* tizen_id);
 typedef void (*databaseAttachFun)(int databaseAttach);
 
 class DynamicPlugin {
  public:
-  void startSession(int widgetHandle,
+  void startSession(const char* tizen_id,
                     v8::Handle<v8::Context> context,
                     int routingHandle,
                     double scaleFactor,
@@ -36,8 +36,8 @@ class DynamicPlugin {
                     const char* theme,
                     const char* baseURL);
 
-  void parseURL(std::string* old_url, std::string* new_url, int widget_id);
-  void setWidgetInfo(int widgetHandle);
+  void parseURL(std::string* old_url, std::string* new_url, const char* tizen_id);
+  void setWidgetInfo(const std::string& tizen_id);
   void messageReceived(const Ewk_Wrt_Message_Data& data);
 
   ~DynamicPlugin();

diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc
index 512dbab..4d18fd4 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc
+++ b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc
@@ -47,8 +47,9 @@ class WrtURLRequestJob : public net::URLRequestFileJob {
       // dagerous as it expects to be loaded in the render process.
       std::string old_url = request()->url().possibly_invalid_spec();
       std::string s_new_url;
+      std::string tizen_id = WrtWidgetHost::Get()->TizenId();
       DynamicPlugin::instance().parseURL(
-          &old_url, &s_new_url, WrtWidgetHost::Get()->WidgetId());
+          &old_url, &s_new_url, tizen_id.c_str());
       OnUrlRetrieved(GURL(s_new_url));
     } else {
       URLRequestFileJob::Start();

diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
index 72b54a5..2e3ba1f 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
+++ b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc
@@ -73,8 +73,7 @@ WrtWidgetHost* WrtWidgetHost::Get() {
 
 WrtWidgetHost::WrtWidgetHost()
     : message_filter_(new WrtWidgetHostMessageFilter(this)),
-      in_wrt_(false),
-      widget_id_(0) {
+      in_wrt_(false) {
 }
 
 void WrtWidgetHost::GetUrlForRequest(
@@ -96,18 +95,18 @@ void WrtWidgetHost::GetUrlForRequest(
   callback.Run(GURL());
 }
 
-void WrtWidgetHost::SetWidgetInfo(int widget_id,
+void WrtWidgetHost::SetWidgetInfo(const std::string& tizen_id,
                                   double scale,
                                   const std::string& theme,
                                   const std::string& encoded_bundle) {
   // TODO shouldn't it be confirmed by WRT that this is really a launch
   // of the widget identified by widget_id?
   if (SendToAllRenderers(
-          new WrtMsg_SetWidgetInfo(widget_id, scale, theme, encoded_bundle))) {
+          new WrtMsg_SetWidgetInfo(tizen_id, scale, theme, encoded_bundle))) {
     // TODO(z.kostrzewa) This should be determined (somehow) on application
     // startup. Can it be done via Application Framework/Package Manager?
     in_wrt_ = true;
-    widget_id_ = widget_id;
+    tizen_id_ = tizen_id;
   }
 }
 
@@ -120,8 +119,8 @@ bool WrtWidgetHost::InWrt() const {
   return in_wrt_;
 }
 
-int WrtWidgetHost::WidgetId() const {
-  return widget_id_;
+const std::string& WrtWidgetHost::TizenId() const {
+  return tizen_id_;
 }
 
 void WrtWidgetHost::OnUrlRetrieved(int callback_id, const GURL& url) {

diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h
index 68f5809..b0b8477 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h
+++ b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h
@@ -28,14 +28,14 @@ class WrtWidgetHost {
   void GetUrlForRequest(net::URLRequest* request,
                         base::Callback<void(const GURL&)> callback);
 
-  void SetWidgetInfo(int widget_id, double scale, const std::string& theme,
+  void SetWidgetInfo(const std::string& tizen_id, double scale, const std::string& theme,
                      const std::string& encoded_bundle);
 
   void SendWrtMessage(const Ewk_Wrt_Message_Data& message);
 
   bool InWrt() const;
 
-  int WidgetId() const;
+  const std::string& TizenId() const;
 
  private:
   friend class WrtWidgetHostMessageFilter;
@@ -50,7 +50,7 @@ class WrtWidgetHost {
   base::AtomicSequenceNumber callback_id_generator_;
   callbacks_type callbacks_;
   bool in_wrt_;
-  int widget_id_;
+  std::string tizen_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WrtWidgetHost);
 };

diff --git a/tizen_src/ewk/efl_integration/wrt/wrtwidget.cc b/tizen_src/ewk/efl_integration/wrt/wrtwidget.cc
index 51f5150..c138439 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/wrtwidget.cc
+++ b/tizen_src/ewk/efl_integration/wrt/wrtwidget.cc
@@ -49,8 +49,7 @@ class WrtRenderThreadObserver : public content::RenderProcessObserver {
 };
 
 WrtWidget::WrtWidget()
-    : widgetHandle_(-1),
-      observer_(new WrtRenderThreadObserver(this)) {
+    : observer_(new WrtRenderThreadObserver(this)) {
 }
 
 WrtWidget::~WrtWidget() {
@@ -61,26 +60,26 @@ content::RenderProcessObserver* WrtWidget::GetObserver() {
   return observer_;
 }
 
-void WrtWidget::SetWidgetInfo(int widgetHandle,
+void WrtWidget::SetWidgetInfo(const std::string& tizen_id,
                               double scaleFactor,
                               const std::string& theme,
                               const std::string& encodedBundle) {
-  widgetHandle_ = widgetHandle;
+  tizen_id_ = tizen_id;
   scale_ = scaleFactor;
   theme_ = theme;
   encodedBundle_ = encodedBundle;
-  DynamicPlugin::instance().setWidgetInfo(widgetHandle_);
+  DynamicPlugin::instance().setWidgetInfo(tizen_id_);
 }
 
 bool WrtWidget::IsWidgetInfoSet() const {
-  return widgetHandle_ != -1;
+  return !tizen_id_.empty();
 }
 
 void WrtWidget::ParseUrl(const GURL& url, GURL& new_url) {
-  if (widgetHandle_ != -1) {
+  if (!tizen_id_.empty()) {
     std::string old_url = url.possibly_invalid_spec();
     std::string s_new_url;
-    DynamicPlugin::instance().parseURL(&old_url, &s_new_url, widgetHandle_);
+    DynamicPlugin::instance().parseURL(&old_url, &s_new_url, tizen_id_.c_str());
     if (s_new_url.empty())
       new_url = url;
     else
@@ -93,8 +92,8 @@ void WrtWidget::ParseUrl(const GURL& url, GURL& new_url) {
 void WrtWidget::StartSession(v8::Handle<v8::Context> context,
                              int routingHandle,
                              const std::string& baseURL) {
-  if (widgetHandle_ != -1 && !context.IsEmpty()) {
-    DynamicPlugin::instance().startSession(widgetHandle_,
+  if (!tizen_id_.empty() && !context.IsEmpty()) {
+    DynamicPlugin::instance().startSession(tizen_id_.c_str(),
                                            context,
                                            routingHandle,
                                            scale_,
@@ -109,6 +108,6 @@ void WrtWidget::StopSession(v8::Handle<v8::Context> context) {
 }
 
 void WrtWidget::MessageReceived(const Ewk_Wrt_Message_Data& data) {
-  if (widgetHandle_ != -1)
+  if (!tizen_id_.empty())
     DynamicPlugin::instance().messageReceived(data);
 }

diff --git a/tizen_src/ewk/efl_integration/wrt/wrtwidget.h b/tizen_src/ewk/efl_integration/wrt/wrtwidget.h
index 3e18c1a..e64abbd 100644 (file)
--- a/tizen_src/ewk/efl_integration/wrt/wrtwidget.h
+++ b/tizen_src/ewk/efl_integration/wrt/wrtwidget.h
@@ -23,7 +23,7 @@ class WrtWidget {
 
   content::RenderProcessObserver* GetObserver();
 
-  void SetWidgetInfo(int widgetHandle,
+  void SetWidgetInfo(const std::string& tizen_id,
                      double scaleFactor,
                      const std::string& theme,
                      const std::string& encodedBundle);
@@ -41,10 +41,10 @@ class WrtWidget {
   void StopSession(v8::Handle<v8::Context>);
 
  private:
-  int widgetHandle_;
   double scale_;
-  std::string theme_;
   std::string encodedBundle_;
+  std::string theme_;
+  std::string tizen_id_;
   WrtRenderThreadObserver* observer_;
 };