Prerendering for redirects -- part 2....

chrome/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 "chrome/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 1617 matching lines @@
       NotificationType::FRAME_PROVISIONAL_LOAD_START,
       Source<NavigationController>(&controller_),
       Details<ProvisionalLoadDetails>(&details));
   if (is_main_frame) {
     // If we're displaying a network error page do not reset the content
     // settings delegate's cookies so the user has a chance to modify cookie
     // settings.
     if (!is_error_page)
       content_settings_delegate_->ClearCookieSpecificContentSettings();
     content_settings_delegate_->ClearGeolocationContentSettings();
+
+    // Check if the URL we are about to load has been prerendered by any chance,
+    // and use it if possible.
+    MaybeUsePreloadedPage(url);
   }
 }
 
 void TabContents::OnDidRedirectProvisionalLoad(int32 page_id,
                                                const GURL& source_url,
                                                const GURL& target_url) {
   NavigationEntry* entry;
   if (page_id == -1)
     entry = controller_.pending_entry();
   else
     entry = controller_.GetEntryWithPageID(GetSiteInstance(), page_id);
   if (!entry || entry->url() != source_url)
     return;
   entry->set_url(target_url);
+
+  // Check if the URL we are about to load has been prerendered by any chance,
+  // and use it if possible.
+  MaybeUsePreloadedPage(target_url);
 }
 
 void TabContents::OnDidFailProvisionalLoadWithError(
     int64 frame_id,
     bool is_main_frame,
     int error_code,
     const GURL& url,
     bool showing_repost_interstitial) {
   VLOG(1) << "Failed Provisional Load: " << url.possibly_invalid_spec()
           << ", error_code: " << error_code
@@ skipping 894 matching lines @@
       Source<TabContents>(this),
       Details<RenderViewHost>(rvh));
   render_manager_.RenderViewDeleted(rvh);
 }
 
 void TabContents::DidNavigate(RenderViewHost* rvh,
                               const ViewHostMsg_FrameNavigate_Params& params) {
   int extra_invalidate_flags = 0;
 
   if (PageTransition::IsMainFrame(params.transition)) {
-    PrerenderManager* pm = profile()->GetPrerenderManager();
-    if (pm != NULL) {
-      if (pm->MaybeUsePreloadedPage(this, params.url)) {
-        // TODO(tburkard): If the preloaded page has not finished preloading
-        // yet, we should not do this.
-        DidStopLoading();
-        return;
-      }
+    if (MaybeUsePreloadedPage(params.url)) {
+      return;
     }
 
     bool was_bookmark_bar_visible = ShouldShowBookmarkBar();
 
     render_manager_.DidNavigateMainFrame(rvh);
 
     if (was_bookmark_bar_visible != ShouldShowBookmarkBar())
       extra_invalidate_flags |= INVALIDATE_BOOKMARK_BAR;
   }
 
@@ skipping 787 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());
 }
+
+bool TabContents::MaybeUsePreloadedPage(const GURL& url) {
+  PrerenderManager* pm = profile()->GetPrerenderManager();
+  if (pm != NULL) {
+    if (pm->MaybeUsePreloadedPage(this, url)) {
+      // TODO(tburkard): If the preloaded page has not finished preloading
+      // yet, we should not do this.
+      DidStopLoading();
+      return true;
+    }
+  }
+  return false;
+}