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

Side by Side Diff: chrome/renderer/prerender/prerender_dispatcher.cc

Issue 113803003: Add <link rel=next> support to prerender. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix memory leak Created 6 years, 10 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/prerender_types.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/prerender/prerender_dispatcher.h" 5 #include "chrome/renderer/prerender/prerender_dispatcher.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/common/prerender_messages.h" 8 #include "chrome/common/prerender_messages.h"
9 #include "chrome/common/prerender_types.h"
9 #include "chrome/renderer/prerender/prerender_extra_data.h" 10 #include "chrome/renderer/prerender/prerender_extra_data.h"
10 #include "content/public/common/referrer.h" 11 #include "content/public/common/referrer.h"
11 #include "content/public/renderer/render_thread.h" 12 #include "content/public/renderer/render_thread.h"
12 #include "content/public/renderer/render_view.h" 13 #include "content/public/renderer/render_view.h"
13 #include "third_party/WebKit/public/platform/WebPrerenderingSupport.h" 14 #include "third_party/WebKit/public/platform/WebPrerenderingSupport.h"
14 #include "third_party/WebKit/public/platform/WebString.h" 15 #include "third_party/WebKit/public/platform/WebString.h"
15 #include "third_party/WebKit/public/platform/WebURL.h" 16 #include "third_party/WebKit/public/platform/WebURL.h"
16 #include "url/gurl.h" 17 #include "url/gurl.h"
17 18
18 namespace prerender { 19 namespace prerender {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 void PrerenderDispatcher::add(const WebPrerender& prerender) { 111 void PrerenderDispatcher::add(const WebPrerender& prerender) {
111 const PrerenderExtraData& extra_data = 112 const PrerenderExtraData& extra_data =
112 PrerenderExtraData::FromPrerender(prerender); 113 PrerenderExtraData::FromPrerender(prerender);
113 if (prerenders_.count(extra_data.prerender_id()) != 0) { 114 if (prerenders_.count(extra_data.prerender_id()) != 0) {
114 // TODO(gavinp): Determine why these apparently duplicate adds occur. 115 // TODO(gavinp): Determine why these apparently duplicate adds occur.
115 return; 116 return;
116 } 117 }
117 118
118 prerenders_[extra_data.prerender_id()] = prerender; 119 prerenders_[extra_data.prerender_id()] = prerender;
119 120
121 PrerenderAttributes attributes;
122 attributes.url = GURL(prerender.url());
123 attributes.rel_types = prerender.relTypes();
124
120 content::RenderThread::Get()->Send(new PrerenderHostMsg_AddLinkRelPrerender( 125 content::RenderThread::Get()->Send(new PrerenderHostMsg_AddLinkRelPrerender(
121 extra_data.prerender_id(), GURL(prerender.url()), 126 extra_data.prerender_id(), attributes,
122 content::Referrer(GURL(prerender.referrer()), 127 content::Referrer(GURL(prerender.referrer()),
123 prerender.referrerPolicy()), 128 prerender.referrerPolicy()),
124 extra_data.size(), extra_data.render_view_route_id())); 129 extra_data.size(), extra_data.render_view_route_id()));
125 } 130 }
126 131
127 void PrerenderDispatcher::cancel(const WebPrerender& prerender) { 132 void PrerenderDispatcher::cancel(const WebPrerender& prerender) {
128 const PrerenderExtraData& extra_data = 133 const PrerenderExtraData& extra_data =
129 PrerenderExtraData::FromPrerender(prerender); 134 PrerenderExtraData::FromPrerender(prerender);
130 content::RenderThread::Get()->Send( 135 content::RenderThread::Get()->Send(
131 new PrerenderHostMsg_CancelLinkRelPrerender(extra_data.prerender_id())); 136 new PrerenderHostMsg_CancelLinkRelPrerender(extra_data.prerender_id()));
(...skipping 10 matching lines...) Expand all
142 content::RenderThread::Get()->Send( 147 content::RenderThread::Get()->Send(
143 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id())); 148 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id()));
144 // The browser will not send an OnPrerenderStop (the prerender may have even 149 // The browser will not send an OnPrerenderStop (the prerender may have even
145 // been canceled before it was started), so release it to avoid a 150 // been canceled before it was started), so release it to avoid a
146 // leak. Moreover, if it did, the PrerenderClient in Blink will have been 151 // leak. Moreover, if it did, the PrerenderClient in Blink will have been
147 // detached already. 152 // detached already.
148 prerenders_.erase(extra_data.prerender_id()); 153 prerenders_.erase(extra_data.prerender_id());
149 } 154 }
150 155
151 } // namespace prerender 156 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/common/prerender_types.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698