mojo/edk/system/message_pipe_dispatcher.cc - Issue 1526563004: Fix shutdown assert with the new Mojo EDK.

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: mojo/edk/system/message_pipe_dispatcher.cc

Issue 1526563004: Fix shutdown assert with the new Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add comment Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: mojo/edk/system/message_pipe_dispatcher.cc

diff --git a/mojo/edk/system/message_pipe_dispatcher.cc b/mojo/edk/system/message_pipe_dispatcher.cc

index b4938fe797feba1e3b008262521dd05648370948..beb182428957c84d07ca0fe9f31d77eaff952c53 100644

--- a/mojo/edk/system/message_pipe_dispatcher.cc

+++ b/mojo/edk/system/message_pipe_dispatcher.cc

@@ -618,7 +618,7 @@ MojoResult MessagePipeDispatcher::ReadMessageImplNoLock(

uint32_t* num_dispatchers,

MojoReadMessageFlags flags) {

lock().AssertAcquired();

- if (channel_) {

+ if (transferable_ && channel_) {

channel_->EnsureLazyInitialized();

} else if (!transferable_) {

if (non_transferable_state_ == WAITING_FOR_READ_OR_WRITE) {

@@ -718,7 +718,7 @@ MojoResult MessagePipeDispatcher::AddAwakableImplNoLock(

uintptr_t context,

HandleSignalsState* signals_state) {

lock().AssertAcquired();

- if (channel_) {

+ if (transferable_ && channel_) {

channel_->EnsureLazyInitialized();

} else if (!transferable_ &&

non_transferable_state_ == WAITING_FOR_READ_OR_WRITE) {

« no previous file with comments | « no previous file | mojo/edk/system/routed_raw_channel.cc » ('j') | no next file with comments »