Broadcast prerender URLs to all render processes.

chrome/renderer/prerender/prerender_dispatcher.cc

 // 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.
 
 #include "chrome/renderer/prerender/prerender_dispatcher.h"
 
 #include "base/logging.h"
 #include "chrome/common/prerender_messages.h"
 #include "chrome/renderer/prerender/prerender_extra_data.h"
 #include "content/public/common/referrer.h"
@@ skipping 25 matching lines @@
   DCHECK_NE(0u, prerenders_.count(prerender_id));
   std::map<int, WebPrerender>::iterator it = prerenders_.find(prerender_id);
 
   WebPrerender& prerender = it->second;
 
   // The prerender should only be null in unit tests.
   if (prerender.isNull())
     return;
 
   prerender.didStartPrerender();
-  OnPrerenderAddAlias(prerender_id, prerender.url());
 }
 
 void PrerenderDispatcher::OnPrerenderStopLoading(int prerender_id) {
   DCHECK_NE(0u, prerenders_.count(prerender_id));
   std::map<int, WebPrerender>::iterator it = prerenders_.find(prerender_id);
 
   WebPrerender& prerender = it->second;
   DCHECK(!prerender.isNull())
       << "OnPrerenderStopLoading shouldn't be called from a unit test, the only"
       << "context in which a WebPrerender in the dispatcher can be null.";
 
   prerender.didSendLoadForPrerender();
 }
 
-void PrerenderDispatcher::OnPrerenderAddAlias(int prerender_id,
-                                              const GURL& url) {
-  DCHECK_NE(0u, prerenders_.count(prerender_id));
-  running_prerender_urls_.insert(
-      std::multimap<GURL, int>::value_type(url, prerender_id));
+void PrerenderDispatcher::OnPrerenderAddAlias(const GURL& alias) {

[gavinp, 2013/05/13 16:30:27]

Initially I wanted to ask for:

DCHECK_LT(0, prerenders_);

I guess this doesn't work because of browser initiated prerenders? Bummer.

[cbentzel, 2013/05/13 22:33:05]

Yes, that's why it doesn't work.

+  running_prerender_urls_.insert(alias);
+}
+
+void PrerenderDispatcher::OnPrerenderRemoveAliases(
+    const std::vector<GURL>& aliases) {
+  for (size_t i = 0; i < aliases.size(); ++i) {
+    std::multiset<GURL>::iterator it = running_prerender_urls_.find(aliases[i]);
+    if (it != running_prerender_urls_.end()) {
+      running_prerender_urls_.erase(it);
+    }
+  }
 }
 
 void PrerenderDispatcher::OnPrerenderStop(int prerender_id) {
   DCHECK_NE(0u, prerenders_.count(prerender_id));
   WebPrerender& prerender = prerenders_[prerender_id];
 
   // The prerender should only be null in unit tests.
   if (!prerender.isNull())
     prerender.didStopPrerender();
 
   // TODO(cbentzel): We'd also want to send the map of active prerenders when
   // creating a new render process, so the Add/Remove go relative to that.
   // This may not be that big of a deal in practice, since the newly created tab
   // is unlikely to go to the prerendered page.
   prerenders_.erase(prerender_id);
-
-  std::multimap<GURL, int>::iterator it = running_prerender_urls_.begin();
-  while (it != running_prerender_urls_.end()) {
-    std::multimap<GURL, int>::iterator next = it;
-    ++next;
-
-    if (it->second == prerender_id)
-      running_prerender_urls_.erase(it);
-
-    it = next;
-  }
 }
 
 bool PrerenderDispatcher::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PrerenderDispatcher, message)
     IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStart, OnPrerenderStart)
     IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStopLoading,
                         OnPrerenderStopLoading)
     IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderAddAlias, OnPrerenderAddAlias)
+    IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderRemoveAliases,
+                        OnPrerenderRemoveAliases)
     IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStop, OnPrerenderStop)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void PrerenderDispatcher::add(const WebPrerender& prerender) {
   const PrerenderExtraData& extra_data =
       PrerenderExtraData::FromPrerender(prerender);
@@ skipping 19 matching lines @@
 }
 
 void PrerenderDispatcher::abandon(const WebPrerender& prerender) {
   const PrerenderExtraData& extra_data =
       PrerenderExtraData::FromPrerender(prerender);
   content::RenderThread::Get()->Send(
       new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id()));
 }
 
 }  // namespace prerender