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

Unified Diff: ipc/ipc_channel_nacl.h

Issue 2504063002: Revert of Remove IPC::BrokerableAttachment. (Closed)
Patch Set: Created 4 years, 1 month 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/ipc_channel_mojo_unittest.cc ('k') | ipc/ipc_channel_nacl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_channel_nacl.h
diff --git a/ipc/ipc_channel_nacl.h b/ipc/ipc_channel_nacl.h
index 45d64cea559c873ca86eae1de848d22c24a8e687..52ff321b08816e982ab7424eb6a6a81d00c7c481 100644
--- a/ipc/ipc_channel_nacl.h
+++ b/ipc/ipc_channel_nacl.h
@@ -62,7 +62,7 @@
int buffer_len,
int* bytes_read) override;
bool ShouldDispatchInputMessage(Message* msg) override;
- bool GetAttachments(Message* msg) override;
+ bool GetNonBrokeredAttachments(Message* msg) override;
bool DidEmptyInputBuffers() override;
void HandleInternalMessage(const Message& msg) override;
@@ -102,8 +102,11 @@
// 2 above in NaCl eventually.
// When ReadData is called, it pulls the bytes out of this queue in order.
std::deque<linked_ptr<std::vector<char> > > read_queue_;
- // Queue of file descriptor attachments extracted from imc_recvmsg messages.
- std::vector<scoped_refptr<MessageAttachment>> input_attachments_;
+ // Queue of file descriptors extracted from imc_recvmsg messages.
+ // NOTE: The implementation assumes underlying storage here is contiguous, so
+ // don't change to something like std::deque<> without changing the
+ // implementation!
+ std::vector<int> input_fds_;
// This queue is used when a message is sent prior to Connect having been
// called. Normally after we're connected, the queue is empty.
« no previous file with comments | « ipc/ipc_channel_mojo_unittest.cc ('k') | ipc/ipc_channel_nacl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698