Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5485)

Unified Diff: chrome/renderer/prerender/prerender_dispatcher.cc

Issue 11459003: Add Start/Stop event signalling on Prerenders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: one last test Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/prerender/prerender_dispatcher.cc
diff --git a/chrome/renderer/prerender/prerender_dispatcher.cc b/chrome/renderer/prerender/prerender_dispatcher.cc
index 013ca9ab5c408e887e5c384c869a2b96db1338d6..d9c4b93c3e86c834bee8658608e3293f61e84b6b 100644
--- a/chrome/renderer/prerender/prerender_dispatcher.cc
+++ b/chrome/renderer/prerender/prerender_dispatcher.cc
@@ -34,10 +34,16 @@ bool PrerenderDispatcher::IsPrerenderURL(const GURL& url) const {
void PrerenderDispatcher::OnPrerenderStart(int prerender_id) {
DCHECK_NE(0u, prerenders_.count(prerender_id));
- std::map<int, GURL>::iterator it = prerenders_.find(prerender_id);
- const GURL& url = it->second;
- running_prerender_urls_.insert(
- std::multimap<GURL, int>::value_type(url, 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::OnPrerenderAddAlias(int prerender_id,
@@ -49,6 +55,11 @@ void PrerenderDispatcher::OnPrerenderAddAlias(int prerender_id,
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.
@@ -81,25 +92,26 @@ bool PrerenderDispatcher::OnControlMessageReceived(
return handled;
}
-void PrerenderDispatcher::add(const WebKit::WebPrerender& prerender) {
+void PrerenderDispatcher::add(const WebPrerender& prerender) {
const PrerenderExtraData& extra_data =
PrerenderExtraData::FromPrerender(prerender);
- prerenders_[extra_data.prerender_id()] = prerender.url();
+ prerenders_[extra_data.prerender_id()] = prerender;
content::RenderThread::Get()->Send(new PrerenderHostMsg_AddLinkRelPrerender(
extra_data.prerender_id(), GURL(prerender.url()),
- content::Referrer(GURL(prerender.referrer()), prerender.referrerPolicy()),
+ content::Referrer(GURL(prerender.referrer()),
+ prerender.referrerPolicy()),
extra_data.size(), extra_data.render_view_route_id()));
}
-void PrerenderDispatcher::cancel(const WebKit::WebPrerender& prerender) {
+void PrerenderDispatcher::cancel(const WebPrerender& prerender) {
const PrerenderExtraData& extra_data =
PrerenderExtraData::FromPrerender(prerender);
content::RenderThread::Get()->Send(
new PrerenderHostMsg_CancelLinkRelPrerender(extra_data.prerender_id()));
}
-void PrerenderDispatcher::abandon(const WebKit::WebPrerender& prerender) {
+void PrerenderDispatcher::abandon(const WebPrerender& prerender) {
const PrerenderExtraData& extra_data =
PrerenderExtraData::FromPrerender(prerender);
content::RenderThread::Get()->Send(
« no previous file with comments | « chrome/renderer/prerender/prerender_dispatcher.h ('k') | chrome/renderer/prerender/prerender_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698