SharedWorker: Remove message forwarding mechanism

content/renderer/websharedworker_proxy.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/renderer/websharedworker_proxy.h"
 
 #include <stddef.h>
 
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/view_messages.h"
@@ skipping 26 matching lines @@
   // terminate independently, already sent messages may still be in the pipe.
   router_->RemoveRoute(route_id_);
 
   route_id_ = MSG_ROUTING_NONE;
 }
 
 bool WebSharedWorkerProxy::Send(std::unique_ptr<IPC::Message> message) {
   // It's possible that messages will be sent before the worker is created, in
   // which case route_id_ will be none.  Or the worker object can be interacted
   // with before the browser process told us that it started, in which case we
   // also want to queue the message.

[nhiroki, 2016/12/28 08:04:20]

Question: How is the case where |route_id_| is none handled? Apparently,
|route_id_| is never updated before sending a queued messages, and the messages
are ignored in the browser process. Am I missing something?

[nhiroki, 2016/12/28 08:16:19]

I understand this. A route_id passed to the ctor of this class is always valid:
https://chromium.googlesource.com/chromium/src/+/8a00f15f144888ccbee12c733185...

My recent patch changed this code, but the route_id should be still always
valid:
https://codereview.chromium.org/2604733002

Probably we should update these comments and make |route_id| const. I'll make a
separate patch.

[nhiroki, 2016/12/28 09:48:26]

Created a patch: https://codereview.chromium.org/2607753002/

   if (!created_) {
     queued_messages_.push_back(std::move(message));
     return true;
   }
 
   // For now we proxy all messages to the worker process through the browser.
   // Revisit if we find this slow.
   // TODO(jabdelmalek): handle sync messages if we need them.
-  return router_->Send(new ViewHostMsg_ForwardToWorker(*message));
+  return router_->Send(message.release());
 }
 
 void WebSharedWorkerProxy::SendQueuedMessages() {
   DCHECK(created_);
   DCHECK(queued_messages_.size());
   std::vector<std::unique_ptr<IPC::Message>> queued_messages;
   queued_messages.swap(queued_messages_);
   for (size_t i = 0; i < queued_messages.size(); ++i) {
     queued_messages[i]->set_routing_id(route_id_);
     Send(std::move(queued_messages[i]));
   }
 }
 
 void WebSharedWorkerProxy::connect(blink::WebMessagePortChannel* channel,
                                    ConnectListener* listener) {
   WebMessagePortChannelImpl* webchannel =
         static_cast<WebMessagePortChannelImpl*>(channel);
 
   int message_port_id = webchannel->message_port_id();
   DCHECK_NE(MSG_ROUTING_NONE, message_port_id);
   webchannel->QueueMessages();
 
-  Send(base::MakeUnique<WorkerMsg_Connect>(route_id_, message_port_id,
-                                           MSG_ROUTING_NONE));
+  Send(base::MakeUnique<ViewHostMsg_ConnectToWorker>(route_id_,
+                                                     message_port_id));
   connect_listener_ = listener;
 }
 
 bool WebSharedWorkerProxy::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebSharedWorkerProxy, message)
     IPC_MESSAGE_HANDLER(ViewMsg_WorkerCreated, OnWorkerCreated)
     IPC_MESSAGE_HANDLER(ViewMsg_WorkerScriptLoadFailed,
                         OnWorkerScriptLoadFailed)
     IPC_MESSAGE_HANDLER(ViewMsg_WorkerConnected,
@@ skipping 18 matching lines @@
 }
 
 void WebSharedWorkerProxy::OnWorkerConnected() {
   if (connect_listener_) {
     // This can result in this object being freed.
     connect_listener_->connected();
   }
 }
 
 }  // namespace content