mojo/public/cpp/bindings/lib/map_serialization.h - Issue 1475813002: Mojo C++ bindings: support passing associated interface pointers/requests in method parameter lists…

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/public/cpp/bindings/lib/map_serialization.h

Issue 1475813002: Mojo C++ bindings: support passing associated interface pointers/requests in method parameter lists… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@25_use_multiplex_router

Patch Set: Created 5 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

« no previous file with comments | « mojo/public/cpp/bindings/lib/interface_ptr_state.h ('k') | mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/cpp/bindings/lib/map_serialization.h

diff --git a/mojo/public/cpp/bindings/lib/map_serialization.h b/mojo/public/cpp/bindings/lib/map_serialization.h

index 6014b36bebec07648e295c4091f1ea81211ab0ce..6874fbe5aeda80318f07eca8280157804930823a 100644

--- a/mojo/public/cpp/bindings/lib/map_serialization.h

+++ b/mojo/public/cpp/bindings/lib/map_serialization.h

@@ -163,13 +163,14 @@ template <typename MapKey,

typename DataKey,

typename DataValue>

inline void Deserialize_(internal::Map_Data<DataKey, DataValue>* input,

- Map<MapKey, MapValue>* output) {

+ Map<MapKey, MapValue>* output,

+ internal::SerializationContext* context) {

if (input) {

Array<MapKey> keys;

Array<MapValue> values;

- Deserialize_(input->keys.ptr, &keys);

- Deserialize_(input->values.ptr, &values);

+ Deserialize_(input->keys.ptr, &keys, context);

+ Deserialize_(input->values.ptr, &values, context);

*output = Map<MapKey, MapValue>(keys.Pass(), values.Pass());

} else {

« no previous file with comments | « mojo/public/cpp/bindings/lib/interface_ptr_state.h ('k') | mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc » ('j') | no next file with comments »