From 31af2abddfa0c05ee19de5b4646197fa552c7e49 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Thu, 25 Feb 2010 07:58:17 +0000 Subject: 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 --- chrome/common/child_thread.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'chrome/common/child_thread.h') diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h index ee05e11..2b55417 100644 --- a/chrome/common/child_thread.h +++ b/chrome/common/child_thread.h @@ -70,10 +70,6 @@ class ChildThread : public IPC::Channel::Listener, IPC::SyncChannel* channel() { return channel_.get(); } - void set_on_channel_error_called(bool on_channel_error_called) { - on_channel_error_called_ = on_channel_error_called; - } - private: void Init(); @@ -98,10 +94,6 @@ class ChildThread : public IPC::Channel::Listener, // that would addref it. bool check_with_browser_before_shutdown_; - // The OnChannelError() callback was invoked - the channel is dead, don't - // attempt to communicate. - bool on_channel_error_called_; - MessageLoop* message_loop_; scoped_ptr notification_service_; -- cgit v1.1