diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 19:42:54 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 19:42:54 +0000 |
| commit | 6f83196ad99e7f90ba3db0d90832a9459a8d75f1 (patch) | |
| tree | 52a78b9577794553705f772fb3f9cfa40bf4d030 /chrome/browser/render_view_host.cc | |
| parent | 21a52557fc2373e7c3f525072384bb97f7978012 (diff) | |
| download | chromium_src-6f83196ad99e7f90ba3db0d90832a9459a8d75f1.zip chromium_src-6f83196ad99e7f90ba3db0d90832a9459a8d75f1.tar.gz chromium_src-6f83196ad99e7f90ba3db0d90832a9459a8d75f1.tar.bz2 | |
Roll deps to pull in new third_party/WebKit
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/render_view_host.cc')
| -rw-r--r-- | chrome/browser/render_view_host.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/render_view_host.cc b/chrome/browser/render_view_host.cc index 389b6f3..db87871 100644 --- a/chrome/browser/render_view_host.cc +++ b/chrome/browser/render_view_host.cc @@ -1206,7 +1206,9 @@ void RenderViewHost::OnUnloadListenerChanged(bool has_listener) { } void RenderViewHost::NotifyRendererUnresponsive() { - if (is_waiting_for_unload_ack_) { + if (is_waiting_for_unload_ack_ && + !Singleton<CrossSiteRequestManager>()->HasPendingCrossSiteRequest( + process()->host_id(), routing_id_)) { // If the tab hangs in the beforeunload/unload handler there's really // nothing we can do to recover. Pretend the unload listeners have // all fired and close the tab. If the hang is in the beforeunload handler |