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

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

Issue 133073021: Pass DomContentLoaded event from prerenders to launching elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed davidben comments. 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
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/renderer/prerender/prerender_extra_data.h" 9 #include "chrome/renderer/prerender/prerender_extra_data.h"
10 #include "content/public/common/referrer.h" 10 #include "content/public/common/referrer.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 return; 52 return;
53 53
54 WebPrerender& prerender = it->second; 54 WebPrerender& prerender = it->second;
55 DCHECK(!prerender.isNull()) 55 DCHECK(!prerender.isNull())
56 << "OnPrerenderStopLoading shouldn't be called from a unit test, the only" 56 << "OnPrerenderStopLoading shouldn't be called from a unit test, the only"
57 << "context in which a WebPrerender in the dispatcher can be null."; 57 << "context in which a WebPrerender in the dispatcher can be null.";
58 58
59 prerender.didSendLoadForPrerender(); 59 prerender.didSendLoadForPrerender();
60 } 60 }
61 61
62 void PrerenderDispatcher::OnPrerenderDomContentLoaded(int prerender_id) {
63 std::map<int, WebPrerender>::iterator it = prerenders_.find(prerender_id);
64 if (it == prerenders_.end())
65 return;
66
67 WebPrerender& prerender = it->second;
68 DCHECK(!prerender.isNull())
69 << "OnPrerenderDomContentLoaded shouldn't be called from a unit test,"
70 << " the only context in which a WebPrerender in the dispatcher can be"
71 << " null.";
72
73 prerender.didSendDOMContentLoadedForPrerender();
74 }
75
62 void PrerenderDispatcher::OnPrerenderAddAlias(const GURL& alias) { 76 void PrerenderDispatcher::OnPrerenderAddAlias(const GURL& alias) {
63 running_prerender_urls_.insert(alias); 77 running_prerender_urls_.insert(alias);
64 } 78 }
65 79
66 void PrerenderDispatcher::OnPrerenderRemoveAliases( 80 void PrerenderDispatcher::OnPrerenderRemoveAliases(
67 const std::vector<GURL>& aliases) { 81 const std::vector<GURL>& aliases) {
68 for (size_t i = 0; i < aliases.size(); ++i) { 82 for (size_t i = 0; i < aliases.size(); ++i) {
69 std::multiset<GURL>::iterator it = running_prerender_urls_.find(aliases[i]); 83 std::multiset<GURL>::iterator it = running_prerender_urls_.find(aliases[i]);
70 if (it != running_prerender_urls_.end()) { 84 if (it != running_prerender_urls_.end()) {
71 running_prerender_urls_.erase(it); 85 running_prerender_urls_.erase(it);
(...skipping 18 matching lines...) Expand all
90 prerenders_.erase(prerender_id); 104 prerenders_.erase(prerender_id);
91 } 105 }
92 106
93 bool PrerenderDispatcher::OnControlMessageReceived( 107 bool PrerenderDispatcher::OnControlMessageReceived(
94 const IPC::Message& message) { 108 const IPC::Message& message) {
95 bool handled = true; 109 bool handled = true;
96 IPC_BEGIN_MESSAGE_MAP(PrerenderDispatcher, message) 110 IPC_BEGIN_MESSAGE_MAP(PrerenderDispatcher, message)
97 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStart, OnPrerenderStart) 111 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStart, OnPrerenderStart)
98 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStopLoading, 112 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStopLoading,
99 OnPrerenderStopLoading) 113 OnPrerenderStopLoading)
114 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderDomContentLoaded,
115 OnPrerenderDomContentLoaded)
100 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderAddAlias, OnPrerenderAddAlias) 116 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderAddAlias, OnPrerenderAddAlias)
101 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderRemoveAliases, 117 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderRemoveAliases,
102 OnPrerenderRemoveAliases) 118 OnPrerenderRemoveAliases)
103 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStop, OnPrerenderStop) 119 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStop, OnPrerenderStop)
104 IPC_MESSAGE_UNHANDLED(handled = false) 120 IPC_MESSAGE_UNHANDLED(handled = false)
105 IPC_END_MESSAGE_MAP() 121 IPC_END_MESSAGE_MAP()
106 122
107 return handled; 123 return handled;
108 } 124 }
109 125
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 content::RenderThread::Get()->Send( 158 content::RenderThread::Get()->Send(
143 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id())); 159 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id()));
144 // The browser will not send an OnPrerenderStop (the prerender may have even 160 // 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 161 // 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 162 // leak. Moreover, if it did, the PrerenderClient in Blink will have been
147 // detached already. 163 // detached already.
148 prerenders_.erase(extra_data.prerender_id()); 164 prerenders_.erase(extra_data.prerender_id());
149 } 165 }
150 166
151 } // namespace prerender 167 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/renderer/prerender/prerender_dispatcher.h ('k') | chrome/test/data/prerender/prerender_events_common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698