Merge 21531 - Fix a race condition where rapid back/forward clicks could clos...

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 2705 matching lines @@
     const std::string& data, PageSavingSerializationStatus status) {
   Send(new ViewHostMsg_SendSerializedHtmlData(routing_id_,
       frame_url, data, static_cast<int32>(status)));
 }
 
 void RenderView::OnMsgShouldClose() {
   bool should_close = webview()->ShouldClose();
   Send(new ViewHostMsg_ShouldClose_ACK(routing_id_, should_close));
 }
 
-void RenderView::OnClosePage(int new_render_process_host_id,
-                             int new_request_id) {
+void RenderView::OnClosePage(const ViewMsg_ClosePage_Params& params) {
   // TODO(creis): We'd rather use webview()->Close() here, but that currently
   // sets the WebView's delegate_ to NULL, preventing any JavaScript dialogs
   // in the onunload handler from appearing.  For now, we're bypassing that and
   // calling the FrameLoader's CloseURL method directly.  This should be
   // revisited to avoid having two ways to close a page.  Having a single way
   // to close that can run onunload is also useful for fixing
   // http://b/issue?id=753080.
   WebFrame* main_frame = webview()->GetMainFrame();
   if (main_frame) {
     const GURL& url = main_frame->GetURL();
     // TODO(davemoore) this code should be removed once WillCloseFrame() gets
     // called when a page is destroyed. DumpLoadHistograms() is safe to call
     // multiple times for the same frame, but it will simplify things.
-    if (url.SchemeIs("http") || url.SchemeIs("https"))
+    if (url.SchemeIs(chrome::kHttpScheme) || url.SchemeIs(chrome::kHttpsScheme))
       DumpLoadHistograms();
     main_frame->ClosePage();
   }
 
-  Send(new ViewHostMsg_ClosePage_ACK(routing_id_,
-                                     new_render_process_host_id,
-                                     new_request_id));
+  // Just echo back the params in the ACK.
+  Send(new ViewHostMsg_ClosePage_ACK(routing_id_, params));
 }
 
 void RenderView::OnThemeChanged() {
 #if defined(OS_WIN)
   gfx::NativeTheme::instance()->CloseHandles();
   gfx::Rect view_rect(0, 0, size_.width(), size_.height());
   didInvalidateRect(view_rect);
 #else  // defined(OS_WIN)
   // TODO(port): we don't support theming on non-Windows platforms yet
   NOTIMPLEMENTED();
@@ skipping 309 matching lines @@
     Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }