Initial implementation of stashed message ports, content side

content/browser/message_port_service.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 "content/browser/message_port_service.h"
 
 #include "content/common/message_port_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/message_port_delegate.h"
 
@@ skipping 56 matching lines @@
   if (!message_ports_.count(message_port_id)) {
     NOTREACHED();
     return;
   }
 
   MessagePort& port = message_ports_[message_port_id];
   port.delegate = delegate;
   port.route_id = routing_id;
 }
 
+void MessagePortService::GetMessagePortInfo(int message_port_id,
+                                            MessagePortDelegate** delegate,
+                                            int* routing_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!message_ports_.count(message_port_id)) {
+    NOTREACHED();

[scheib, 2015/05/06 22:19:45]

Handle it or not, but not both. Looks like here we can't trust renderer so it's
handle it.
https://www.chromium.org/developers/coding-style#TOC-CHECK-DCHECK-and-NOTREAC...

[Marijn Kruisselbrink, 2015/05/12 06:57:33]

I would generally agree with you, but this exact same pattern is used in pretty
much every other MessagePortService method that takes a message_port_id, so I
think consistency here is more important.

+    return;
+  }
+
+  const MessagePort& port = message_ports_[message_port_id];
+  if (delegate)
+    *delegate = port.delegate;
+  if (routing_id)
+    *routing_id = port.route_id;
+}
+
 void MessagePortService::OnMessagePortDelegateClosing(
     MessagePortDelegate* delegate) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Check if the (possibly) crashed process had any message ports.
   for (MessagePorts::iterator iter = message_ports_.begin();
        iter != message_ports_.end();) {
     MessagePorts::iterator cur_item = iter++;
     if (cur_item->second.delegate == delegate) {
       Erase(cur_item->first);
     }
@@ skipping 86 matching lines @@
   if (entangled_port.queue_messages()) {
     // If the target port is currently holding messages because the destination
     // renderer isn't available yet, all message ports being sent should also be
     // put in this state.
     if (entangled_port.hold_messages_for_destination) {
       for (const auto& port : sent_message_ports)
         HoldMessages(port.id);
     }
     entangled_port.queued_messages.push_back(
         std::make_pair(message, sent_message_ports));
+
+    if (entangled_port.delegate)
+      entangled_port.delegate->MessageWasHeld(entangled_port.route_id);
+
     return;
   }
 
   if (!entangled_port.delegate) {
     NOTREACHED();
     return;
   }
 
   // Now send the message to the entangled port.
   entangled_port.delegate->SendMessage(entangled_port.route_id, message,
@@ skipping 120 matching lines @@
     // Do the disentanglement (and be paranoid about the other side existing
     // just in case something unusual happened during entanglement).
     if (message_ports_.count(entangled_id)) {
       message_ports_[entangled_id].entangled_message_port_id = MSG_ROUTING_NONE;
     }
   }
   message_ports_.erase(erase_item);
 }
 
 }  // namespace content