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/common/child_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/common/child_thread.cc')
-rw-r--r-- | chrome/common/child_thread.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc index c7b488a..5d61738 100644 --- a/chrome/common/child_thread.cc +++ b/chrome/common/child_thread.cc @@ -24,8 +24,7 @@ ChildThread::ChildThread() { } ChildThread::ChildThread(const std::string& channel_name) - : channel_name_(channel_name), - on_channel_error_called_(false) { + : channel_name_(channel_name) { Init(); } @@ -72,7 +71,6 @@ ChildThread::~ChildThread() { } void ChildThread::OnChannelError() { - set_on_channel_error_called(true); MessageLoop::current()->Quit(); } @@ -162,7 +160,7 @@ ChildThread* ChildThread::current() { } void ChildThread::OnProcessFinalRelease() { - if (on_channel_error_called_ || !check_with_browser_before_shutdown_) { + if (!check_with_browser_before_shutdown_) { MessageLoop::current()->Quit(); return; } |