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

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

Issue 1900583002: Abandon prerenders upon render thread shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: abandon prerenders upon PrerenderDispatcher::OnRenderProcessShutdown() Created 4 years, 8 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/common/prerender_messages.h" 10 #include "chrome/common/prerender_messages.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderAddAlias, OnPrerenderAddAlias) 120 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderAddAlias, OnPrerenderAddAlias)
121 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderRemoveAliases, 121 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderRemoveAliases,
122 OnPrerenderRemoveAliases) 122 OnPrerenderRemoveAliases)
123 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStop, OnPrerenderStop) 123 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStop, OnPrerenderStop)
124 IPC_MESSAGE_UNHANDLED(handled = false) 124 IPC_MESSAGE_UNHANDLED(handled = false)
125 IPC_END_MESSAGE_MAP() 125 IPC_END_MESSAGE_MAP()
126 126
127 return handled; 127 return handled;
128 } 128 }
129 129
130 void PrerenderDispatcher::OnRenderProcessShutdown() {
131 // Renderer is shutting down, abandon all in-flight prerenders.
132 for (auto it : prerenders_) {
133 const PrerenderExtraData& extra_data =
134 PrerenderExtraData::FromPrerender(it.second);
135 content::RenderThread::Get()->Send(
136 new PrerenderHostMsg_AbandonLinkRelPrerender(
137 extra_data.prerender_id()));
138 }
139 prerenders_.clear();
140 }
141
130 void PrerenderDispatcher::add(const WebPrerender& prerender) { 142 void PrerenderDispatcher::add(const WebPrerender& prerender) {
131 const PrerenderExtraData& extra_data = 143 const PrerenderExtraData& extra_data =
132 PrerenderExtraData::FromPrerender(prerender); 144 PrerenderExtraData::FromPrerender(prerender);
133 if (prerenders_.count(extra_data.prerender_id()) != 0) { 145 if (prerenders_.count(extra_data.prerender_id()) != 0) {
134 // TODO(gavinp): Determine why these apparently duplicate adds occur. 146 // TODO(gavinp): Determine why these apparently duplicate adds occur.
135 return; 147 return;
136 } 148 }
137 149
138 prerenders_[extra_data.prerender_id()] = prerender; 150 prerenders_[extra_data.prerender_id()] = prerender;
139 151
(...skipping 28 matching lines...) Expand all
168 content::RenderThread::Get()->Send( 180 content::RenderThread::Get()->Send(
169 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id())); 181 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id()));
170 // The browser will not send an OnPrerenderStop (the prerender may have even 182 // The browser will not send an OnPrerenderStop (the prerender may have even
171 // been canceled before it was started), so release it to avoid a 183 // been canceled before it was started), so release it to avoid a
172 // leak. Moreover, if it did, the PrerenderClient in Blink will have been 184 // leak. Moreover, if it did, the PrerenderClient in Blink will have been
173 // detached already. 185 // detached already.
174 prerenders_.erase(extra_data.prerender_id()); 186 prerenders_.erase(extra_data.prerender_id());
175 } 187 }
176 188
177 } // namespace prerender 189 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/renderer/prerender/prerender_dispatcher.h ('k') | third_party/WebKit/Source/platform/Prerender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698