Add pending preloads indexed by routing id. Start preloading once we navigate.

chrome/browser/prerender/prerender_manager.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/prerender/prerender_manager.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 35 matching lines @@
 
 struct PrerenderManager::PrerenderContentsData {
   PrerenderContents* contents_;
   base::Time start_time_;
   PrerenderContentsData(PrerenderContents* contents, base::Time start_time)
       : contents_(contents),
         start_time_(start_time) {
   }
 };
 
+struct PrerenderManager::PendingContentsData {
+  PendingContentsData(const GURL& url, const std::vector<GURL>& alias_urls,
+                      const GURL& referrer)
+      : url_(url), alias_urls_(alias_urls), referrer_(referrer) { }
+  ~PendingContentsData() {}
+  GURL url_;
+  std::vector<GURL> alias_urls_;
+  GURL referrer_;
+};
+
+
 PrerenderManager::PrerenderManager(Profile* profile)
     : profile_(profile),
       max_prerender_age_(base::TimeDelta::FromSeconds(
           kDefaultMaxPrerenderAgeSeconds)),
       max_elements_(kDefaultMaxPrerenderElements),
       prerender_contents_factory_(PrerenderContents::CreateFactory()) {
 }
 
 PrerenderManager::~PrerenderManager() {
   while (!prerender_list_.empty()) {
@@ skipping 34 matching lines @@
   while (prerender_list_.size() > max_elements_) {
     data = prerender_list_.front();
     prerender_list_.pop_front();
     data.contents_->set_final_status(FINAL_STATUS_EVICTED);
     delete data.contents_;
   }
   StartSchedulingPeriodicCleanups();
   return true;
 }
 
+void PrerenderManager::AddPendingPreload(
+    const std::pair<int,int>& child_route_id_pair,
+    const GURL& url,
+    const std::vector<GURL>& alias_urls,
+    const GURL& referrer) {
+  PendingPrerenderList::iterator it =

[cbentzel, 2011/03/16 01:23:28]

Should this do FindPendingEntry(url) and early return, like AddPreload does?

+      pending_prerender_list_.find(child_route_id_pair);
+  if (it == pending_prerender_list_.end()) {
+    PendingPrerenderList::value_type el = std::make_pair(child_route_id_pair,
+                                            std::vector<PendingContentsData>());
+    it = pending_prerender_list_.insert(el).first;
+  }
+
+  it->second.push_back(PendingContentsData(url, alias_urls, referrer));
+}
+
 void PrerenderManager::DeleteOldEntries() {
   while (!prerender_list_.empty()) {
     PrerenderContentsData data = prerender_list_.front();
     if (IsPrerenderElementFresh(data.start_time_))
       return;
     prerender_list_.pop_front();
     data.contents_->set_final_status(FINAL_STATUS_TIMED_OUT);
     delete data.contents_;
   }
   if (prerender_list_.empty())
@@ skipping 28 matching lines @@
 
   RenderViewHost* rvh = pc->render_view_host();
   // RenderViewHosts in PrerenderContents start out hidden.
   // Since we are actually using it now, restore it.
   rvh->WasRestored();
   pc->set_render_view_host(NULL);
   rvh->Send(new ViewMsg_DisplayPrerenderedPage(rvh->routing_id()));
   tc->SwapInRenderViewHost(rvh);
   MarkTabContentsAsPrerendered(tc);
 
+  // See if we have any pending prerender requests for this routing id and start
+  // the preload if we do.
+  std::pair<int, int> child_route_pair = std::make_pair(rvh->process()->id(),
+                                                        rvh->routing_id());
+  PendingPrerenderList::iterator pending_it =
+      pending_prerender_list_.find(child_route_pair);
+  if (pending_it != pending_prerender_list_.end()) {
+    for (std::vector<PendingContentsData>::iterator content_it =
+            pending_it->second.begin();
+         content_it != pending_it->second.end(); ++content_it) {
+      AddPreload(content_it->url_, content_it->alias_urls_,
+                 content_it->referrer_);
+    }
+    pending_prerender_list_.erase(pending_it);
+  }
+
   ViewHostMsg_FrameNavigate_Params* p = pc->navigate_params();
   if (p != NULL)
     tc->DidNavigate(rvh, *p);
 
   string16 title = pc->title();
   if (!title.empty())
     tc->UpdateTitle(rvh, pc->page_id(), UTF16ToWideHack(title));
 
   GURL icon_url = pc->icon_url();
   if (!icon_url.is_empty())
     tc->fav_icon_helper().OnUpdateFavIconURL(pc->page_id(), icon_url);
 
   if (pc->has_stopped_loading())
     tc->DidStopLoading();
 
   return true;
 }
 
 void PrerenderManager::RemoveEntry(PrerenderContents* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
        it != prerender_list_.end();
        ++it) {
     if (it->contents_ == entry) {
+      RemovePendingPreload(entry);
       prerender_list_.erase(it);
       break;
     }
   }
   DeleteOldEntries();
 }
 
 base::Time PrerenderManager::GetCurrentTime() const {
   return base::Time::Now();
 }
@@ skipping 42 matching lines @@
   for (std::list<PrerenderContentsData>::iterator it = prerender_list_.begin();
        it != prerender_list_.end();
        ++it) {
     if (it->contents_->MatchesURL(url))
       return it->contents_;
   }
   // Entry not found.
   return NULL;
 }
 
+PrerenderManager::PendingContentsData*
+    PrerenderManager::FindPendingEntry(const GURL& url) {

[cbentzel, 2011/03/16 01:23:28]

This should be const [I noticed FindEntry wasn't, however].

+  for (PendingPrerenderList::iterator map_it = pending_prerender_list_.begin();
+       map_it != pending_prerender_list_.end();
+       ++map_it) {
+    for (std::vector<PendingContentsData>::iterator content_it =
+            map_it->second.begin();
+         content_it != map_it->second.end();
+         ++content_it) {
+      if (content_it->url_ == url)

[cbentzel, 2011/03/16 01:23:28]

This will probably want to match against alias urls as well. 

+        return &(*content_it);
+    }
+  }
+
+  return NULL;
+}
+
 // static
 void PrerenderManager::RecordPrefetchTagObserved() {
   // Ensure that we are in the UI thread, and post to the UI thread if
   // necessary.
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         NewRunnableFunction(
             &PrerenderManager::RecordPrefetchTagObservedOnUIThread));
   } else {
     RecordPrefetchTagObservedOnUIThread();
   }
 }
 
 // static
 void PrerenderManager::RecordPrefetchTagObservedOnUIThread() {
   // Once we get here, we have to be on the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // If we observe multiple tags within the 30 second window, we will still
   // reset the window to begin at the most recent occurrence, so that we will
   // always be in a window in the 30 seconds from each occurrence.
   last_prefetch_seen_time_ = base::TimeTicks::Now();
 }
 
+void PrerenderManager::RemovePendingPreload(PrerenderContents* entry) {
+  RenderViewHost* rvh = entry->render_view_host();
+
+  // If the entry doesn't have a RenderViewHost then it didn't start
+  // prerendering and there shouldn't be any pending preloads to remove.
+  if (rvh == NULL)
+    return;
+
+  std::pair<int, int> child_route_pair = std::make_pair(rvh->process()->id(),
+                                                        rvh->routing_id());
+  pending_prerender_list_.erase(child_route_pair);
+}
+
 // static
 bool PrerenderManager::ShouldRecordWindowedPPLT() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (last_prefetch_seen_time_.is_null())
     return false;
   base::TimeDelta elapsed_time =
       base::TimeTicks::Now() - last_prefetch_seen_time_;
   return elapsed_time <= base::TimeDelta::FromSeconds(kWindowedPPLTSeconds);
 }
 
@@ skipping 34 matching lines @@
 
 void PrerenderManager::MarkTabContentsAsNotPrerendered(TabContents* tc) {
   prerendered_tc_set_.erase(tc);
 }
 
 bool PrerenderManager::IsTabContentsPrerendered(TabContents* tc) const {
   return prerendered_tc_set_.count(tc) > 0;
 }
 
 }  // namespace prerender