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

Unified Diff: third_party/mojo/src/mojo/edk/system/channel.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
Index: third_party/mojo/src/mojo/edk/system/channel.cc
diff --git a/third_party/mojo/src/mojo/edk/system/channel.cc b/third_party/mojo/src/mojo/edk/system/channel.cc
index 71d7208803e3736dd916362c61b1930ddf490533..a7da3bfedcfec8292b626f4b936de21e822b366b 100644
--- a/third_party/mojo/src/mojo/edk/system/channel.cc
+++ b/third_party/mojo/src/mojo/edk/system/channel.cc
@@ -272,6 +272,7 @@ void Channel::OnReadMessage(
DCHECK(creation_thread_checker_.CalledOnValidThread());
switch (message_view.type()) {
+ case MessageInTransit::kTypeEndpointClient:
case MessageInTransit::kTypeEndpoint:
OnReadMessageForEndpoint(message_view, platform_handles.Pass());
break;
@@ -321,7 +322,8 @@ void Channel::OnReadMessageForEndpoint(
const MessageInTransit::View& message_view,
embedder::ScopedPlatformHandleVectorPtr platform_handles) {
DCHECK(creation_thread_checker_.CalledOnValidThread());
- DCHECK(message_view.type() == MessageInTransit::kTypeEndpoint);
+ DCHECK(message_view.type() == MessageInTransit::kTypeEndpointClient ||
+ message_view.type() == MessageInTransit::kTypeEndpoint);
ChannelEndpointId local_id = message_view.destination_id();
if (!local_id.is_valid()) {
« no previous file with comments | « third_party/mojo/src/mojo/edk/system/BUILD.gn ('k') | third_party/mojo/src/mojo/edk/system/channel_endpoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698