third_party/mojo/src/mojo/edk/system/message_pipe.cc - Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/edk/system/message_pipe.cc

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Keep permission service alive if embedder drops requests Created 5 years, 9 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 | « third_party/mojo/src/mojo/edk/system/message_in_transit.cc ('k') | third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/edk/system/message_pipe.cc

diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe.cc b/third_party/mojo/src/mojo/edk/system/message_pipe.cc

index 554401e875bd2ab8103ae07931406abe6b823928..796ac642c7b1788dc26ddf2885381e7810847976 100644

--- a/third_party/mojo/src/mojo/edk/system/message_pipe.cc

+++ b/third_party/mojo/src/mojo/edk/system/message_pipe.cc

@@ -152,8 +152,8 @@ MojoResult MessagePipe::WriteMessage(

return EnqueueMessageNoLock(

GetPeerPort(port),

make_scoped_ptr(new MessageInTransit(

- MessageInTransit::kTypeEndpoint,

- MessageInTransit::kSubtypeEndpointData, num_bytes, bytes)),

+ MessageInTransit::kTypeEndpointClient,

+ MessageInTransit::kSubtypeEndpointClientData, num_bytes, bytes)),

transports);

}

@@ -318,7 +318,7 @@ MojoResult MessagePipe::EnqueueMessageNoLock(

DCHECK(port == 0 || port == 1);

DCHECK(message);

- DCHECK_EQ(message->type(), MessageInTransit::kTypeEndpoint);

+ DCHECK_EQ(message->type(), MessageInTransit::kTypeEndpointClient);

DCHECK(endpoints_[GetPeerPort(port)]);

// The destination port need not be open, unlike the source port.