Do not filter IPC messages until the new RVH commits, to avoid a race.

content/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 315 matching lines @@
     // handler.
     is_waiting_for_beforeunload_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::SwapOut(int new_render_process_host_id,
                              int new_request_id) {
-  // Start filtering IPC messages to avoid confusing the delegate.  This will
-  // prevent any dialogs from appearing during unload handlers, but we've
-  // already decided to silence them in crbug.com/68780.  We will set it back
-  // to false in SetNavigationsSuspended if we swap back in.

[battre, 2012/01/26 16:49:40]

Has the situation changed for crbug.com/68780 ("Disallow
alert/confirm/prompt/showModalDialog calls issued from within an unload
handler")? In the diagram you sent me, we would still receive IPCs between
RHV::OnSwapOut and RDH::OnSwapOutAck.

You introduced these lines in http://codereview.chromium.org/6319001 but I don't
see a specific unit test for these kind of race conditions.

[Charlie Reis, 2012/01/26 17:03:16]

That situation has not changed, but I view this as an improvement.  Before
removing this code, we couldn't allow dialogs during unload even if we wanted
to.  Now, it's a policy decision for bug 68780.  I'm glad that we still disallow
them, but now it's at least possible to change that decision.

As mentioned above, the test for this race is in my other CL for 93427.

-  is_swapped_out_ = true;
-
   // This will be set back to false in OnSwapOutACK, just before we replace
   // this RVH with the pending RVH.
   is_waiting_for_unload_ack_ = true;
   // Start the hang monitor in case the renderer hangs in the unload handler.
   StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
   ViewMsg_SwapOut_Params params;
   params.closing_process_id = process()->GetID();
   params.closing_route_id = routing_id();
   params.new_render_process_host_id = new_render_process_host_id;
@@ skipping 12 matching lines @@
   // Stop the hang monitor now that the unload handler has finished.
   StopHangMonitorTimeout();
   is_waiting_for_unload_ack_ = false;
   delegate_->SwappedOut(this);
 }
 
 void RenderViewHost::WasSwappedOut() {
   // Don't bother reporting hung state anymore.
   StopHangMonitorTimeout();
 
+  // Now that we're no longer the active RVH in the tab, start filtering out
+  // most IPC messages.  Usually the renderer will have stopped sending
+  // messages as of OnSwapOutACK.  However, we may have timed out waiting
+  // for that message, and additional IPC messages may keep streaming in.
+  // We filter them out, as long as that won't cause problems (e.g., we
+  // still allow synchronous messages through).
+  is_swapped_out_ = true;
+
   // Inform the renderer that it can exit if no one else is using it.
   Send(new ViewMsg_WasSwappedOut(routing_id()));
 }
 
 void RenderViewHost::ClosePage() {
   // Start the hang monitor in case the renderer hangs in the unload handler.
   is_waiting_for_unload_ack_ = true;
   StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
 
   if (IsRenderViewLive()) {
@@ skipping 1161 matching lines @@
 
 void RenderViewHost::OnWebUISend(const GURL& source_url,
                                  const std::string& name,
                                  const base::ListValue& args) {
   delegate_->WebUISend(this, source_url, name, args);
 }
 
 void RenderViewHost::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }