EDK: Plumb Handle/HandleVector yet one more layer down: MessageInTransit.

mojo/edk/system/transport_data.cc

 // 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.
 
 #include "mojo/edk/system/transport_data.h"
 
 #include <string.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/message_in_transit.h"
 
 using mojo::platform::AlignedAlloc;
 using mojo::platform::ScopedPlatformHandle;
 
 namespace mojo {
 namespace system {
 
+namespace {
+
+// TODO(vtl): Temporary, until |TransportData| really supports handles.
+std::unique_ptr<DispatcherVector> DispatcherVectorFromHandleVector(
+    std::unique_ptr<HandleVector> handles) {
+  DCHECK(handles);
+
+  std::unique_ptr<DispatcherVector> dispatchers(new DispatcherVector());
+  dispatchers->reserve(handles->size());
+  for (size_t i = 0; i < handles->size(); i++)
+    dispatchers->push_back(std::move(handles->at(i).dispatcher));
+  return dispatchers;
+}
+
+}  // namespace
+
 // The maximum amount of space needed per platform handle.
 // (|{Channel,RawChannel}::GetSerializedPlatformHandleSize()| should always
 // return a value which is at most this. This is only used to calculate
 // |TransportData::kMaxBufferSize|. This value should be a multiple of the
 // alignment in order to simplify calculations, even though the actual amount of
 // space needed need not be a multiple of the alignment.
 const size_t kMaxSizePerPlatformHandle = 8;
 static_assert(kMaxSizePerPlatformHandle % MessageInTransit::kMessageAlignment ==
                   0,
               "kMaxSizePerPlatformHandle not a multiple of alignment");
@@ skipping 24 matching lines @@
                         MessageInTransit::kMessageAlignment ==
                     0,
                 "kMaxSerializedDispatcherSize not a multiple of alignment");
   static_assert(sizeof(HandleTableEntry) %
                         MessageInTransit::kMessageAlignment ==
                     0,
                 "sizeof(MessageInTransit::HandleTableEntry) not a multiple of "
                 "alignment");
 };
 
+// TODO(vtl): Make this the real one.
+TransportData::TransportData(std::unique_ptr<HandleVector> handles,
+                             Channel* channel)
+    : TransportData(DispatcherVectorFromHandleVector(std::move(handles)),
+                    channel) {}
+
 TransportData::TransportData(std::unique_ptr<DispatcherVector> dispatchers,
                              Channel* channel)
     : buffer_size_() {
   DCHECK(dispatchers);
   DCHECK(channel);
 
   const size_t num_handles = dispatchers->size();
   DCHECK_GT(num_handles, 0u);
 
   // The offset to the start of the (Mojo) handle table.
@@ skipping 261 matching lines @@
     const void* source = static_cast<const char*>(buffer) + offset;
     (*dispatchers)[i] = Dispatcher::TransportDataAccess::Deserialize(
         channel, handle_table[i].type, source, size, platform_handles.get());
   }
 
   return dispatchers;
 }
 
 }  // namespace system
 }  // namespace mojo