| Index: mojo/system/dispatcher.h
|
| diff --git a/mojo/system/dispatcher.h b/mojo/system/dispatcher.h
|
| index 051e2bc2e9b307df737b87a6180b9d7b63250818..ad0fe55f5c8dfd87bc0495ef27561da327d4c248 100644
|
| --- a/mojo/system/dispatcher.h
|
| +++ b/mojo/system/dispatcher.h
|
| @@ -20,6 +20,7 @@
|
| #include "mojo/public/c/system/data_pipe.h"
|
| #include "mojo/public/c/system/message_pipe.h"
|
| #include "mojo/public/c/system/types.h"
|
| +#include "mojo/system/memory.h"
|
| #include "mojo/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
| @@ -94,8 +95,8 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher :
|
| MojoResult WriteData(const void* elements,
|
| uint32_t* elements_num_bytes,
|
| MojoWriteDataFlags flags);
|
| - MojoResult BeginWriteData(void** buffer,
|
| - uint32_t* buffer_num_bytes,
|
| + MojoResult BeginWriteData(UserPointer<void*> buffer,
|
| + UserPointer<uint32_t> buffer_num_bytes,
|
| MojoWriteDataFlags flags);
|
| MojoResult EndWriteData(uint32_t num_bytes_written);
|
| MojoResult ReadData(void* elements,
|
| @@ -224,9 +225,10 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher :
|
| virtual MojoResult WriteDataImplNoLock(const void* elements,
|
| uint32_t* num_bytes,
|
| MojoWriteDataFlags flags);
|
| - virtual MojoResult BeginWriteDataImplNoLock(void** buffer,
|
| - uint32_t* buffer_num_bytes,
|
| - MojoWriteDataFlags flags);
|
| + virtual MojoResult BeginWriteDataImplNoLock(
|
| + UserPointer<void*> buffer,
|
| + UserPointer<uint32_t> buffer_num_bytes,
|
| + MojoWriteDataFlags flags);
|
| virtual MojoResult EndWriteDataImplNoLock(uint32_t num_bytes_written);
|
| virtual MojoResult ReadDataImplNoLock(void* elements,
|
| uint32_t* num_bytes,
|
|
|