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

chrome/browser/prerender/prerender_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #pragma once
 
 #include <list>
+#include <map>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "googleurl/src/gurl.h"
 
@@ skipping 31 matching lines @@
 
   // Owned by a Profile object for the lifetime of the profile.
   explicit PrerenderManager(Profile* profile);
 
   // Preloads the URL supplied.  alias_urls indicates URLs that redirect
   // to the same URL to be preloaded. Returns true if the URL was added,
   // false if it was not.
   bool AddPreload(const GURL& url, const std::vector<GURL>& alias_urls,
                   const GURL& referrer);
 
+  void AddPendingPreload(int child_id, int route_id, const GURL& url,
+                         const std::vector<GURL>& alias_urls,
+                         const GURL& referrer);
+
   // For a given TabContents that wants to navigate to the URL supplied,
   // determines whether a preloaded version of the URL can be used,
   // and substitutes the prerendered RVH into the TabContents.  Returns
   // whether or not a prerendered RVH could be used or not.
   bool MaybeUsePreloadedPage(TabContents* tc, const GURL& url);
 
   // Allows PrerenderContents to remove itself when prerendering should
   // be cancelled.
   void RemoveEntry(PrerenderContents* entry);
 
@@ skipping 58 matching lines @@
 
   // Finds the specified PrerenderContents and returns it, if it exists.
   // Returns NULL otherwise.  Unlike GetEntry, the PrerenderManager maintains
   // ownership of the PrerenderContents.
   PrerenderContents* FindEntry(const GURL& url);
 
   static bool ShouldRecordWindowedPPLT();
 
   static void RecordPrefetchTagObservedOnUIThread();
 
+  // Called when removing a preload to ensure we clean up any pending preloads
+  // that might remain in the map.
+  void RemovePendingPreload(PrerenderContents* entry);
+
   Profile* profile_;
 
   base::TimeDelta max_prerender_age_;
   unsigned int max_elements_;
 
   // List of prerendered elements.
   std::list<PrerenderContentsData> prerender_list_;
 
   // Set of TabContents which are currently displaying a prerendered page.
   base::hash_set<TabContents*> prerendered_tc_set_;
 
+  struct PendingContentsData {
+    PendingContentsData(int child_id, int route_id,
+                        const GURL& url, const std::vector<GURL>& alias_urls,
+                        const GURL& referrer)
+        : child_id_(child_id), route_id_(route_id),
+          url_(url), alias_urls_(alias_urls), referrer_(referrer) { }
+    ~PendingContentsData() {}
+    int child_id_;
+    int route_id_;
+    GURL url_;
+    std::vector<GURL> alias_urls_;
+    GURL referrer_;

[cbentzel, 2011/03/14 18:06:13]

It looks like default copy-constructor will work correctly here, since needed. 

+  };
+
+  typedef std::vector<PendingContentsData> PendingPrerenderList;
+  PendingPrerenderList pending_prerender_list_;

[cbentzel, 2011/03/14 18:06:13]

Why not map of pair<child_id, route_id> to vector<PendingContents> where
PendingContents has url_, alias_urls_, referrer? That would preserve ordering.

[dominich, 2011/03/14 19:42:34]

Done.

+
   // Default maximum permitted elements to prerender.
   static const unsigned int kDefaultMaxPrerenderElements = 1;
 
   // Default maximum age a prerendered element may have, in seconds.
   static const int kDefaultMaxPrerenderAgeSeconds = 20;
 
   // Time window for which we will record windowed PLT's from the last
   // observed link rel=prefetch tag.
   static const int kWindowedPPLTSeconds = 30;
 
@@ skipping 13 matching lines @@
   // RepeatingTimer to perform periodic cleanups of pending prerendered
   // pages.
   base::RepeatingTimer<PrerenderManager> repeating_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_