Make it possible to remove an Awakable with a specific "context" from a Dispatcher.

mojo/edk/system/dispatcher.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/dispatcher.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
@@ skipping 319 matching lines @@
   if (is_closed_) {
     if (signals_state)
       *signals_state = HandleSignalsState();
     return MOJO_RESULT_INVALID_ARGUMENT;
   }
 
   return AddAwakableImplNoLock(awakable, signals, true, context, signals_state);
 }
 
 void Dispatcher::RemoveAwakable(Awakable* awakable,
-                                HandleSignalsState* handle_signals_state) {
+                                HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   if (is_closed_) {
-    if (handle_signals_state)
-      *handle_signals_state = HandleSignalsState();
+    if (signals_state)
+      *signals_state = HandleSignalsState();
     return;
   }
 
-  RemoveAwakableImplNoLock(awakable, handle_signals_state);
+  RemoveAwakableImplNoLock(awakable, signals_state);
+}
+
+void Dispatcher::RemoveAwakableWithContext(Awakable* awakable,
+                                           uint64_t context,
+                                           HandleSignalsState* signals_state) {
+  MutexLocker locker(&mutex_);
+  if (is_closed_) {
+    if (signals_state)
+      *signals_state = HandleSignalsState();
+    return;
+  }
+
+  RemoveAwakableWithContextImplNoLock(awakable, context, signals_state);
 }
 
 Dispatcher::Dispatcher() : is_closed_(false) {}
 
 Dispatcher::~Dispatcher() {
   // Make sure that |Close()| was called.
   DCHECK(is_closed_);
 }
 
 void Dispatcher::CancelAllStateNoLock() {
@@ skipping 213 matching lines @@
 void Dispatcher::RemoveAwakableImplNoLock(Awakable* /*awakable*/,
                                           HandleSignalsState* signals_state) {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
   // By default, waiting isn't supported. Only dispatchers that can be waited on
   // will do something nontrivial.
   if (signals_state)
     *signals_state = HandleSignalsState();
 }
 
+void Dispatcher::RemoveAwakableWithContextImplNoLock(
+    Awakable* /*awakable*/,
+    uint64_t /*context*/,
+    HandleSignalsState* signals_state) {
+  mutex_.AssertHeld();
+  DCHECK(!is_closed_);
+  // By default, waiting isn't supported. Only dispatchers that can be waited on
+  // will do something nontrivial.
+  if (signals_state)
+    *signals_state = HandleSignalsState();
+}
+
 void Dispatcher::StartSerializeImplNoLock(Channel* /*channel*/,
                                           size_t* max_size,
                                           size_t* max_platform_handles) {
   AssertHasOneRef();  // Only one ref => no need to take the lock.
   DCHECK(!is_closed_);
   *max_size = 0;
   *max_platform_handles = 0;
 }
 
 bool Dispatcher::EndSerializeAndCloseImplNoLock(
@@ skipping 59 matching lines @@
   // want to remove or weaken).
   MutexLocker locker(&mutex_);
 #endif
 
   return EndSerializeAndCloseImplNoLock(channel, destination, actual_size,
                                         platform_handles);
 }
 
 }  // namespace system
 }  // namespace mojo