Refactored code to allow associating workers with multiple renderers.

chrome/renderer/webworker_base.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_base.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::WebMessagePortChannel;
 using WebKit::WebMessagePortChannelArray;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebWorkerClient;
 
 WebWorkerBase::WebWorkerBase(
     ChildThread* child_thread,
+    unsigned long long document_id,
     int route_id,
     int render_view_route_id)
     : route_id_(route_id),
       render_view_route_id_(render_view_route_id),
-      child_thread_(child_thread) {
+      child_thread_(child_thread),
+      document_id_(document_id) {
   if (route_id_ != MSG_ROUTING_NONE)
     child_thread_->AddRoute(route_id_, this);
 }
 
 WebWorkerBase::~WebWorkerBase() {
   Disconnect();
 
   // Free up any unsent queued messages.
   for (size_t i = 0; i < queued_messages_.size(); ++i)
     delete queued_messages_[i];
@@ skipping 10 matching lines @@
 
   route_id_ = MSG_ROUTING_NONE;
 }
 
 void WebWorkerBase::CreateWorkerContext(const GURL& script_url,
                                         bool is_shared,
                                         const string16& name,
                                         const string16& user_agent,
                                         const string16& source_code) {
   DCHECK(route_id_ == MSG_ROUTING_NONE);
+  ViewHostMsg_CreateWorker_Params params;
+  params.url = script_url;
+  params.is_shared = is_shared;
+  params.name = name;
+  params.document_id = document_id_;
+  params.render_view_route_id = render_view_route_id_;
   IPC::Message* create_message = new ViewHostMsg_CreateWorker(
-      script_url, is_shared, name, render_view_route_id_, &route_id_);
+      params, &route_id_);
   child_thread_->Send(create_message);
   if (route_id_ == MSG_ROUTING_NONE)
     return;
 
   child_thread_->AddRoute(route_id_, this);
 
   // We make sure that the start message is the first, since postMessage or
   // connect might have already been called.
   queued_messages_.insert(queued_messages_.begin(),
       new WorkerMsg_StartWorkerContext(
@@ skipping 26 matching lines @@
 
 void WebWorkerBase::SendQueuedMessages() {
   DCHECK(queued_messages_.size());
   std::vector<IPC::Message*> queued_messages = queued_messages_;
   queued_messages_.clear();
   for (size_t i = 0; i < queued_messages.size(); ++i) {
     queued_messages[i]->set_routing_id(route_id_);
     Send(queued_messages[i]);
   }
 }