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

Unified Diff: mojo/system/local_data_pipe.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/entrypoints.cc ('k') | mojo/system/local_message_pipe_endpoint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/local_data_pipe.cc
diff --git a/mojo/system/local_data_pipe.cc b/mojo/system/local_data_pipe.cc
index d98ccf42ac468ea1636f254b7070d643e169fcc8..05eacf525cb7b30f2d5eaac0560cc3a44aae2705 100644
--- a/mojo/system/local_data_pipe.cc
+++ b/mojo/system/local_data_pipe.cc
@@ -156,8 +156,8 @@ WaitFlagsState LocalDataPipe::ProducerGetWaitFlagsStateNoLock() const {
if (consumer_open_no_lock()) {
if ((may_discard() || current_num_bytes_ < capacity_num_bytes()) &&
!producer_in_two_phase_write_no_lock())
- rv.satisfied_flags |= MOJO_WAIT_FLAG_WRITABLE;
- rv.satisfiable_flags |= MOJO_WAIT_FLAG_WRITABLE;
+ rv.satisfied_signals |= MOJO_WAIT_FLAG_WRITABLE;
+ rv.satisfiable_signals |= MOJO_WAIT_FLAG_WRITABLE;
}
return rv;
}
@@ -277,10 +277,10 @@ WaitFlagsState LocalDataPipe::ConsumerGetWaitFlagsStateNoLock() const {
WaitFlagsState rv;
if (current_num_bytes_ > 0) {
if (!consumer_in_two_phase_read_no_lock())
- 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;
} else if (producer_open_no_lock()) {
- rv.satisfiable_flags |= MOJO_WAIT_FLAG_READABLE;
+ rv.satisfiable_signals |= MOJO_WAIT_FLAG_READABLE;
}
return rv;
}
« no previous file with comments | « mojo/system/entrypoints.cc ('k') | mojo/system/local_message_pipe_endpoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698