third_party/mojo/src/mojo/edk/system/dispatcher.cc - Issue 975973002: Update mojo sdk to rev f68e697e389943cd9bf9652397312280e96b127a

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

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

Patch Set: shake fist at msvc Created 5 years, 10 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/data_pipe_unittest.cc ('k') | third_party/mojo/src/mojo/edk/system/incoming_endpoint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e2f2b8784f4684c9d1c074e1a7aae65e8c6ccd66..e8695e8eff1a71f567253986a74fb707cb714768 100644

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

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

@@ -6,6 +6,8 @@

#include "base/logging.h"

#include "mojo/edk/system/configuration.h"

+#include "mojo/edk/system/data_pipe_consumer_dispatcher.h"

+#include "mojo/edk/system/data_pipe_producer_dispatcher.h"

#include "mojo/edk/system/message_pipe_dispatcher.h"

#include "mojo/edk/system/platform_handle_dispatcher.h"

#include "mojo/edk/system/shared_buffer_dispatcher.h"

@@ -77,11 +79,11 @@ scoped_refptr<Dispatcher> Dispatcher::TransportDataAccess::Deserialize(

return scoped_refptr<Dispatcher>(

MessagePipeDispatcher::Deserialize(channel, source, size));

case kTypeDataPipeProducer:

+ return scoped_refptr<Dispatcher>(

+ DataPipeProducerDispatcher::Deserialize(channel, source, size));

case kTypeDataPipeConsumer:

- // TODO(vtl): Implement.

- LOG(WARNING) << "Deserialization of dispatcher type " << type

- << " not supported";

- return nullptr;

+ return scoped_refptr<Dispatcher>(

+ DataPipeConsumerDispatcher::Deserialize(channel, source, size));

case kTypeSharedBuffer:

return scoped_refptr<Dispatcher>(SharedBufferDispatcher::Deserialize(

channel, source, size, platform_handles));