Separate same domain and cross domain <link rel=...> prerenders for reporting.

chrome/browser/prerender/prerender_manager.h

 // Copyright (c) 2012 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_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 183 matching lines @@
 
   // Maintaining and querying the set of WebContents belonging to this
   // PrerenderManager that are currently showing prerendered pages.
   void MarkWebContentsAsPrerendered(content::WebContents* web_contents,
                                     Origin origin);
 
   void MarkWebContentsAsWouldBePrerendered(content::WebContents* web_contents);
   void MarkWebContentsAsNotPrerendered(content::WebContents* web_contents);
 
   // Returns true if |web_contents| is being prerendered. The optional parameter
-  // |origin| is an output parameter which, if a prerender is found, is set to
-  // the Origin of the prerender of |web_contents|.
+  // |origin| is an output parameter which if passed non-null is set to point
+  // to the Origin of that prerender if one is found, NULL otherwise.
   bool IsWebContentsPrerendered(content::WebContents* web_contents,
-                                Origin* origin) const;
+                                const Origin** origin) const;

[dominich, 2012/10/08 17:03:04]

this can stay as Origin* and still be optional and NULLable.

[gavinp, 2012/10/08 17:09:36]

 Yes. Bad merge/rebase; I'll fix and reupload.

 
   bool WouldWebContentsBePrerendered(content::WebContents* web_contents) const;
 
   // Checks whether |url| has been recently navigated to.
   bool HasRecentlyBeenNavigatedTo(Origin origin, const GURL& url);
 
   // Returns true if the method given is invalid for prerendering.
   static bool IsValidHttpMethod(const std::string& method);
 
   // Returns a Value object containing the active pages being prerendered, and
@@ skipping 277 matching lines @@
   // List of all pending prerenders.
   std::list<linked_ptr<PrerenderData> > pending_prerender_list_;
 
   // List of recent navigations in this profile, sorted by ascending
   // navigate_time_.
   std::list<NavigationRecord> navigations_;
 
   // List of prerender elements to be deleted
   std::list<PrerenderContents*> pending_delete_list_;
 
-  // This map is from all WebContents which are currently displaying a
-  // prerendered page which has already been swapped in to a
-  // PrerenderedWebContentsData for tracking full lifetime information
-  // on prerenders.
+  // Set of WebContents which are currently displaying a prerendered page.
   base::hash_map<content::WebContents*, PrerenderedWebContentsData>
       prerendered_web_contents_data_;
 
   // WebContents that would have been swapped out for a prerendered WebContents
   // if the user was not part of the control group for measurement. When the
   // WebContents gets a provisional load, the WebContents is removed from
   // the map since the new navigation would not have swapped in a prerender.
   // However, one complication exists because the first provisional load after
   // the WebContents is marked as "Would Have Been Prerendered" is actually to
   // the prerendered location. So, we need to keep a boolean around that does
@@ skipping 33 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 PrerenderManager* FindPrerenderManagerUsingRenderProcessId(
     int render_process_id);
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_