diff options
author | tburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 22:44:22 +0000 |
---|---|---|
committer | tburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 22:44:22 +0000 |
commit | 532532845be28265b628e63cae9da3435699c9e1 (patch) | |
tree | 7e71fe597a876046e40c67f95915c032a6e2fd21 /chrome/browser/prerender/prerender_manager.cc | |
parent | 894586ee6cb894f9cf78fe054b36753ecd16995e (diff) | |
download | chromium_src-532532845be28265b628e63cae9da3435699c9e1.zip chromium_src-532532845be28265b628e63cae9da3435699c9e1.tar.gz chromium_src-532532845be28265b628e63cae9da3435699c9e1.tar.bz2 |
For PPLT recording, fix order of checks so that matched PPLT for the
control group are recorded properly.
Review URL: http://codereview.chromium.org/7065043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_manager.cc')
-rw-r--r-- | chrome/browser/prerender/prerender_manager.cc | 12 |
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)); |