Initial implementation of stashed message ports, content side

content/child/webmessageportchannel_impl.cc

 // Copyright (c) 2011 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/child/webmessageportchannel_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/values.h"
 #include "content/child/child_process.h"
@@ skipping 11 matching lines @@
 using blink::WebString;
 
 namespace content {
 
 WebMessagePortChannelImpl::WebMessagePortChannelImpl(
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_task_runner)
     : client_(NULL),
       route_id_(MSG_ROUTING_NONE),
       message_port_id_(MSG_ROUTING_NONE),
       send_messages_as_values_(false),
+      is_stashed_(false),
       main_thread_task_runner_(main_thread_task_runner) {
   AddRef();
   Init();
 }
 
 WebMessagePortChannelImpl::WebMessagePortChannelImpl(
     int route_id,
     const TransferredMessagePort& port,
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_task_runner)
     : client_(NULL),
       route_id_(route_id),
       message_port_id_(port.id),
       send_messages_as_values_(port.send_messages_as_values),
+      is_stashed_(false),
       main_thread_task_runner_(main_thread_task_runner) {
   AddRef();
   Init();
 }
 
 WebMessagePortChannelImpl::~WebMessagePortChannelImpl() {
   // If we have any queued messages with attached ports, manually destroy them.
   while (!message_queue_.empty()) {
     const WebMessagePortChannelArray& channel_array =
         message_queue_.front().ports;
     for (size_t i = 0; i < channel_array.size(); i++) {
       channel_array[i]->destroy();
     }
     message_queue_.pop();
   }
 
-  if (message_port_id_ != MSG_ROUTING_NONE)
+  // TODO(mek): Figure out if in case of a stashed port any messages remaining
+  // in the queue need to be send back to the browser process.
+  if (message_port_id_ != MSG_ROUTING_NONE && !is_stashed_)
     Send(new MessagePortHostMsg_DestroyMessagePort(message_port_id_));
 
   if (route_id_ != MSG_ROUTING_NONE)
     ChildThreadImpl::current()->GetRouter()->RemoveRoute(route_id_);
 }
 
 // static
 void WebMessagePortChannelImpl::CreatePair(
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread_task_runner,
     blink::WebMessagePortChannel** channel1,
@@ skipping 248 matching lines @@
 
   Release();
   ChildProcess::current()->ReleaseProcess();
 }
 
 WebMessagePortChannelImpl::Message::Message() {}
 
 WebMessagePortChannelImpl::Message::~Message() {}
 
 }  // namespace content