| Index: mojo/system/data_pipe.h
|
| diff --git a/mojo/system/data_pipe.h b/mojo/system/data_pipe.h
|
| index 20a7b5ad58f506dbee386f0bf74b63d91a162684..2cab507e4625906e6d6de785a8ae9d10eecb27aa 100644
|
| --- a/mojo/system/data_pipe.h
|
| +++ b/mojo/system/data_pipe.h
|
| @@ -13,8 +13,8 @@
|
| #include "base/synchronization/lock.h"
|
| #include "mojo/public/c/system/data_pipe.h"
|
| #include "mojo/public/c/system/types.h"
|
| +#include "mojo/system/handle_signals_state.h"
|
| #include "mojo/system/system_impl_export.h"
|
| -#include "mojo/system/wait_flags_state.h"
|
|
|
| namespace mojo {
|
| namespace system {
|
| @@ -108,7 +108,7 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipe :
|
| virtual MojoResult ProducerEndWriteDataImplNoLock(
|
| uint32_t num_bytes_written) = 0;
|
| // Note: A producer should not be writable during a two-phase write.
|
| - virtual WaitFlagsState ProducerGetWaitFlagsStateNoLock() const = 0;
|
| + virtual HandleSignalsState ProducerGetHandleSignalsStateNoLock() const = 0;
|
|
|
| virtual void ConsumerCloseImplNoLock() = 0;
|
| // |*num_bytes| will be a nonzero multiple of |element_num_bytes_|.
|
| @@ -124,7 +124,7 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipe :
|
| bool all_or_none) = 0;
|
| virtual MojoResult ConsumerEndReadDataImplNoLock(uint32_t num_bytes_read) = 0;
|
| // Note: A consumer should not be writable during a two-phase read.
|
| - virtual WaitFlagsState ConsumerGetWaitFlagsStateNoLock() const = 0;
|
| + virtual HandleSignalsState ConsumerGetHandleSignalsStateNoLock() const = 0;
|
|
|
| // Thread-safe and fast (they don't take the lock):
|
| bool may_discard() const { return may_discard_; }
|
| @@ -168,9 +168,9 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipe :
|
|
|
| private:
|
| void AwakeProducerWaitersForStateChangeNoLock(
|
| - const WaitFlagsState& new_producer_state);
|
| + const HandleSignalsState& new_producer_state);
|
| void AwakeConsumerWaitersForStateChangeNoLock(
|
| - const WaitFlagsState& new_consumer_state);
|
| + const HandleSignalsState& new_consumer_state);
|
|
|
| bool has_local_producer_no_lock() const {
|
| lock_.AssertAcquired();
|
|
|