Continue with crosssite navigations if alerts are suppressed

in an unload handler (i.e. we have an infinite-ish alert loop).
Review URL: http://codereview.chromium.org/9477

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4935 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 21 insertions, 6 deletions

diff --git a/chrome/browser/render_view_host.cc b/chrome/browser/render_view_host.cc
index 06958bd..6c127a7 100644
--- a/chrome/browser/render_view_host.cc
+++ b/chrome/browser/render_view_host.cc
@@ -88,7 +88,8 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       suspended_nav_message_(NULL),
       run_modal_reply_msg_(NULL),
       has_unload_listener_(false),
-      is_waiting_for_unload_ack_(false) {
+      is_waiting_for_unload_ack_(false),
+      are_javascript_messages_suppressed_(false) {
   DCHECK(instance_);
   DCHECK(delegate_);
   if (modal_dialog_event == NULL)
@@ -477,8 +478,14 @@ void RenderViewHost::CaptureThumbnail() {
 void RenderViewHost::JavaScriptMessageBoxClosed(IPC::Message* reply_msg,
                                                 bool success,
                                                 const std::wstring& prompt) {
-  if (is_waiting_for_unload_ack_)
+  if (is_waiting_for_unload_ack_) {
+    if (are_javascript_messages_suppressed_) {
+      delegate_->RendererUnresponsive(this, is_waiting_for_unload_ack_);
+      return;
+    }
+
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
+  }
 
   if (--modal_dialog_count_ == 0)
     ResetEvent(modal_dialog_event_.Get());
@@ -1046,7 +1053,8 @@ void RenderViewHost::OnMsgRunJavaScriptMessage(
   if (modal_dialog_count_++ == 0)
     SetEvent(modal_dialog_event_.Get());
   bool did_suppress_message = false;
-  delegate_->RunJavaScriptMessage(message, default_prompt, flags, reply_msg);
+  delegate_->RunJavaScriptMessage(message, default_prompt, flags, reply_msg,
+                                  &are_javascript_messages_suppressed_);
 }
 
 void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const std::wstring& message,
diff --git a/chrome/browser/render_view_host.h b/chrome/browser/render_view_host.h
index ed1bd29..ae0a729 100644
--- a/chrome/browser/render_view_host.h
+++ b/chrome/browser/render_view_host.h
@@ -582,6 +582,8 @@ class RenderViewHost : public RenderWidgetHost {
 
   bool is_waiting_for_unload_ack_;
 
+  bool are_javascript_messages_suppressed_;
+
   DISALLOW_EVIL_CONSTRUCTORS(RenderViewHost);
 };
 
diff --git a/chrome/browser/render_view_host_delegate.h b/chrome/browser/render_view_host_delegate.h
index 4dac6c7..27910d7 100644
--- a/chrome/browser/render_view_host_delegate.h
+++ b/chrome/browser/render_view_host_delegate.h
@@ -265,7 +265,8 @@ class RenderViewHostDelegate {
   virtual void RunJavaScriptMessage(const std::wstring& message,
                                     const std::wstring& default_prompt,
                                     const int flags,
-                                    IPC::Message* reply_msg) { }
+                                    IPC::Message* reply_msg,
+                                    bool* did_suppress_message) { }
 
   virtual void RunBeforeUnloadConfirm(const std::wstring& message,
                                       IPC::Message* reply_msg) { }
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc
index 507b33a..0c37ae0 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/web_contents.cc
@@ -1070,7 +1070,8 @@ void WebContents::RunJavaScriptMessage(
     const std::wstring& message,
     const std::wstring& default_prompt,
     const int flags,
-    IPC::Message* reply_msg) {
+    IPC::Message* reply_msg,
+    bool* did_suppress_message) {
   // Suppress javascript messages when requested and when inside a constrained
   // popup window (because that activates them and breaks them out of the
   // constrained window jail).
@@ -1078,6 +1079,8 @@ void WebContents::RunJavaScriptMessage(
   if (delegate())
     suppress_this_message |= delegate()->IsPopup(this);
 
+  *did_suppress_message = suppress_this_message;
+
   if (!suppress_this_message) {
     TimeDelta time_since_last_message(
         TimeTicks::Now() - last_javascript_message_dismissal_);
diff --git a/chrome/browser/web_contents.h b/chrome/browser/web_contents.h
index 267e546..8e06a1a 100644
--- a/chrome/browser/web_contents.h
+++ b/chrome/browser/web_contents.h
@@ -281,7 +281,8 @@ class WebContents : public TabContents,
   virtual void RunJavaScriptMessage(const std::wstring& message,
                                     const std::wstring& default_prompt,
                                     const int flags,
-                                    IPC::Message* reply_msg);
+                                    IPC::Message* reply_msg,
+                                    bool* did_suppress_message);
   virtual void RunBeforeUnloadConfirm(const std::wstring& message,
                                       IPC::Message* reply_msg);
   virtual void ShowModalHTMLDialog(const GURL& url, int width, int height,