summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-09 04:23:26 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-09 04:23:26 +0000
commit702690427d0185fe546ff21a01e501b77732166b (patch)
treeced2e942d4fe058e16cfc5bebbcf4daf79316485 /chrome/worker
parent2456c5732fe85109c39dbdd3dbbb8262589a847e (diff)
downloadchromium_src-702690427d0185fe546ff21a01e501b77732166b.zip
chromium_src-702690427d0185fe546ff21a01e501b77732166b.tar.gz
chromium_src-702690427d0185fe546ff21a01e501b77732166b.tar.bz2
Changed SharedWorkerScriptLoader and WebSharedWorkerProxy to stay alive until worker initialization is complete (they were being freed before the connect event was sent to the worker.
BUG=26233 TEST=none (will be enabled after a separate upstream patch is landed) Review URL: http://codereview.chromium.org/372047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/websharedworker_stub.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/worker/websharedworker_stub.cc b/chrome/worker/websharedworker_stub.cc
index 902f393..1860f29 100644
--- a/chrome/worker/websharedworker_stub.cc
+++ b/chrome/worker/websharedworker_stub.cc
@@ -41,7 +41,7 @@ void WebSharedWorkerStub::OnStartWorkerContext(
void WebSharedWorkerStub::OnConnect(int sent_message_port_id, int routing_id) {
WebKit::WebMessagePortChannel* channel =
new WebMessagePortChannelImpl(routing_id, sent_message_port_id);
- impl_->connect(channel);
+ impl_->connect(channel, NULL);
}
void WebSharedWorkerStub::OnTerminateWorkerContext() {