diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 19:57:03 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 19:57:03 +0000 |
| commit | 3b6b0c7d82183c971b166d0b83cce23b465c6bea (patch) | |
| tree | a3e6e919d0bf9c512b73c9b2615ffca5b67e490e /chrome_frame/urlmon_url_request.cc | |
| parent | 9dc4eb0f141606d09505446666c34f3003401e2f (diff) | |
| download | chromium_src-3b6b0c7d82183c971b166d0b83cce23b465c6bea.zip chromium_src-3b6b0c7d82183c971b166d0b83cce23b465c6bea.tar.gz chromium_src-3b6b0c7d82183c971b166d0b83cce23b465c6bea.tar.bz2 | |
Revert 107995 - Fix a ChromeFrame crash which occurs in the background worker thread while dereferencing a NULL automation client.
This crash occurs when the active document is in the process of shutting down while there are active background
requests still pending.
Fix is to ensure that the background thread has been stopped before returning from the UrlmonUrlRequestManager::StopAll
function which gets called during CF shutdown.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=102393
BUG=102393
Review URL: http://codereview.chromium.org/8429011
TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/8431011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_url_request.cc')
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index 9c2b130..9bade03 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -1261,8 +1261,6 @@ void UrlmonUrlRequestManager::StopAll() { NewRunnableMethod( this, &UrlmonUrlRequestManager::StopAllRequestsHelper, &background_request_map_, &background_resource_map_lock_)); - // background_thread_->Stop(); - // background_thread_.reset(); } } |