EDK: Remove Core::AddDispatcher().

mojo/edk/system/core.cc

 // 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.
 
 #include "mojo/edk/system/core.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 79 matching lines @@
       handle_table_(GetConfiguration().max_handle_table_size) {}
 
 Core::~Core() {
 }
 
 MojoHandle Core::AddHandle(Handle&& handle) {
   MutexLocker locker(&handle_table_mutex_);
   return handle_table_.AddHandle(std::move(handle));
 }
 
-// FIXME
-MojoHandle Core::AddDispatcher(Dispatcher* dispatcher) {
-  return AddHandle(
-      Handle(RefPtr<Dispatcher>(dispatcher), MOJO_HANDLE_RIGHT_TRANSFER));
-}
-
 MojoResult Core::GetDispatcher(MojoHandle handle,
                                RefPtr<Dispatcher>* dispatcher) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   MutexLocker locker(&handle_table_mutex_);
   return handle_table_.GetDispatcher(handle, dispatcher);
 }
 
 MojoResult Core::GetAndRemoveDispatcher(MojoHandle handle,
@@ skipping 104 matching lines @@
   if (result != MOJO_RESULT_OK)
     return result;
 
   auto dispatcher0 = MessagePipeDispatcher::Create(validated_options);
   auto dispatcher1 = MessagePipeDispatcher::Create(validated_options);
 
   std::pair<MojoHandle, MojoHandle> handle_pair;
   {
     MutexLocker locker(&handle_table_mutex_);
     handle_pair = handle_table_.AddHandlePair(
-        Handle(dispatcher0.Clone(), MOJO_HANDLE_RIGHT_TRANSFER |
-                                        MOJO_HANDLE_RIGHT_READ |
-                                        MOJO_HANDLE_RIGHT_WRITE),
-        Handle(dispatcher1.Clone(), MOJO_HANDLE_RIGHT_TRANSFER |
-                                        MOJO_HANDLE_RIGHT_READ |
-                                        MOJO_HANDLE_RIGHT_WRITE));
+        Handle(dispatcher0.Clone(),
+               MessagePipeDispatcher::kDefaultHandleRights),
+        Handle(dispatcher1.Clone(),
+               MessagePipeDispatcher::kDefaultHandleRights));
   }
   if (handle_pair.first == MOJO_HANDLE_INVALID) {
     DCHECK_EQ(handle_pair.second, MOJO_HANDLE_INVALID);
     LOG(ERROR) << "Handle table full";
     dispatcher0->Close();
     dispatcher1->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
 
   auto message_pipe = MessagePipe::CreateLocalLocal();
@@ skipping 145 matching lines @@
     return result;
 
   auto producer_dispatcher = DataPipeProducerDispatcher::Create();
   auto consumer_dispatcher = DataPipeConsumerDispatcher::Create();
 
   std::pair<MojoHandle, MojoHandle> handle_pair;
   {
     MutexLocker locker(&handle_table_mutex_);
     handle_pair = handle_table_.AddHandlePair(
         Handle(producer_dispatcher.Clone(),
-               MOJO_HANDLE_RIGHT_TRANSFER | MOJO_HANDLE_RIGHT_WRITE),
+               DataPipeProducerDispatcher::kDefaultHandleRights),
         Handle(consumer_dispatcher.Clone(),
-               MOJO_HANDLE_RIGHT_TRANSFER | MOJO_HANDLE_RIGHT_READ));
+               DataPipeConsumerDispatcher::kDefaultHandleRights));
   }
   if (handle_pair.first == MOJO_HANDLE_INVALID) {
     DCHECK_EQ(handle_pair.second, MOJO_HANDLE_INVALID);
     LOG(ERROR) << "Handle table full";
     producer_dispatcher->Close();
     consumer_dispatcher->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
   DCHECK_NE(handle_pair.second, MOJO_HANDLE_INVALID);
 
@@ skipping 130 matching lines @@
   if (result != MOJO_RESULT_OK)
     return result;
 
   auto dispatcher = SharedBufferDispatcher::Create(
       platform_support_, validated_options, num_bytes, &result);
   if (result != MOJO_RESULT_OK) {
     DCHECK(!dispatcher);
     return result;
   }
 
-  // Note that shared buffer handles are duplicatable (by default).
-  MojoHandle h = AddHandle(Handle(
-      dispatcher.Clone(), MOJO_HANDLE_RIGHT_DUPLICATE |
-                              MOJO_HANDLE_RIGHT_TRANSFER |
-                              MOJO_HANDLE_RIGHT_READ | MOJO_HANDLE_RIGHT_WRITE |
-                              MOJO_HANDLE_RIGHT_EXECUTE));
+  MojoHandle h = AddHandle(
+      Handle(dispatcher.Clone(), SharedBufferDispatcher::kDefaultHandleRights));
   if (h == MOJO_HANDLE_INVALID) {
     LOG(ERROR) << "Handle table full";
     dispatcher->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
 
   shared_buffer_handle.Put(h);
   return MOJO_RESULT_OK;
 }
 
 MojoResult Core::DuplicateBufferHandle(
     MojoHandle buffer_handle,
     UserPointer<const MojoDuplicateBufferHandleOptions> options,
     UserPointer<MojoHandle> new_buffer_handle) {
   RefPtr<Dispatcher> dispatcher;
   MojoResult result = GetDispatcher(buffer_handle, &dispatcher);
   if (result != MOJO_RESULT_OK)
     return result;
 
   // Don't verify |options| here; that's the dispatcher's job.
   RefPtr<Dispatcher> new_dispatcher;
   result = dispatcher->DuplicateBufferHandle(options, &new_dispatcher);
   if (result != MOJO_RESULT_OK)
     return result;
 
-  MojoHandle new_handle = AddDispatcher(new_dispatcher.get());
+  // TODO(vtl): This should be done with the original handle's rights.
+  MojoHandle new_handle = AddHandle(Handle(
+      new_dispatcher.Clone(), SharedBufferDispatcher::kDefaultHandleRights));
   if (new_handle == MOJO_HANDLE_INVALID) {
     LOG(ERROR) << "Handle table full";
     new_dispatcher->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
 
   new_buffer_handle.Put(new_handle);
   return MOJO_RESULT_OK;
 }
 
@@ skipping 106 matching lines @@
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return result;
 }
 
 }  // namespace system
 }  // namespace mojo