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

1 files changed, 5 insertions, 0 deletions

diff --git a/chrome/renderer/websharedworker_proxy.h b/chrome/renderer/websharedworker_proxy.h
index 4a93ff6..be88871 100644
--- a/chrome/renderer/websharedworker_proxy.h
+++ b/chrome/renderer/websharedworker_proxy.h
@@ -23,6 +23,7 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
   // If the worker not loaded yet, route_id == MSG_ROUTING_NONE
   WebSharedWorkerProxy(ChildThread* child_thread,
                        unsigned long long document_id,
+                       bool exists,
                        int route_id,
                        int render_view_route_id);
 
@@ -43,6 +44,10 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
  private:
   void OnWorkerCreated();
 
+  // The id for the placeholder worker instance we've stored on the
+  // browser process (we need to pass this same route id back in when creating
+  // the worker).
+  int pending_route_id_;
   ConnectListener* connect_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerProxy);