summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/prerender/prerender_manager.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index c87dfb3..7f3dd2b 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -545,12 +545,6 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents,
return false;
}
- if (prerender_contents->starting_page_id() <=
- tab_contents->GetMaxPageID()) {
- prerender_contents.release()->Destroy(FINAL_STATUS_PAGE_ID_CONFLICT);
- return false;
- }
-
// If we are just in the control group (which can be detected by noticing
// that prerendering hasn't even started yet), record that |tab_contents| now
// would be showing a prerendered contents, but otherwise, don't do anything.
@@ -559,6 +553,12 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents,
return false;
}
+ if (prerender_contents->starting_page_id() <=
+ tab_contents->GetMaxPageID()) {
+ prerender_contents.release()->Destroy(FINAL_STATUS_PAGE_ID_CONFLICT);
+ return false;
+ }
+
int child_id, route_id;
CHECK(prerender_contents->GetChildId(&child_id));
CHECK(prerender_contents->GetRouteId(&route_id));