summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/webworker_base.cc
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-17 22:00:51 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-17 22:00:51 +0000
commit6de0bcf0025517c4f31eafce162d90588c609103 (patch)
tree8ae27ceda2696e65a7b6d7b2d6a5474811914d88 /chrome/renderer/webworker_base.cc
parent87ef23a2a8a693c9452ddf5c65d47c9fd62e032f (diff)
downloadchromium_src-6de0bcf0025517c4f31eafce162d90588c609103.zip
chromium_src-6de0bcf0025517c4f31eafce162d90588c609103.tar.gz
chromium_src-6de0bcf0025517c4f31eafce162d90588c609103.tar.bz2
Fixes a race condition when a shared worker exits while one parent is loading
it. Changed the shared worker startup code to assign a route ID at the time that we initially lookup the worker, and pass that same route ID in when we later try to create the worker, to gracefully handle this race condition. BUG=29243 TEST=existing tests suffice (can't reproduce race condition in tests) Review URL: http://codereview.chromium.org/600103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/webworker_base.cc')
-rw-r--r--chrome/renderer/webworker_base.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/renderer/webworker_base.cc b/chrome/renderer/webworker_base.cc
index e78ef64..2bc10b5 100644
--- a/chrome/renderer/webworker_base.cc
+++ b/chrome/renderer/webworker_base.cc
@@ -54,7 +54,8 @@ void WebWorkerBase::CreateWorkerContext(const GURL& script_url,
bool is_shared,
const string16& name,
const string16& user_agent,
- const string16& source_code) {
+ const string16& source_code,
+ int pending_route_id) {
DCHECK(route_id_ == MSG_ROUTING_NONE);
ViewHostMsg_CreateWorker_Params params;
params.url = script_url;
@@ -62,6 +63,7 @@ void WebWorkerBase::CreateWorkerContext(const GURL& script_url,
params.name = name;
params.document_id = document_id_;
params.render_view_route_id = render_view_route_id_;
+ params.route_id = pending_route_id;
IPC::Message* create_message = new ViewHostMsg_CreateWorker(
params, &route_id_);
child_thread_->Send(create_message);