Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: mojo/system/local_message_pipe_endpoint.cc

Issue 345463003: Mojo: MojoWaitFlags -> MojoHandleSignals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/system/local_message_pipe_endpoint.h ('k') | mojo/system/message_pipe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/local_message_pipe_endpoint.cc
diff --git a/mojo/system/local_message_pipe_endpoint.cc b/mojo/system/local_message_pipe_endpoint.cc
index 89764c8bc0b89ad297974df8464aca39c2ef35d4..d919854c588bc649fd799d229a87bba147540f2b 100644
--- a/mojo/system/local_message_pipe_endpoint.cc
+++ b/mojo/system/local_message_pipe_endpoint.cc
@@ -128,17 +128,17 @@ MojoResult LocalMessagePipeEndpoint::ReadMessage(void* bytes,
}
MojoResult LocalMessagePipeEndpoint::AddWaiter(Waiter* waiter,
- MojoWaitFlags flags,
+ MojoHandleSignals signals,
uint32_t context) {
DCHECK(is_open_);
WaitFlagsState state = GetWaitFlagsState();
- if (state.satisfies(flags))
+ if (state.satisfies(signals))
return MOJO_RESULT_ALREADY_EXISTS;
- if (!state.can_satisfy(flags))
+ if (!state.can_satisfy(signals))
return MOJO_RESULT_FAILED_PRECONDITION;
- waiter_list_.AddWaiter(waiter, flags, context);
+ waiter_list_.AddWaiter(waiter, signals, context);
return MOJO_RESULT_OK;
}
@@ -150,12 +150,12 @@ void LocalMessagePipeEndpoint::RemoveWaiter(Waiter* waiter) {
WaitFlagsState LocalMessagePipeEndpoint::GetWaitFlagsState() {
WaitFlagsState rv;
if (!message_queue_.IsEmpty()) {
- rv.satisfied_flags |= MOJO_WAIT_FLAG_READABLE;
- rv.satisfiable_flags |= MOJO_WAIT_FLAG_READABLE;
+ rv.satisfied_signals |= MOJO_WAIT_FLAG_READABLE;
+ rv.satisfiable_signals |= MOJO_WAIT_FLAG_READABLE;
}
if (is_peer_open_) {
- rv.satisfied_flags |= MOJO_WAIT_FLAG_WRITABLE;
- rv.satisfiable_flags |= MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE;
+ rv.satisfied_signals |= MOJO_WAIT_FLAG_WRITABLE;
+ rv.satisfiable_signals |= MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE;
}
return rv;
}
« no previous file with comments | « mojo/system/local_message_pipe_endpoint.h ('k') | mojo/system/message_pipe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698