Reverting 21683.

chrome/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2009 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/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "app/resource_bundle.h"
@@ skipping 90 matching lines @@
       instance_(instance),
       delegate_(delegate),
       waiting_for_drag_context_response_(false),
       enabled_bindings_(0),
       pending_request_id_(0),
       modal_dialog_count_(0),
       navigations_suspended_(false),
       suspended_nav_message_(NULL),
       run_modal_reply_msg_(NULL),
       is_waiting_for_unload_ack_(false),
+      unload_ack_is_for_cross_site_transition_(false),
       are_javascript_messages_suppressed_(false),
       sudden_termination_allowed_(false),
       in_inspect_element_mode_(false) {
   DCHECK(instance_);
   DCHECK(delegate_);
   if (modal_dialog_event == NULL)
     modal_dialog_event = new base::WaitableEvent(true, false);
 
   modal_dialog_event_.reset(modal_dialog_event);
 
@@ skipping 172 matching lines @@
   DCHECK(navigations_suspended_ != suspend);
 
   navigations_suspended_ = suspend;
   if (!suspend && suspended_nav_message_.get()) {
     // There's a navigation message waiting to be sent.  Now that we're not
     // suspended anymore, resume navigation by sending it.
     Send(suspended_nav_message_.release());
   }
 }
 
-void RenderViewHost::FirePageBeforeUnload() {
+void RenderViewHost::FirePageBeforeUnload(bool for_cross_site_transition) {
   if (!IsRenderViewLive()) {
     // This RenderViewHost doesn't have a live renderer, so just skip running
     // the onbeforeunload handler.
+    is_waiting_for_unload_ack_ = true;  // Prevent check in OnMsgShouldCloseACK.
+    unload_ack_is_for_cross_site_transition_ = for_cross_site_transition;
     OnMsgShouldCloseACK(true);
     return;
   }
 
   // This may be called more than once (if the user clicks the tab close button
   // several times, or if she clicks the tab close button then the browser close
-  // button), so this test makes sure we only send the message once.
-  if (!is_waiting_for_unload_ack_) {
+  // button), and we only send the message once.
+  if (is_waiting_for_unload_ack_) {
+    // Some of our close messages could be for the tab, others for cross-site
+    // transitions. We always want to think it's for closing the tab if any
+    // of the messages were, since otherwise it might be impossible to close
+    // (if there was a cross-site "close" request pending when the user clicked
+    // the close button). We want to keep the "for cross site" flag only if
+    // both the old and the new ones are also for cross site.
+    unload_ack_is_for_cross_site_transition_ =
+        unload_ack_is_for_cross_site_transition_ && for_cross_site_transition;
+  } else {
     // Start the hang monitor in case the renderer hangs in the beforeunload
     // handler.
     is_waiting_for_unload_ack_ = true;
+    unload_ack_is_for_cross_site_transition_ = for_cross_site_transition;
     StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
     Send(new ViewMsg_ShouldClose(routing_id()));
   }
 }
 
 void RenderViewHost::ClosePage(bool for_cross_site_transition,
                                int new_render_process_host_id,
                                int new_request_id) {
   // Start the hang monitor in case the renderer hangs in the unload handler.
   is_waiting_for_unload_ack_ = true;
@@ skipping 1104 matching lines @@
     save_delegate->OnReceivedSerializedHtmlData(frame_url, data, status);
 }
 
 void RenderViewHost::OnMsgShouldCloseACK(bool proceed) {
   StopHangMonitorTimeout();
   DCHECK(is_waiting_for_unload_ack_);
   is_waiting_for_unload_ack_ = false;
 
   RenderViewHostDelegate::RendererManagement* management_delegate =
       delegate_->GetRendererManagementDelegate();
-  if (management_delegate)
-    management_delegate->ShouldClosePage(proceed);
+  if (management_delegate) {
+    management_delegate->ShouldClosePage(
+        unload_ack_is_for_cross_site_transition_, proceed);
+  }
 }
 
 void RenderViewHost::OnQueryFormFieldAutofill(const std::wstring& field_name,
                                               const std::wstring& user_text,
                                               int64 node_id,
                                               int request_id) {
   RenderViewHostDelegate::Autofill* autofill_delegate =
       delegate_->GetAutofillDelegate();
   if (autofill_delegate) {
     autofill_delegate->GetAutofillSuggestions(field_name, user_text,
@@ skipping 122 matching lines @@
 
 void RenderViewHost::SignalModalDialogEvent() {
   if (modal_dialog_count_++ == 0)
     modal_dialog_event_->Signal();
 }
 
 void RenderViewHost::ResetModalDialogEvent() {
  if (--modal_dialog_count_ == 0)
    modal_dialog_event_->Reset();
 }