mojo/edk/system/data_pipe_consumer_dispatcher.cc - Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a

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/data_pipe_consumer_dispatcher.cc

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

Patch Set: android + ios gyp fixes Created 6 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

Index: mojo/edk/system/data_pipe_consumer_dispatcher.cc

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

index fa103c3afb6fc7aa9479f14b7d5ed11e969dc1cf..3c14f35c1ac6e1882fc86da52dbf20d60edf084e 100644

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

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

@@ -77,9 +77,7 @@ MojoResult DataPipeConsumerDispatcher::ReadDataImplNoLock(

}

return data_pipe_->ConsumerReadData(

- elements,

- num_bytes,

- !!(flags & MOJO_READ_DATA_FLAG_ALL_OR_NONE),

+ elements, num_bytes, !!(flags & MOJO_READ_DATA_FLAG_ALL_OR_NONE),

!!(flags & MOJO_READ_DATA_FLAG_PEEK));

}

@@ -91,8 +89,7 @@ MojoResult DataPipeConsumerDispatcher::BeginReadDataImplNoLock(

// These flags may not be used in two-phase mode.

if ((flags & MOJO_READ_DATA_FLAG_DISCARD) ||

- (flags & MOJO_READ_DATA_FLAG_QUERY) ||

- (flags & MOJO_READ_DATA_FLAG_PEEK))

+ (flags & MOJO_READ_DATA_FLAG_QUERY) || (flags & MOJO_READ_DATA_FLAG_PEEK))

return MOJO_RESULT_INVALID_ARGUMENT;

return data_pipe_->ConsumerBeginReadData(

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