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

Unified Diff: mojo/public/cpp/bindings/lib/map_serialization.h

Issue 1518293002: [mojo] Add Mojo bindings support for IPC::ParamTraits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pickle4
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/public/cpp/bindings/lib/fixed_buffer.cc ('k') | mojo/public/cpp/bindings/lib/native_serialization.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 6874fbe5aeda80318f07eca8280157804930823a..0a5c8fb178d221003e07d15fbe29e28422dc656c 100644
--- a/mojo/public/cpp/bindings/lib/map_serialization.h
+++ b/mojo/public/cpp/bindings/lib/map_serialization.h
@@ -162,7 +162,7 @@ template <typename MapKey,
typename MapValue,
typename DataKey,
typename DataValue>
-inline void Deserialize_(internal::Map_Data<DataKey, DataValue>* input,
+inline bool Deserialize_(internal::Map_Data<DataKey, DataValue>* input,
Map<MapKey, MapValue>* output,
internal::SerializationContext* context) {
if (input) {
@@ -170,12 +170,14 @@ inline void Deserialize_(internal::Map_Data<DataKey, DataValue>* input,
Array<MapValue> values;
Deserialize_(input->keys.ptr, &keys, context);
- Deserialize_(input->values.ptr, &values, context);
+ if (!Deserialize_(input->values.ptr, &values, context))
+ return false;
*output = Map<MapKey, MapValue>(keys.Pass(), values.Pass());
} else {
output->reset();
}
+ return true;
}
} // namespace mojo
« no previous file with comments | « mojo/public/cpp/bindings/lib/fixed_buffer.cc ('k') | mojo/public/cpp/bindings/lib/native_serialization.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698