diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 04:59:09 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 04:59:09 +0000 |
| commit | d0d77e9a6750777fe49ab0adc4bcea4bf8a5b4a8 (patch) | |
| tree | c567494552d50ee266cae80ad2ba55a0a239e898 /content | |
| parent | 3371e51452618c455263c2336b82c7f739739f75 (diff) | |
| download | chromium_src-d0d77e9a6750777fe49ab0adc4bcea4bf8a5b4a8.zip chromium_src-d0d77e9a6750777fe49ab0adc4bcea4bf8a5b4a8.tar.gz chromium_src-d0d77e9a6750777fe49ab0adc4bcea4bf8a5b4a8.tar.bz2 | |
Land http://codereview.chromium.org/10556035/ for shouqun.liu@intel.com.
Fix the assertion failure while exiting in single process mode.
Set IO allowed in browser main thread before joining the renderer thread.
BUG=133239
Review URL: https://chromiumcodereview.appspot.com/10680012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 8a62291..45a6085 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -337,6 +337,13 @@ RenderProcessHostImpl::~RenderProcessHostImpl() { queued_messages_.pop(); } + if (run_renderer_in_process()) { + // In single process mode, need to set IO allowed in browser main thread + // before joining the renderer thread + base::ThreadRestrictions::ScopedAllowIO allow_io; + in_process_renderer_.reset(); + } + ClearTransportDIBCache(); UnregisterHost(GetID()); } |