Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / mojo / system / message_pipe.h

diff --git a/src/mojo/system/message_pipe.h b/src/mojo/system/message_pipe.h
index 0849a66..da7bf2e 100644 (file)
--- a/src/mojo/system/message_pipe.h
+++ b/src/mojo/system/message_pipe.h
@@ -12,6 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "mojo/public/system/core.h"
+#include "mojo/system/dispatcher.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/system_impl_export.h"
 
@@ -19,7 +20,6 @@ namespace mojo {
 namespace system {
 
 class Channel;
-class Dispatcher;
 class MessagePipeEndpoint;
 class Waiter;
 
@@ -47,13 +47,15 @@ class MOJO_SYSTEM_IMPL_EXPORT MessagePipe :
   // Unlike |MessagePipeDispatcher::WriteMessage()|, this does not validate its
   // arguments.
   MojoResult WriteMessage(unsigned port,
-                          const void* bytes, uint32_t num_bytes,
-                          const std::vector<Dispatcher*>* dispatchers,
+                          const void* bytes,
+                          uint32_t num_bytes,
+                          std::vector<DispatcherTransport>* transports,
                           MojoWriteMessageFlags flags);
   // Unlike |MessagePipeDispatcher::ReadMessage()|, this does not validate its
   // arguments.
   MojoResult ReadMessage(unsigned port,
-                         void* bytes, uint32_t* num_bytes,
+                         void* bytes,
+                         uint32_t* num_bytes,
                          std::vector<scoped_refptr<Dispatcher> >* dispatchers,
                          uint32_t* num_dispatchers,
                          MojoReadMessageFlags flags);
@@ -66,10 +68,10 @@ class MOJO_SYSTEM_IMPL_EXPORT MessagePipe :
   // This is used internally by |WriteMessage()| and by |Channel| to enqueue
   // messages (typically to a |LocalMessagePipeEndpoint|). Unlike
   // |WriteMessage()|, |port| is the *destination* port. Takes ownership of
-  // |message|.
+  // |message|. |dispatchers| should be non-null only if it's nonempty.
   MojoResult EnqueueMessage(unsigned port,
                             MessageInTransit* message,
-                            const std::vector<Dispatcher*>* dispatchers);
+                            std::vector<DispatcherTransport>* transports);
 
   // These are used by |Channel|.
   void Attach(unsigned port,