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

mojo/public/cpp/bindings/lib/map_internal.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_INTERNAL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_
 
 #include <map>
 
 #include "mojo/public/cpp/bindings/array.h"
@@ skipping 22 matching lines @@
   typedef const Value& ValueConstRefType;
   typedef ValueConstRefType ValueForwardType;
 
   static inline void InitializeFrom(
       std::map<KeyStorageType, ValueStorageType>* m,
       mojo::Array<Key> keys,
       mojo::Array<Value> values) {
     for (size_t i = 0; i < keys.size(); ++i)
       Insert(m, keys[i], values[i]);
   }
-  static inline void Decompose(std::map<KeyStorageType, ValueStorageType>* m,
-                               mojo::Array<Key>* keys,
-                               mojo::Array<Value>* values) {
-    keys->resize(m->size());
-    values->resize(m->size());
-    int i = 0;
-    for (typename std::map<KeyStorageType, ValueStorageType>::iterator
-             it = m->begin();
-         it != m->end();
-         ++it, ++i) {
-      (*keys)[i] = it->first;
-      (*values)[i] = it->second;
-    }
-  }
   static inline void Finalize(std::map<KeyStorageType, ValueStorageType>* m) {}
   static inline ValueRefType at(std::map<KeyStorageType, ValueStorageType>* m,
                                 KeyForwardType key) {
     // We don't have C++11 library support yet, so we have to emulate the crash
     // on a non-existent key.
     auto it = m->find(key);
     MOJO_CHECK(it != m->end());
     return it->second;
   }
   static inline ValueConstRefType at(
@@ skipping 59 matching lines @@
   typedef const Value& ValueConstRefType;
   typedef Value ValueForwardType;
 
   static inline void InitializeFrom(
       std::map<KeyStorageType, ValueStorageType>* m,
       mojo::Array<Key> keys,
       mojo::Array<Value> values) {
     for (size_t i = 0; i < keys.size(); ++i)
       Insert(m, keys[i], values[i]);
   }
-  static inline void Decompose(std::map<KeyStorageType, ValueStorageType>* m,
-                               mojo::Array<Key>* keys,
-                               mojo::Array<Value>* values) {
-    keys->resize(m->size());
-    values->resize(m->size());
-    int i = 0;
-    for (typename std::map<KeyStorageType, ValueStorageType>::iterator
-             it = m->begin();
-         it != m->end();
-         ++it, ++i) {
-      (*keys)[i] = it->first;
-      (*values)[i] = GetValue(it).Pass();
-    }
-  }
   static inline void Finalize(std::map<KeyStorageType, ValueStorageType>* m) {
     for (auto& pair : *m)
       reinterpret_cast<Value*>(pair.second.buf)->~Value();
   }
   static inline ValueRefType at(std::map<KeyStorageType, ValueStorageType>* m,
                                 KeyForwardType key) {
     // We don't have C++11 library support yet, so we have to emulate the crash
     // on a non-existent key.
     auto it = m->find(key);
     MOJO_CHECK(it != m->end());
@@ skipping 51 matching lines @@
     dst->clear();
     for (auto it = src.begin(); it != src.end(); ++it)
       new ((*dst)[it->first].buf) Value(GetValue(it).Clone());
   }
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_INTERNAL_H_