Refactored code to allow associating workers with multiple renderers.

chrome/browser/renderer_host/resource_dispatcher_host.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <vector>
 
@@ skipping 141 matching lines @@
       URLRequest* request,
       ResourceFunction function,
       ResourceRequestDetails* details)
       : render_process_host_id_(-1),
         render_view_host_id_(-1),
         function_(function),
         details_(details) {
     if (!ResourceDispatcherHost::RenderViewForRequest(request,
                                                       &render_process_host_id_,
                                                       &render_view_host_id_)) {
-      NOTREACHED();
+      // Issue a warning here - this can happen during normal operation (for
+      // example, if a worker exits while a network operation is pending), but
+      // it should be fairly rare.
+      DLOG(WARNING) << "Trying to deliver a message to a RenderViewHost" <<
+                       " that has already exited or has never existed.";
     }
   }
 
   virtual void Run() {
     RenderViewHost* rvh = RenderViewHost::FromID(render_process_host_id_,
                                                  render_view_host_id_);
     if (rvh) {
       RenderViewHostDelegate::Resource* resource_delegate =
           rvh->delegate()->GetResourceDelegate();
       if (resource_delegate)
@@ skipping 1271 matching lines @@
 
   // If the request is from the worker process, find a tab that owns the worker.
   if (info->process_type() == ChildProcessInfo::WORKER_PROCESS) {
       const WorkerProcessHost::WorkerInstance* worker_instance =
           WorkerService::GetInstance()->FindWorkerInstance(info->child_id());
       if (!worker_instance) {
         *render_process_host_id = -1;
         *render_view_host_id = -1;
         return false;
       }
-      *render_process_host_id = worker_instance->renderer_id();
-      *render_view_host_id = worker_instance->render_view_route_id();
+      DCHECK(!worker_instance->worker_document_set()->IsEmpty());
+      const WorkerDocumentSet::DocumentInfoSet& parents =
+          worker_instance->worker_document_set()->documents();
+      // Need to display some related UI for this network request - pick an
+      // arbitrary parent to do so.
+      *render_process_host_id = parents.begin()->renderer_id();
+      *render_view_host_id = parents.begin()->render_view_route_id();
   } else {
     *render_process_host_id = info->child_id();
     *render_view_host_id = info->route_id();
   }
   return true;
 }
 
 void ResourceDispatcherHost::AddObserver(Observer* obs) {
   observer_list_.AddObserver(obs);
 }
@@ skipping 289 matching lines @@
     case ViewHostMsg_UploadProgress_ACK::ID:
     case ViewHostMsg_SyncLoad::ID:
       return true;
 
     default:
       break;
   }
 
   return false;
 }