Ignore JavaScript messages (alert/confirm/prompt) during unload handlers.

chrome/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1926 matching lines @@
   dom_automation_controller_->set_message_sender(this);
   dom_automation_controller_->set_routing_id(routing_id_);
   dom_automation_controller_->BindToJavascript(frame,
                                                "domAutomationController");
 }
 
 bool RenderView::RunJavaScriptMessage(int type,
                                       const std::wstring& message,
                                       const std::wstring& default_value,
                                       const GURL& frame_url,
+                                      const bool unload_handler_being_run,
                                       std::wstring* result) {
   bool success = false;
   std::wstring result_temp;
   if (!result)
     result = &result_temp;
 
   SendAndRunNestedMessageLoop(new ViewHostMsg_RunJavaScriptMessage(
-      routing_id_, message, default_value, frame_url, type, &success, result));
+      routing_id_, message, default_value, frame_url, type,
+      unload_handler_being_run, &success, result));
   return success;
 }
 
 bool RenderView::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
   // Before WebKit asks us to show an alert (etc.), it takes care of doing the
   // equivalent of WebView::willEnterModalLoop.  In the case of showModalDialog
   // it is particularly important that we do not call willEnterModalLoop as
   // that would defer resource loads for the dialog itself.
   if (RenderThread::current())  // Will be NULL during unit tests.
     RenderThread::current()->DoNotNotifyWebKitOfModalLoop();
@@ skipping 430 matching lines @@
 
   return ScheduleFileChooser(ipc_params, chooser_completion);
 }
 
 void RenderView::runModalAlertDialog(
     WebFrame* frame, const WebString& message) {
   RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptAlert,
                        UTF16ToWideHack(message),
                        std::wstring(),
                        frame->url(),
+                       frame->pageDismissalEventBeingDispatched(),

[Charlie Reis, 2011/03/08 02:31:56]

It seems strange to me to thread a new parameter all the way over to the browser
process when we already know that we shouldn't show the message.  Couldn't we
intercept this here or even sooner and avoid calling RunJavaScriptMessage?

I think that would fix the broken behavior you describe for browser-initiated
navigations, too, since the browser wouldn't get confused about its current
state.

                        NULL);
 }
 
 bool RenderView::runModalConfirmDialog(
     WebFrame* frame, const WebString& message) {
   return RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptConfirm,
                               UTF16ToWideHack(message),
                               std::wstring(),
                               frame->url(),
+                              frame->pageDismissalEventBeingDispatched(),
                               NULL);
 }
 
 bool RenderView::runModalPromptDialog(
     WebFrame* frame, const WebString& message, const WebString& default_value,
     WebString* actual_value) {
   std::wstring result;
   bool ok = RunJavaScriptMessage(ui::MessageBoxFlags::kIsJavascriptPrompt,
                                  UTF16ToWideHack(message),
                                  UTF16ToWideHack(default_value),
                                  frame->url(),
+                                 frame->pageDismissalEventBeingDispatched(),
                                  &result);
   if (ok)
     actual_value->assign(WideToUTF16Hack(result));
   return ok;
 }
 
 bool RenderView::runModalBeforeUnloadDialog(
     WebFrame* frame, const WebString& message) {
   bool success = false;
   // This is an ignored return value, but is included so we can accept the same
@@ skipping 3276 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }