OLD | NEW |
---|---|
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 <stack> | |
8 | |
7 #include "base/logging.h" | 9 #include "base/logging.h" |
8 #include "chrome/common/prerender_messages.h" | 10 #include "chrome/common/prerender_messages.h" |
9 #include "chrome/renderer/prerender/prerender_extra_data.h" | 11 #include "chrome/renderer/prerender/prerender_extra_data.h" |
12 #include "content/public/common/referrer.h" | |
10 #include "content/public/renderer/render_thread.h" | 13 #include "content/public/renderer/render_thread.h" |
14 #include "content/public/renderer/render_view.h" | |
11 #include "googleurl/src/gurl.h" | 15 #include "googleurl/src/gurl.h" |
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupp ort.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebPrerenderingSupp ort.h" |
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | |
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | |
13 | 19 |
14 namespace prerender { | 20 namespace prerender { |
15 | 21 |
22 using WebKit::WebPrerender; | |
23 using WebKit::WebPrerenderingSupport; | |
24 | |
16 PrerenderDispatcher::PrerenderDispatcher() { | 25 PrerenderDispatcher::PrerenderDispatcher() { |
17 WebKit::WebPrerenderingSupport::initialize(this); | 26 WebPrerenderingSupport::initialize(this); |
18 } | 27 } |
19 | 28 |
20 PrerenderDispatcher::~PrerenderDispatcher() { | 29 PrerenderDispatcher::~PrerenderDispatcher() { |
21 WebKit::WebPrerenderingSupport::shutdown(); | 30 WebPrerenderingSupport::shutdown(); |
22 } | 31 } |
23 | 32 |
24 bool PrerenderDispatcher::IsPrerenderURL(const GURL& url) const { | 33 bool PrerenderDispatcher::IsPrerenderURL(const GURL& url) const { |
25 return prerender_urls_.find(url) != prerender_urls_.end(); | 34 return running_prerender_urls_.count(url) >= 1; |
26 } | 35 } |
27 | 36 |
28 void PrerenderDispatcher::OnAddPrerenderURL(const GURL& url) { | 37 void PrerenderDispatcher::OnPrerenderStart(int prerender_id) { |
mmenke
2012/12/13 18:27:16
Since we have it on stop, too, may want a:
DCHECK
gavinp
2012/12/13 20:45:34
Done.
| |
29 PrerenderMap::iterator it = prerender_urls_.find(url); | 38 std::map<int, GURL>::iterator it = prerenders_.find(prerender_id); |
30 if (it != prerender_urls_.end()) { | 39 if (it == prerenders_.end()) |
31 DCHECK_LT(0, it->second); | 40 return; |
32 it->second += 1; | 41 const GURL& url = it->second; |
33 } else { | 42 running_prerender_urls_.insert( |
34 prerender_urls_[url] = 1; | 43 std::multimap<GURL, int>::value_type(url, prerender_id)); |
mmenke
2012/12/13 18:27:16
(Draft) 2012/12/13 17:03:52
optional: Think it's
gavinp
2012/12/13 20:45:34
Multimap has no subscript operator.
mmenke
2012/12/13 21:39:42
Erm... Good point. I'd thought I'd seen prettier
| |
35 } | |
36 } | 44 } |
37 | 45 |
38 void PrerenderDispatcher::OnRemovePrerenderURL(const GURL& url) { | 46 void PrerenderDispatcher::OnPrerenderAddAlias(int prerender_id, |
39 PrerenderMap::iterator it = prerender_urls_.find(url); | 47 const GURL& url) { |
40 // This is possible with a spurious remove. | 48 DCHECK_LT(0u, prerenders_.count(prerender_id)); |
49 running_prerender_urls_.insert( | |
50 std::multimap<GURL, int>::value_type(url, prerender_id)); | |
mmenke
2012/12/13 18:27:16
optional: Think it's cleaner to use operator[] in
gavinp
2012/12/13 20:45:34
Done.
| |
51 } | |
52 | |
53 void PrerenderDispatcher::OnPrerenderStop(int prerender_id) { | |
54 DCHECK_NE(0u, prerenders_.count(prerender_id)); | |
55 | |
41 // TODO(cbentzel): We'd also want to send the map of active prerenders when | 56 // TODO(cbentzel): We'd also want to send the map of active prerenders when |
42 // creating a new render process, so the Add/Remove go relative to that. | 57 // creating a new render process, so the Add/Remove go relative to that. |
43 // This may not be that big of a deal in practice, since the newly created tab | 58 // This may not be that big of a deal in practice, since the newly created tab |
44 // is unlikely to go to the prerendered page. | 59 // is unlikely to go to the prerendered page. |
45 if (it == prerender_urls_.end()) | 60 prerenders_.erase(prerender_id); |
46 return; | 61 |
47 DCHECK_LT(0, it->second); | 62 std::stack<std::multimap<GURL, int>::iterator> to_delete; |
48 it->second -= 1; | 63 for (std::multimap<GURL, int>::iterator it = running_prerender_urls_.begin(); |
49 if (it->second == 0) | 64 it != running_prerender_urls_.end(); ++it) { |
50 prerender_urls_.erase(it); | 65 if (it->second == prerender_id) |
66 to_delete.push(it); | |
mmenke
2012/12/13 18:27:16
Think it would be a little simpler to have only on
gavinp
2012/12/13 20:51:24
Done.
| |
67 } | |
68 while (!to_delete.empty()) { | |
69 running_prerender_urls_.erase(to_delete.top()); | |
70 to_delete.pop(); | |
71 } | |
51 } | 72 } |
52 | 73 |
53 bool PrerenderDispatcher::OnControlMessageReceived( | 74 bool PrerenderDispatcher::OnControlMessageReceived( |
54 const IPC::Message& message) { | 75 const IPC::Message& message) { |
55 bool handled = true; | 76 bool handled = true; |
56 IPC_BEGIN_MESSAGE_MAP(PrerenderDispatcher, message) | 77 IPC_BEGIN_MESSAGE_MAP(PrerenderDispatcher, message) |
57 IPC_MESSAGE_HANDLER(PrerenderMsg_AddPrerenderURL, OnAddPrerenderURL) | 78 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStart, OnPrerenderStart) |
58 IPC_MESSAGE_HANDLER(PrerenderMsg_RemovePrerenderURL, OnRemovePrerenderURL) | 79 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderAddAlias, OnPrerenderAddAlias) |
80 IPC_MESSAGE_HANDLER(PrerenderMsg_OnPrerenderStop, OnPrerenderStop) | |
59 IPC_MESSAGE_UNHANDLED(handled = false) | 81 IPC_MESSAGE_UNHANDLED(handled = false) |
60 IPC_END_MESSAGE_MAP() | 82 IPC_END_MESSAGE_MAP() |
61 | 83 |
62 return handled; | 84 return handled; |
63 } | 85 } |
64 | 86 |
65 void PrerenderDispatcher::add(const WebKit::WebPrerender& prerender) { | 87 void PrerenderDispatcher::add(const WebKit::WebPrerender& prerender) { |
66 const PrerenderExtraData& extra_data = | 88 const PrerenderExtraData& extra_data = |
67 PrerenderExtraData::FromPrerender(prerender); | 89 PrerenderExtraData::FromPrerender(prerender); |
90 prerenders_.insert(std::map<int, GURL>::value_type(extra_data.prerender_id(), | |
91 prerender.url())); | |
mmenke
2012/12/13 18:27:16
optional: Think it's cleaner to use operator[] in
gavinp
2012/12/13 20:45:34
Done.
| |
92 | |
68 content::RenderThread::Get()->Send(new PrerenderHostMsg_AddLinkRelPrerender( | 93 content::RenderThread::Get()->Send(new PrerenderHostMsg_AddLinkRelPrerender( |
69 extra_data.prerender_id(), GURL(prerender.url()), | 94 extra_data.prerender_id(), GURL(prerender.url()), |
70 content::Referrer(GURL(prerender.referrer()), prerender.referrerPolicy()), | 95 content::Referrer(GURL(prerender.referrer()), prerender.referrerPolicy()), |
71 extra_data.size(), extra_data.render_view_route_id())); | 96 extra_data.size(), extra_data.render_view_route_id())); |
72 } | 97 } |
73 | 98 |
74 void PrerenderDispatcher::cancel(const WebKit::WebPrerender& prerender) { | 99 void PrerenderDispatcher::cancel(const WebKit::WebPrerender& prerender) { |
75 const PrerenderExtraData& extra_data = | 100 const PrerenderExtraData& extra_data = |
76 PrerenderExtraData::FromPrerender(prerender); | 101 PrerenderExtraData::FromPrerender(prerender); |
77 content::RenderThread::Get()->Send( | 102 content::RenderThread::Get()->Send( |
78 new PrerenderHostMsg_CancelLinkRelPrerender(extra_data.prerender_id())); | 103 new PrerenderHostMsg_CancelLinkRelPrerender(extra_data.prerender_id())); |
79 } | 104 } |
80 | 105 |
81 void PrerenderDispatcher::abandon(const WebKit::WebPrerender& prerender) { | 106 void PrerenderDispatcher::abandon(const WebKit::WebPrerender& prerender) { |
82 const PrerenderExtraData& extra_data = | 107 const PrerenderExtraData& extra_data = |
83 PrerenderExtraData::FromPrerender(prerender); | 108 PrerenderExtraData::FromPrerender(prerender); |
84 content::RenderThread::Get()->Send( | 109 content::RenderThread::Get()->Send( |
85 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id())); | 110 new PrerenderHostMsg_AbandonLinkRelPrerender(extra_data.prerender_id())); |
86 } | 111 } |
87 | 112 |
88 } // namespace prerender | 113 } // namespace prerender |
OLD | NEW |