| Index: mojo/edk/system/dispatcher.h
|
| diff --git a/mojo/edk/system/dispatcher.h b/mojo/edk/system/dispatcher.h
|
| index 5d92ab62c7f15408295084465773657956561e0f..fad468fe9db21a839e929eecdad655f1655b6d88 100644
|
| --- a/mojo/edk/system/dispatcher.h
|
| +++ b/mojo/edk/system/dispatcher.h
|
| @@ -97,6 +97,7 @@ class Dispatcher : public util::RefCountedThreadSafe<Dispatcher> {
|
| DispatcherVector* dispatchers,
|
| uint32_t* num_dispatchers,
|
| MojoReadMessageFlags flags);
|
| +
|
| MojoResult WriteData(UserPointer<const void> elements,
|
| UserPointer<uint32_t> elements_num_bytes,
|
| MojoWriteDataFlags flags);
|
| @@ -104,6 +105,11 @@ class Dispatcher : public util::RefCountedThreadSafe<Dispatcher> {
|
| UserPointer<uint32_t> buffer_num_bytes,
|
| MojoWriteDataFlags flags);
|
| MojoResult EndWriteData(uint32_t num_bytes_written);
|
| + MojoResult SetDataPipeConsumerOptions(
|
| + UserPointer<const MojoDataPipeConsumerOptions> options);
|
| + MojoResult GetDataPipeConsumerOptions(
|
| + UserPointer<MojoDataPipeConsumerOptions> options,
|
| + uint32_t options_num_bytes);
|
| MojoResult ReadData(UserPointer<void> elements,
|
| UserPointer<uint32_t> num_bytes,
|
| MojoReadDataFlags flags);
|
| @@ -111,6 +117,7 @@ class Dispatcher : public util::RefCountedThreadSafe<Dispatcher> {
|
| UserPointer<uint32_t> buffer_num_bytes,
|
| MojoReadDataFlags flags);
|
| MojoResult EndReadData(uint32_t num_bytes_read);
|
| +
|
| // |options| may be null. |new_dispatcher| must not be null, but
|
| // |*new_dispatcher| should be null (and will contain the dispatcher for the
|
| // new handle on success).
|
| @@ -258,6 +265,12 @@ class Dispatcher : public util::RefCountedThreadSafe<Dispatcher> {
|
| UserPointer<uint32_t> num_bytes,
|
| MojoReadDataFlags flags)
|
| MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
|
| + virtual MojoResult SetDataPipeConsumerOptionsImplNoLock(
|
| + UserPointer<const MojoDataPipeConsumerOptions> options)
|
| + MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
|
| + virtual MojoResult GetDataPipeConsumerOptionsImplNoLock(
|
| + UserPointer<MojoDataPipeConsumerOptions> options,
|
| + uint32_t options_num_bytes) MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
|
| virtual MojoResult BeginReadDataImplNoLock(
|
| UserPointer<const void*> buffer,
|
| UserPointer<uint32_t> buffer_num_bytes,
|
|
|