| Index: mojo/system/dispatcher.h
|
| diff --git a/mojo/system/dispatcher.h b/mojo/system/dispatcher.h
|
| index 2679ac2fdeaad5b4224d30abea22a62c8bdba3bf..051e2bc2e9b307df737b87a6180b9d7b63250818 100644
|
| --- a/mojo/system/dispatcher.h
|
| +++ b/mojo/system/dispatcher.h
|
| @@ -117,17 +117,19 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher :
|
| scoped_ptr<RawSharedBufferMapping>* mapping);
|
|
|
| // Adds a waiter to this dispatcher. The waiter will be woken up when this
|
| - // object changes state to satisfy |flags| with context |context|. It will
|
| + // object changes state to satisfy |signals| with context |context|. It will
|
| // also be woken up when it becomes impossible for the object to ever satisfy
|
| - // |flags| with a suitable error status.
|
| + // |signals| with a suitable error status.
|
| //
|
| // Returns:
|
| // - |MOJO_RESULT_OK| if the waiter was added;
|
| - // - |MOJO_RESULT_ALREADY_EXISTS| if |flags| is already satisfied;
|
| + // - |MOJO_RESULT_ALREADY_EXISTS| if |signals| is already satisfied;
|
| // - |MOJO_RESULT_INVALID_ARGUMENT| if the dispatcher has been closed; and
|
| // - |MOJO_RESULT_FAILED_PRECONDITION| if it is not (or no longer) possible
|
| - // that |flags| will ever be satisfied.
|
| - MojoResult AddWaiter(Waiter* waiter, MojoWaitFlags flags, uint32_t context);
|
| + // that |signals| will ever be satisfied.
|
| + MojoResult AddWaiter(Waiter* waiter,
|
| + MojoHandleSignals signals,
|
| + uint32_t context);
|
| void RemoveWaiter(Waiter* waiter);
|
|
|
| // A dispatcher must be put into a special state in order to be sent across a
|
| @@ -242,7 +244,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher :
|
| MojoMapBufferFlags flags,
|
| scoped_ptr<RawSharedBufferMapping>* mapping);
|
| virtual MojoResult AddWaiterImplNoLock(Waiter* waiter,
|
| - MojoWaitFlags flags,
|
| + MojoHandleSignals signals,
|
| uint32_t context);
|
| virtual void RemoveWaiterImplNoLock(Waiter* waiter);
|
|
|
|
|