Add PrerenderStatusEvent on Prerenders

chrome/browser/prerender/prerender_manager.cc

Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index b33554a8f7dd19c5082e0f6f1284034b52ec1dc5..d6f043727eb2cb7d3d77f2927f0af392c5697f86 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -212,6 +212,7 @@ void PrerenderManager::Shutdown() {
 
 PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender(
     int process_id,
+    int prerender_id,
     int route_id,
     const GURL& url,
     const content::Referrer& referrer,
@@ -227,8 +228,8 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender(
     // Instead of prerendering from inside of a running prerender, we will defer
     // this request until its launcher is made visible.
     if (PrerenderContents* contents = parent_prerender_data->contents_) {
-      pending_prerender_list_.push_back(
-          linked_ptr<PrerenderData>(new PrerenderData(this)));
+      pending_prerender_list_.push_back(linked_ptr<PrerenderData>(
+          new PrerenderData(this)));
       PrerenderHandle* prerender_handle =
           new PrerenderHandle(pending_prerender_list_.back().get());
       contents->AddPendingPrerender(
@@ -256,7 +257,7 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender(
   }
 
   return AddPrerender(ORIGIN_LINK_REL_PRERENDER,
-                      process_id, url, referrer, size,
+                      process_id, prerender_id, url, referrer, size,

[dominich, 2012/09/12 15:21:04]

I thought the PrerenderHandle work would remove the need for any arbitrary ids
like this. This feels like a step backwards in the API.

                       session_storage_namespace);
 #endif
 }
@@ -267,7 +268,7 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromOmnibox(
     const gfx::Size& size) {
   if (!IsOmniboxEnabled(profile_))
     return NULL;
-  return AddPrerender(ORIGIN_OMNIBOX, -1, url, content::Referrer(), size,
+  return AddPrerender(ORIGIN_OMNIBOX, -1, -1, url, content::Referrer(), size,

[dominich, 2012/09/12 15:21:04]

does this mean the renderer doesn't get informed about Omnibox prerenders? Is
that an issue?

                       session_storage_namespace);
 }
 
@@ -830,7 +831,7 @@ void PrerenderManager::StartPendingPrerender(
   DCHECK(process_id == -1 || session_storage_namespace);
 
   scoped_ptr<PrerenderHandle> swap_prerender_handle(AddPrerender(
-      origin, process_id, url, referrer, size, session_storage_namespace));
+      origin, process_id, -1, url, referrer, size, session_storage_namespace));

[mmenke, 2012/09/12 16:31:45]

Won't this break PrerenderMsg_StoppedPrerender?  We'll glom all pending
prerenders into a group with an id of -1, send multiple start events for it
(Which won't get passed on to WebKit), and then when one of them stops, we'll
delete them all, renderer-side, but keep them browser-side, while WebKit remains
happily oblivious.

   if (swap_prerender_handle.get()) {
     // AddPrerender has returned a new prerender handle to us. We want to make
     // |existing_prerender_handle| active, so swap the underlying PrerenderData
@@ -903,6 +904,7 @@ void PrerenderManager::DoShutdown() {
 PrerenderHandle* PrerenderManager::AddPrerender(
     Origin origin,
     int process_id,
+    int prerender_id,
     const GURL& url_arg,
     const content::Referrer& referrer,
     const gfx::Size& size,
@@ -987,7 +989,7 @@ PrerenderHandle* PrerenderManager::AddPrerender(
   gfx::Size contents_size =
       size.IsEmpty() ? config_.default_tab_bounds.size() : size;
 
-  prerender_contents->StartPrerendering(process_id, contents_size,
+  prerender_contents->StartPrerendering(process_id, prerender_id, contents_size,
                                         session_storage_namespace,
                                         control_group_behavior);