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

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

Issue 145073009: Revert of Add <link rel=next> support to prerender. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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"
10 #include "chrome/renderer/prerender/prerender_extra_data.h" 9 #include "chrome/renderer/prerender/prerender_extra_data.h"
11 #include "content/public/common/referrer.h" 10 #include "content/public/common/referrer.h"
12 #include "content/public/renderer/render_thread.h" 11 #include "content/public/renderer/render_thread.h"
13 #include "content/public/renderer/render_view.h" 12 #include "content/public/renderer/render_view.h"
14 #include "third_party/WebKit/public/platform/WebPrerenderingSupport.h" 13 #include "third_party/WebKit/public/platform/WebPrerenderingSupport.h"
15 #include "third_party/WebKit/public/platform/WebString.h" 14 #include "third_party/WebKit/public/platform/WebString.h"
16 #include "third_party/WebKit/public/platform/WebURL.h" 15 #include "third_party/WebKit/public/platform/WebURL.h"
17 #include "url/gurl.h" 16 #include "url/gurl.h"
18 17
19 namespace prerender { 18 namespace prerender {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 void PrerenderDispatcher::add(const WebPrerender& prerender) { 110 void PrerenderDispatcher::add(const WebPrerender& prerender) {
112 const PrerenderExtraData& extra_data = 111 const PrerenderExtraData& extra_data =
113 PrerenderExtraData::FromPrerender(prerender); 112 PrerenderExtraData::FromPrerender(prerender);
114 if (prerenders_.count(extra_data.prerender_id()) != 0) { 113 if (prerenders_.count(extra_data.prerender_id()) != 0) {
115 // TODO(gavinp): Determine why these apparently duplicate adds occur. 114 // TODO(gavinp): Determine why these apparently duplicate adds occur.
116 return; 115 return;
117 } 116 }
118 117
119 prerenders_[extra_data.prerender_id()] = prerender; 118 prerenders_[extra_data.prerender_id()] = prerender;
120 119
121 PrerenderAttributes attributes;
122 attributes.url = GURL(prerender.url());
123 attributes.rel_types = prerender.relTypes();
124
125 content::RenderThread::Get()->Send(new PrerenderHostMsg_AddLinkRelPrerender( 120 content::RenderThread::Get()->Send(new PrerenderHostMsg_AddLinkRelPrerender(
126 extra_data.prerender_id(), attributes, 121 extra_data.prerender_id(), GURL(prerender.url()),
127 content::Referrer(GURL(prerender.referrer()), 122 content::Referrer(GURL(prerender.referrer()),
128 prerender.referrerPolicy()), 123 prerender.referrerPolicy()),
129 extra_data.size(), extra_data.render_view_route_id())); 124 extra_data.size(), extra_data.render_view_route_id()));
130 } 125 }
131 126
132 void PrerenderDispatcher::cancel(const WebPrerender& prerender) { 127 void PrerenderDispatcher::cancel(const WebPrerender& prerender) {
133 const PrerenderExtraData& extra_data = 128 const PrerenderExtraData& extra_data =
134 PrerenderExtraData::FromPrerender(prerender); 129 PrerenderExtraData::FromPrerender(prerender);
135 content::RenderThread::Get()->Send( 130 content::RenderThread::Get()->Send(
136 new PrerenderHostMsg_CancelLinkRelPrerender(extra_data.prerender_id())); 131 new PrerenderHostMsg_CancelLinkRelPrerender(extra_data.prerender_id()));
(...skipping 10 matching lines...) Expand all
147 content::RenderThread::Get()->Send( 142 content::RenderThread::Get()->Send(
148 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id())); 143 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id()));
149 // The browser will not send an OnPrerenderStop (the prerender may have even 144 // The browser will not send an OnPrerenderStop (the prerender may have even
150 // been canceled before it was started), so release it to avoid a 145 // been canceled before it was started), so release it to avoid a
151 // leak. Moreover, if it did, the PrerenderClient in Blink will have been 146 // leak. Moreover, if it did, the PrerenderClient in Blink will have been
152 // detached already. 147 // detached already.
153 prerenders_.erase(extra_data.prerender_id()); 148 prerenders_.erase(extra_data.prerender_id());
154 } 149 }
155 150
156 } // namespace prerender 151 } // 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