diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 07:58:17 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 07:58:17 +0000 |
commit | 31af2abddfa0c05ee19de5b4646197fa552c7e49 (patch) | |
tree | 2c9efbd2c3b8d4846230a7cb9cb8f8be7c4da2dd /chrome/worker/worker_thread.cc | |
parent | 49fa9d59bca4ba0118a3e65f7cad5886cc4d5c3e (diff) | |
download | chromium_src-31af2abddfa0c05ee19de5b4646197fa552c7e49.zip chromium_src-31af2abddfa0c05ee19de5b4646197fa552c7e49.tar.gz chromium_src-31af2abddfa0c05ee19de5b4646197fa552c7e49.tar.bz2 |
Revert r39951 - Broke Valgrind - "Make sure the workers are given a chance to terminate their thread when the IPC channel fails.
Usually, the ChildThread::OnChannelError() simply kills the message loop. we want to give workers
an opportunity to get out of their threads to avoid crashes when main thread destroys globals.
BUG=35963
TEST=WorkerTest.StressJSExecution
Review URL: http://codereview.chromium.org/647064"
Revert r39997 - Attempted Fix - "Fix a conditional jump depending on an uninitialized value by setting it to false in the ctor."
TBR=dimich
BUG=none
TEST=Valgrind
Review URL: http://codereview.chromium.org/661068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker/worker_thread.cc')
-rw-r--r-- | chrome/worker/worker_thread.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc index 0591902..ac8a1c7 100644 --- a/chrome/worker/worker_thread.cc +++ b/chrome/worker/worker_thread.cc @@ -62,22 +62,3 @@ void WorkerThread::OnCreateWorker(const GURL& url, else new WebWorkerStub(url, route_id); } - -// The browser process is likely dead. Terminate all workers. -void WorkerThread::OnChannelError() { - set_on_channel_error_called(true); - - for (WorkerStubsList::iterator it = worker_stubs_.begin(); - it != worker_stubs_.end(); ++it) { - (*it)->OnChannelError(); - } -} - -void WorkerThread::RemoveWorkerStub(WebWorkerStubBase* stub) { - worker_stubs_.erase(stub); -} - -void WorkerThread::AddWorkerStub(WebWorkerStubBase* stub) { - worker_stubs_.insert(stub); -} - |