* Change C++ serialization/deserialization to not be move-only operations (with the except of |Ha…

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_
 
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
+#include "mojo/public/cpp/bindings/lib/array_serialization.h"
+#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/iterator_util.h"
 #include "mojo/public/cpp/bindings/lib/map_data_internal.h"
 #include "mojo/public/cpp/bindings/lib/map_internal.h"
 #include "mojo/public/cpp/bindings/lib/string_serialization.h"
 #include "mojo/public/cpp/bindings/map.h"
 
 namespace mojo {
 
 template <typename Key, typename Value>
 inline size_t GetSerializedSize_(const Map<Key, Value>& input);
 
 template <typename ValidateParams, typename E, typename F>
 inline void SerializeArray_(
-    Array<E> input,
+    const Array<E>& input,
     internal::Buffer* buf,
     internal::Array_Data<F>** output,
     const internal::ArrayValidateParams* validate_params);
 
 namespace internal {
 
 template <typename MapType,
           typename DataType,
           bool value_is_move_only_type = IsMoveOnlyType<MapType>::value,
           bool is_union =
@@ skipping 31 matching lines @@
     S,
     typename EnableIf<IsPointer<typename WrapperTraits<S>::DataType>::value,
                       typename WrapperTraits<S>::DataType>::type,
     true,
     false> {
   typedef
       typename RemovePointer<typename WrapperTraits<S>::DataType>::type S_Data;
   static size_t GetBaseArraySize(size_t count) {
     return count * sizeof(StructPointer<S_Data>);
   }
-  static size_t GetItemSize(const S& item) { return GetSerializedSize_(item); }
+  static size_t GetItemSize(const S& item) {
+    return GetSerializedSize_(*UnwrapConstStructPtr<S>::value(item));
+  }
 };
 
 template <typename U, typename U_Data>
 struct MapSerializer<U, U_Data, true, true> {
   static size_t GetBaseArraySize(size_t count) {
     return count * sizeof(U_Data);
   }
   static size_t GetItemSize(const U& item) {
     return GetSerializedSize_(item, true);
   }
@@ skipping 44 matching lines @@
 }
 
 // We don't need an ArrayValidateParams instance for key validation since
 // we can deduce it from the Key type. (which can only be primitive types or
 // non-nullable strings.)
 template <typename MapKey,
           typename MapValue,
           typename DataKey,
           typename DataValue>
 inline void SerializeMap_(
-    Map<MapKey, MapValue> input,
+    Map<MapKey, MapValue>* input,
     internal::Buffer* buf,
     internal::Map_Data<DataKey, DataValue>** output,
     const internal::ArrayValidateParams* value_validate_params) {
-  if (input) {
+  if (input && *input) {
     internal::Map_Data<DataKey, DataValue>* result =
         internal::Map_Data<DataKey, DataValue>::New(buf);
-    if (result) {
-      Array<MapKey> keys;
-      Array<MapValue> values;
-      input.DecomposeMapTo(&keys, &values);
+    internal::Array_Data<DataKey>* keys_data =
+        internal::Array_Data<DataKey>::New(input->size(), buf);
+
+    if (result && keys_data) {
+      result->keys.ptr = keys_data;
+
+      // We *must* serialize the keys before we allocate an Array_Data for the
+      // values.
+      internal::MapKeyIterator<MapKey, MapValue> key_iter(input);
       const internal::ArrayValidateParams* key_validate_params =
           internal::MapKeyValidateParamsFactory<DataKey>::Get();
-      SerializeArray_(keys.Pass(), buf, &result->keys.ptr, key_validate_params);
-      SerializeArray_(values.Pass(), buf, &result->values.ptr,
-                      value_validate_params);
+
+      internal::ArraySerializer<MapKey, DataKey>::
+          template SerializeElementsWithIterator<
+              typename internal::MapKeyIterator<MapKey, MapValue>::Iterator>(
+              key_iter.begin(), input->size(), buf, result->keys.ptr,
+              key_validate_params);
+
+      // Now we try allocate an Array_Data for the values
+      internal::Array_Data<DataValue>* values_data =
+          internal::Array_Data<DataValue>::New(input->size(), buf);
+      if (values_data) {
+        result->values.ptr = values_data;
+        internal::MapValueIterator<MapKey, MapValue> value_iter(input);
+        internal::ArraySerializer<MapValue, DataValue>::
+            template SerializeElementsWithIterator<
+                typename internal::MapValueIterator<MapKey,
+                                                    MapValue>::Iterator>(
+                value_iter.begin(), input->size(), buf, result->values.ptr,
+                value_validate_params);
+      }
     }
     *output = result;
   } else {
     *output = nullptr;
   }
 }
 
 template <typename MapKey,
           typename MapValue,
           typename DataKey,
           typename DataValue>
 inline void Deserialize_(internal::Map_Data<DataKey, DataValue>* input,
                          Map<MapKey, MapValue>* output) {
   if (input) {
     Array<MapKey> keys;
     Array<MapValue> values;
 
     Deserialize_(input->keys.ptr, &keys);
     Deserialize_(input->values.ptr, &values);
 
     *output = Map<MapKey, MapValue>(keys.Pass(), values.Pass());
   } else {
     output->reset();
   }
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_