diff options
| author | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 19:16:16 +0000 |
|---|---|---|
| committer | dimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 19:16:16 +0000 |
| commit | ecc0738c8ec3fe083ea639740e4a3ebbc695114d (patch) | |
| tree | a72e92b51e43517066da693350282f6ccaed4161 /chrome/worker/webworker_stub_base.cc | |
| parent | beda4150e41daa8f6aa91e788fccce2a3e9aca00 (diff) | |
| download | chromium_src-ecc0738c8ec3fe083ea639740e4a3ebbc695114d.zip chromium_src-ecc0738c8ec3fe083ea639740e4a3ebbc695114d.tar.gz chromium_src-ecc0738c8ec3fe083ea639740e4a3ebbc695114d.tar.bz2 | |
Un-revert r39999, now with a Valgrind fix. Original change: http://codereview.chromium.org/647064
BUG=35963
TEST=WorkerTest.StressJSExecution
Review URL: http://codereview.chromium.org/661139
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker/webworker_stub_base.cc')
| -rw-r--r-- | chrome/worker/webworker_stub_base.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/worker/webworker_stub_base.cc b/chrome/worker/webworker_stub_base.cc index 8ea2a15..b999f44 100644 --- a/chrome/worker/webworker_stub_base.cc +++ b/chrome/worker/webworker_stub_base.cc @@ -12,13 +12,19 @@ WebWorkerStubBase::WebWorkerStubBase(int route_id) : route_id_(route_id), ALLOW_THIS_IN_INITIALIZER_LIST(client_(route_id, this)) { + WorkerThread* workerThread = WorkerThread::current(); + DCHECK(workerThread); + workerThread->AddWorkerStub(this); // Start processing incoming IPCs for this worker. - WorkerThread::current()->AddRoute(route_id_, this); + workerThread->AddRoute(route_id_, this); ChildProcess::current()->AddRefProcess(); } WebWorkerStubBase::~WebWorkerStubBase() { - WorkerThread::current()->RemoveRoute(route_id_); + WorkerThread* workerThread = WorkerThread::current(); + DCHECK(workerThread); + workerThread->RemoveWorkerStub(this); + workerThread->RemoveRoute(route_id_); ChildProcess::current()->ReleaseProcess(); } |