From: Piotr Kosko/Native/Web API (PLT) /SRPOL/Engineer/Samsung Electronics <p.kosko@samsung.com>
Date: Mon, 9 Dec 2019 13:11:21 +0000 (+0100)
Subject: Merge branch 'tizen_5.0' into tizen_5.5
X-Git-Tag: submit/tizen/20191211.130748~5^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ed67d4b6abdf80e87c3958338bbda5c4615cfb9;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_5.0' into tizen_5.5

Change-Id: I140956e31d498f825947f58cb0c6990cb40c279f
---

4ed67d4b6abdf80e87c3958338bbda5c4615cfb9
diff --cc packaging/webapi-plugins.spec
index 6ea6edb5,89f1fae7..fa1ca582
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -6,11 -6,9 +6,11 @@@
  %define crosswalk_extensions tizen-extensions-crosswalk
  
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 +%define tizen_ut_build 0
 +
  
  Name:       webapi-plugins
- Version:    2.57
 -Version:    2.45
++Version:    2.58
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries
diff --cc src/messageport/messageport_instance.h
index 05b693db,f51a0c63..67838472
--- a/src/messageport/messageport_instance.h
+++ b/src/messageport/messageport_instance.h
@@@ -32,15 -32,17 +32,17 @@@ class MessageportInstance : public comm
    virtual ~MessageportInstance();
  
   private:
 -  void MessagePortManagerRequestlocalmessageport(const picojson::value& args,
 +  void MessagePortManagerRequestLocalMessagePort(const picojson::value& args,
                                                   picojson::object& out);
 -  void MessagePortManagerRequesttrustedlocalmessageport(const picojson::value& args,
 +  void MessagePortManagerRequestTrustedLocalMessagePort(const picojson::value& args,
                                                          picojson::object& out);
 -  void MessagePortManagerRequestremotemessageport(const picojson::value& args,
 +  void MessagePortManagerRequestRemoteMessagePort(const picojson::value& args,
                                                    picojson::object& out);
 -  void MessagePortManagerRequesttrustedremotemessageport(const picojson::value& args,
 +  void MessagePortManagerRequestTrustedRemoteMessagePort(const picojson::value& args,
                                                           picojson::object& out);
 -  void RemoteMessagePortSendmessage(const picojson::value& args, picojson::object& out);
 +  void RemoteMessagePortSendMessage(const picojson::value& args, picojson::object& out);
+   std::vector<int> local_ports;
+   std::vector<int> local_trusted_ports;
  };
  
  }  // namespace messageport