Added lifecycle management and sharing support for SharedWorkers. SharedWorkers

chrome/renderer/webworker_proxy.cc

 // Copyright (c) 2009 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 "chrome/renderer/webworker_proxy.h"
 
 #include "chrome/common/child_thread.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/common/worker_messages.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebWorkerClient.h"
 
 using WebKit::WebCommonWorkerClient;
 using WebKit::WebMessagePortChannel;
 using WebKit::WebMessagePortChannelArray;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebWorkerClient;
 
 WebWorkerProxy::WebWorkerProxy(
     WebWorkerClient* client,
     ChildThread* child_thread,
     int render_view_route_id)
     : WebWorkerBase(child_thread, MSG_ROUTING_NONE, render_view_route_id),
       client_(client) {
 }
 
-void WebWorkerProxy::Disconnect() {
+WebWorkerProxy::~WebWorkerProxy() {
+  // If we're midway through starting a worker, cancel it.
+  CancelCreation();
+}
+
+void WebWorkerProxy::CancelCreation() {
   if (route_id_ == MSG_ROUTING_NONE)
     return;
 
   // Tell the browser to not start our queued worker.
   if (!IsStarted())
     child_thread_->Send(new ViewHostMsg_CancelCreateDedicatedWorker(route_id_));
-
-  // Call our superclass to shutdown the routing
-  WebWorkerBase::Disconnect();
 }
 
 void WebWorkerProxy::startWorkerContext(
     const WebURL& script_url,
     const WebString& user_agent,
     const WebString& source_code) {
   CreateWorkerContext(script_url, false, string16(), user_agent, source_code);
 }
 
 void WebWorkerProxy::terminateWorkerContext() {
   if (route_id_ != MSG_ROUTING_NONE) {
     Send(new WorkerMsg_TerminateWorkerContext(route_id_));
+    CancelCreation();
     Disconnect();
   }
 }
 
 void WebWorkerProxy::postMessageToWorkerContext(
     const WebString& message, const WebMessagePortChannelArray& channels) {
   std::vector<int> message_port_ids(channels.size());
   std::vector<int> routing_ids(channels.size());
   for (size_t i = 0; i < channels.size(); ++i) {
     WebMessagePortChannelImpl* webchannel =
@@ skipping 60 matching lines @@
   client_->postMessageToWorkerObject(message, channels);
 }
 
 void WebWorkerProxy::OnPostConsoleMessageToWorkerObject(
       const WorkerHostMsg_PostConsoleMessageToWorkerObject_Params& params) {
   client_->postConsoleMessageToWorkerObject(params.destination_identifier,
       params.source_identifier, params.message_type, params.message_level,
       params.message, params.line_number, params.source_url);
 }