EDK: Add HandleTable::AddHandleVector().

mojo/edk/system/handle_table.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/handle_table.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 65 matching lines @@
 std::pair<MojoHandle, MojoHandle> HandleTable::AddHandlePair(Handle&& handle0,
                                                              Handle&& handle1) {
   DCHECK(handle0);
   DCHECK(handle1);
   return (handle_to_entry_map_.size() + 1u < max_handle_table_size_)
              ? std::make_pair(AddHandleNoSizeCheck(std::move(handle0)),
                               AddHandleNoSizeCheck(std::move(handle1)))
              : std::make_pair(MOJO_HANDLE_INVALID, MOJO_HANDLE_INVALID);
 }
 
+bool HandleTable::AddHandleVector(HandleVector* handles,
+                                  MojoHandle* handle_values) {
+  size_t max_message_num_handles = GetConfiguration().max_message_num_handles;
+
+  DCHECK(handles);
+  DCHECK_LE(handles->size(), max_message_num_handles);
+  DCHECK(handle_values);
+  DCHECK_LT(
+      static_cast<uint64_t>(max_handle_table_size_) + max_message_num_handles,
+      std::numeric_limits<size_t>::max())
+      << "Addition may overflow";
+
+  if (handle_to_entry_map_.size() + handles->size() > max_handle_table_size_)
+    return false;
+
+  for (size_t i = 0; i < handles->size(); i++) {
+    if (handles->at(i)) {
+      handle_values[i] = AddHandleNoSizeCheck(std::move(handles->at(i)));
+    } else {
+      LOG(WARNING) << "Invalid dispatcher at index " << i;
+      handle_values[i] = MOJO_HANDLE_INVALID;
+    }
+  }
+  return true;
+}
+
+// TODO(vtl): Delete this.
 bool HandleTable::AddDispatcherVector(const DispatcherVector& dispatchers,
                                       MojoHandle* handles) {
   size_t max_message_num_handles = GetConfiguration().max_message_num_handles;
 
   DCHECK_LE(dispatchers.size(), max_message_num_handles);
   DCHECK(handles);
   DCHECK_LT(
       static_cast<uint64_t>(max_handle_table_size_) + max_message_num_handles,
       std::numeric_limits<size_t>::max())
       << "Addition may overflow";
@@ skipping 144 matching lines @@
   for (uint32_t i = 0; i < num_handles; i++) {
     HandleToEntryMap::iterator it = handle_to_entry_map_.find(handle_values[i]);
     DCHECK(it != handle_to_entry_map_.end());
     DCHECK(it->second.busy);
     it->second.busy = false;
   }
 }
 
 }  // namespace system
 }  // namespace mojo