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

Unified Diff: ipc/mojo/ipc_message_pipe_reader.cc

Issue 835873004: IPC: Generalize FileDescriptorSet to MessageAttachmentSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Landing Created 5 years, 11 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 | « ipc/mojo/ipc_channel_mojo.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/mojo/ipc_message_pipe_reader.cc
diff --git a/ipc/mojo/ipc_message_pipe_reader.cc b/ipc/mojo/ipc_message_pipe_reader.cc
index f5ab1b9de06656a7d13c4435d3241fa57fa7fdff..72e7ad7618f4c31b2587bd554f0f6ff381a73a2d 100644
--- a/ipc/mojo/ipc_message_pipe_reader.cc
+++ b/ipc/mojo/ipc_message_pipe_reader.cc
@@ -46,7 +46,7 @@ bool MessagePipeReader::Send(scoped_ptr<Message> message) {
std::vector<MojoHandle> handles;
MojoResult result = MOJO_RESULT_OK;
#if defined(OS_POSIX) && !defined(OS_NACL)
- result = ChannelMojo::ReadFromFileDescriptorSet(message.get(), &handles);
+ result = ChannelMojo::ReadFromMessageAttachmentSet(message.get(), &handles);
#endif
if (result == MOJO_RESULT_OK) {
result = MojoWriteMessage(handle(),
@@ -74,7 +74,7 @@ void MessagePipeReader::OnMessageReceived() {
TakeHandleBuffer(&handle_buffer);
#if defined(OS_POSIX) && !defined(OS_NACL)
MojoResult write_result =
- ChannelMojo::WriteToFileDescriptorSet(handle_buffer, &message);
+ ChannelMojo::WriteToMessageAttachmentSet(handle_buffer, &message);
if (write_result != MOJO_RESULT_OK) {
CloseWithError(write_result);
return;
« no previous file with comments | « ipc/mojo/ipc_channel_mojo.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698