Merge branch 'tizen_5.0' into tizen_5.5

Change-Id: I140956e31d498f825947f58cb0c6990cb40c279f

diff --cc packaging/webapi-plugins.spec
index 6ea6edb59f0bdc5cb34bec166cc7dd35bb75ae77,89f1fae74a6669916edbc1847cadb44cdcc446a8..fa1ca582e18465ea334e729c9f06493dadc6de7f
--- 1/packaging/webapi-plugins.spec
--- 2/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_api.js
Simple merge

diff --cc src/messageport/messageport_instance.cc
Simple merge

diff --cc src/messageport/messageport_instance.h
index 05b693db48eb673000700b0f1a8efb05b55ca0a0,f51a0c63caa586ff200a84b5f80155296dc36416..678384720aa2fddb61770a0f19695247d960943c
--- 1/src/messageport/messageport_instance.h
--- 2/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