| Index: chrome/browser/prerender/prerender_manager.cc
|
| ===================================================================
|
| --- chrome/browser/prerender/prerender_manager.cc (revision 86506)
|
| +++ chrome/browser/prerender/prerender_manager.cc (working copy)
|
| @@ -545,12 +545,6 @@
|
| 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 @@
|
| 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));
|
|
|