Prerender/Instant interopability.

chrome/browser/prerender/prerender_contents.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/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/process_util.h"
@@ skipping 15 matching lines @@
 #include "chrome/common/icon_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_request_details.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "content/common/content_constants.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/mach_broker_mac.h"
 #endif
 
 namespace prerender {
 
@@ skipping 204 matching lines @@
 
   prerendering_has_started_ = true;
   TabContents* new_contents = new TabContents(profile_, NULL, MSG_ROUTING_NONE,
                                               NULL, NULL);
   prerender_contents_.reset(new TabContentsWrapper(new_contents));
   tab_contents_observer_registrar_.Observe(new_contents);
 
   TabContents* source_tc =
       source_render_view_host->delegate()->GetAsTabContents();
   if (source_tc) {
-    // So that history merging will work, get the max page ID
-    // of the old page, and add a safety margin of 10 to it (for things
-    // such as redirects).
-    int32 max_page_id = source_tc->GetMaxPageID();
-    if (max_page_id != -1) {
-      prerender_contents_->controller().set_max_restored_page_id(
-          max_page_id + 10);
-    }
+    // So that history merging will work, set the max page ID to one greater
+    // than the largest we can ever have. This allows for redirects, but also
+    // for any tabs the user may open between us rendering this page and
+    // swapping it in.
+    prerender_contents_->controller().set_max_restored_page_id(
+        content::kMaxSessionHistoryEntries + 1);
 
     tab_contents_delegate_.reset(new TabContentsDelegateImpl(this));
     new_contents->set_delegate(tab_contents_delegate_.get());
 
     // Set the size of the new TC to that of the old TC.
     gfx::Rect tab_bounds;
     source_tc->view()->GetContainerBounds(&tab_bounds);
     prerender_contents_->view()->SizeContents(tab_bounds.size());
   }
 
@@ skipping 525 matching lines @@
   }
   return render_view_host_;
 }
 
 void PrerenderContents::CommitHistory(TabContents* tc) {
   if (tab_contents_delegate_.get())
     tab_contents_delegate_->CommitHistory(tc);
 }
 
 }  // namespace prerender