Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3970)

Unified Diff: chrome/browser/prerender/prerender_manager.cc

Issue 7065043: For PPLT recording, fix order of checks so that matched PPLT for the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698