Mojo C++ bindings: introduce an optional array to store transferred interface IDs in messages.

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

 // Copyright 2013 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_BINDINGS_INTERNAL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_
 
 #include <stdint.h>
 
 #include <functional>
@@ skipping 106 matching lines @@
   T* Get() {
     return static_cast<T*>(const_cast<void*>(DecodePointer(&offset)));
   }
 
   bool is_null() const { return offset == 0; }
 
   uint64_t offset;
 };
 static_assert(sizeof(Pointer<char>) == 8, "Bad_sizeof(Pointer)");
 
+using GenericPointer = Pointer<void>;
+
 struct Handle_Data {
   Handle_Data() = default;
   explicit Handle_Data(uint32_t value) : value(value) {}
 
   bool is_valid() const { return value != kEncodedInvalidHandleValue; }
 
   uint32_t value;
 };
 static_assert(sizeof(Handle_Data) == 4, "Bad_sizeof(Handle_Data)");
 
 struct Interface_Data {
   Handle_Data handle;
   uint32_t version;
 };
 static_assert(sizeof(Interface_Data) == 8, "Bad_sizeof(Interface_Data)");
 
+struct AssociatedEndpointHandle_Data {
+  AssociatedEndpointHandle_Data() = default;
+  explicit AssociatedEndpointHandle_Data(uint32_t value) : value(value) {}
+
+  bool is_valid() const { return value != kEncodedInvalidHandleValue; }
+
+  uint32_t value;
+};
+static_assert(sizeof(AssociatedEndpointHandle_Data) == 4,
+              "Bad_sizeof(AssociatedEndpointHandle_Data)");
+
 struct AssociatedInterface_Data {
-  InterfaceId interface_id;
+  AssociatedEndpointHandle_Data handle;
   uint32_t version;
 };
 static_assert(sizeof(AssociatedInterface_Data) == 8,
               "Bad_sizeof(AssociatedInterface_Data)");
 
-struct AssociatedInterfaceRequest_Data {
-  InterfaceId interface_id;
-};
-static_assert(sizeof(AssociatedInterfaceRequest_Data) == 4,
-              "Bad_sizeof(AssociatedInterfaceRequest_Data)");
-
 #pragma pack(pop)
 
 template <typename T>
 T FetchAndReset(T* ptr) {
   T temp = *ptr;
   *ptr = T();
   return temp;
 }
 
 template <typename T>
@@ skipping 61 matching lines @@
 struct MojomTypeTraits<AssociatedInterfacePtrInfoDataView<T>, false> {
   using Data = AssociatedInterface_Data;
   using DataAsArrayElement = Data;
 
   static const MojomTypeCategory category =
       MojomTypeCategory::ASSOCIATED_INTERFACE;
 };
 
 template <typename T>
 struct MojomTypeTraits<AssociatedInterfaceRequestDataView<T>, false> {
-  using Data = AssociatedInterfaceRequest_Data;
+  using Data = AssociatedEndpointHandle_Data;
   using DataAsArrayElement = Data;
 
   static const MojomTypeCategory category =
       MojomTypeCategory::ASSOCIATED_INTERFACE_REQUEST;
 };
 
 template <>
 struct MojomTypeTraits<bool, false> {
   using Data = bool;
   using DataAsArrayElement = Data;
@@ skipping 72 matching lines @@
   size_t operator()(T input) const {
     using UnderlyingType = typename base::underlying_type<T>::type;
     return std::hash<UnderlyingType>()(static_cast<UnderlyingType>(input));
   }
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_