Chromium Code Reviews| Index: chrome/browser/renderer_host/resource_request_details.cc |
| =================================================================== |
| --- chrome/browser/renderer_host/resource_request_details.cc (revision 69638) |
| +++ chrome/browser/renderer_host/resource_request_details.cc (working copy) |
| @@ -4,6 +4,8 @@ |
| #include "chrome/browser/renderer_host/resource_request_details.h" |
| +#include "chrome/browser/worker_host/worker_service.h" |
| + |
| ResourceRequestDetails::ResourceRequestDetails(const net::URLRequest* request, |
| int cert_id) |
| : url_(request->url()), |
| @@ -25,18 +27,13 @@ |
| // If request is from the worker process on behalf of a renderer, use |
| // the renderer process id, since it consumes the notification response |
| // such as ssl state etc. |
| - const WorkerProcessHost::WorkerInstance* worker_instance = |
| - WorkerService::GetInstance()->FindWorkerInstance(info->child_id()); |
| - if (worker_instance) { |
| - DCHECK(!worker_instance->worker_document_set()->IsEmpty()); |
| - const WorkerDocumentSet::DocumentInfoSet& parents = |
| - worker_instance->worker_document_set()->documents(); |
| - // TODO(atwilson): need to notify all associated renderers in the case |
| - // of ssl state change (http://crbug.com/25357). For now, just notify |
| - // the first one (works for dedicated workers and shared workers with |
| - // a single process). |
| - origin_child_id_ = parents.begin()->renderer_id(); |
| - } else { |
| + // TODO(atwilson): need to notify all associated renderers in the case |
| + // of ssl state change (http://crbug.com/25357). For now, just notify |
| + // the first one (works for dedicated workers and shared workers with |
| + // a single process). |
| + int temp; |
| + if (!WorkerService::GetInstance()->GetRendererForWorker( |
| + info->child_id(), &origin_child_id_, &temp)) { |
|
Andrew T Wilson (Slow)
2010/12/21 03:12:21
It seems cleaner to pass in a NULL ptr for unneede
jam
2010/12/21 07:41:51
I think it's personal taste :) I prefer not adding
|
| origin_child_id_ = info->child_id(); |
| } |
| } |