Merge of 97624 to 835 branch.

content/browser/tab_contents/tab_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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 353 matching lines @@
   // testing.
   if (GetSiteInstance())
     GetSiteInstance()->UpdateMaxPageID(page_id);
   GetRenderProcessHost()->UpdateMaxPageID(page_id);
 }
 
 SiteInstance* TabContents::GetSiteInstance() const {
   return render_manager_.current_host()->site_instance();
 }
 
+SiteInstance* TabContents::GetPendingSiteInstance() const {
+  RenderViewHost* dest_rvh = render_manager_.pending_render_view_host() ?
+      render_manager_.pending_render_view_host() :
+      render_manager_.current_host();
+  return dest_rvh->site_instance();
+}
+
 bool TabContents::ShouldDisplayURL() {
   // Don't hide the url in view source mode and with interstitials.
   NavigationEntry* entry = controller_.GetActiveEntry();
   if (entry && (entry->IsViewSourceMode() ||
                 entry->page_type() == INTERSTITIAL_PAGE)) {
     return true;
   }
 
   // We always display the URL for non-WebUI URLs to prevent spoofing.
   if (entry && !content::WebUIFactory::Get()->HasWebUIScheme(entry->url()))
@@ skipping 193 matching lines @@
   FOR_EACH_OBSERVER(TabContentsObserver,
                     observers_,
                     NavigateToPendingEntry(entry.url(), reload_type));
 
   if (delegate_)
     delegate_->DidNavigateToPendingEntry(this);
 
   return true;
 }
 
-void TabContents::SetHistoryLengthAndClear(int history_length) {
+void TabContents::SetHistoryLengthAndPrune(const SiteInstance* site_instance,
+                                           int history_length,
+                                           int32 minimum_page_id) {
+  // SetHistoryLengthAndPrune doesn't handle pending cross-site navigations
+  // cleanly. Since it's only used when swapping in instant and prerendered
+  // TabContents, checks are done at a higher level to ensure that the pages
+  // are not swapped in during this case.
+  if (render_manager_.pending_render_view_host()) {
+    NOTREACHED();
+    return;
+  }
   RenderViewHost* rvh = render_view_host();
-  if (!rvh)
+  if (!rvh) {
+    NOTREACHED();
     return;
-  rvh->Send(new ViewMsg_SetHistoryLengthAndClear(rvh->routing_id(),
-                                                 history_length));
+  }
+  if (site_instance && rvh->site_instance() != site_instance) {
+    NOTREACHED();
+    return;
+  }
+  rvh->Send(new ViewMsg_SetHistoryLengthAndPrune(rvh->routing_id(),
+                                                 history_length,
+                                                 minimum_page_id));
 }
 
 void TabContents::Stop() {
   render_manager_.Stop();
   FOR_EACH_OBSERVER(TabContentsObserver, observers_, StopNavigation());
 }
 
 TabContents* TabContents::Clone() {
   // We create a new SiteInstance so that the new tab won't share processes
   // with the old one. This can be changed in the future if we need it to share
@@ skipping 1280 matching lines @@
 }
 
 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
   render_manager_.SwapInRenderViewHost(rvh);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }