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/browser/prerender/prerender_tracker.h" | 5 #include "chrome/browser/prerender/prerender_tracker.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/prerender/prerender_manager.h" | 10 #include "chrome/browser/prerender/prerender_manager.h" |
(...skipping 30 matching lines...) Expand all Loading... | |
41 : final_status(FINAL_STATUS_MAX), | 41 : final_status(FINAL_STATUS_MAX), |
42 prerender_manager(prerender_manager->AsWeakPtr()) { | 42 prerender_manager(prerender_manager->AsWeakPtr()) { |
43 } | 43 } |
44 ~RenderViewInfo() {} | 44 ~RenderViewInfo() {} |
45 | 45 |
46 FinalStatus final_status; | 46 FinalStatus final_status; |
47 base::WeakPtr<PrerenderManager> prerender_manager; | 47 base::WeakPtr<PrerenderManager> prerender_manager; |
48 }; | 48 }; |
49 | 49 |
50 PrerenderTracker::PrerenderTracker() { | 50 PrerenderTracker::PrerenderTracker() { |
51 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | |
51 } | 52 } |
52 | 53 |
53 PrerenderTracker::~PrerenderTracker() { | 54 PrerenderTracker::~PrerenderTracker() { |
55 DCHECK(observing_set_.empty()); | |
56 } | |
57 | |
58 void PrerenderTracker::AddPrerenderContents( | |
59 PrerenderContents* prerender_contents) { | |
60 DCHECK(CalledOnValidThread()); | |
61 prerender_contents->AddObserver(this); | |
62 observing_set_.insert(prerender_contents); | |
54 } | 63 } |
55 | 64 |
56 bool PrerenderTracker::TryUse(int child_id, int route_id) { | 65 bool PrerenderTracker::TryUse(int child_id, int route_id) { |
57 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 66 DCHECK(CalledOnValidThread()); |
58 | |
59 return SetFinalStatus(child_id, route_id, FINAL_STATUS_USED, NULL); | 67 return SetFinalStatus(child_id, route_id, FINAL_STATUS_USED, NULL); |
60 } | 68 } |
61 | 69 |
62 bool PrerenderTracker::TryCancel( | 70 bool PrerenderTracker::TryCancel( |
63 int child_id, | 71 int child_id, |
64 int route_id, | 72 int route_id, |
65 FinalStatus final_status) { | 73 FinalStatus final_status) { |
66 DCHECK_NE(FINAL_STATUS_USED, final_status); | 74 DCHECK_NE(FINAL_STATUS_USED, final_status); |
67 DCHECK(final_status >= 0 && final_status < FINAL_STATUS_MAX); | 75 DCHECK(final_status >= 0 && final_status < FINAL_STATUS_MAX); |
68 | 76 |
69 FinalStatus actual_final_status; | 77 FinalStatus actual_final_status; |
70 SetFinalStatus(child_id, route_id, final_status, &actual_final_status); | 78 SetFinalStatus(child_id, route_id, final_status, &actual_final_status); |
71 return actual_final_status != FINAL_STATUS_USED && | 79 return actual_final_status != FINAL_STATUS_USED && |
72 actual_final_status != FINAL_STATUS_MAX; | 80 actual_final_status != FINAL_STATUS_MAX; |
73 } | 81 } |
74 | 82 |
75 bool PrerenderTracker::TryCancelOnIOThread( | 83 bool PrerenderTracker::TryCancelOnIOThread( |
76 int child_id, | 84 int child_id, |
77 int route_id, | 85 int route_id, |
78 FinalStatus final_status) { | 86 FinalStatus final_status) { |
79 DCHECK_NE(FINAL_STATUS_USED, final_status); | 87 DCHECK_NE(FINAL_STATUS_USED, final_status); |
80 DCHECK(final_status >= 0 && final_status < FINAL_STATUS_MAX); | 88 DCHECK_LE(0, final_status); |
89 DCHECK_GT(FINAL_STATUS_MAX, final_status); | |
81 | 90 |
82 if (!IsPrerenderingOnIOThread(child_id, route_id)) | 91 if (!IsPrerenderingOnIOThread(child_id, route_id)) |
83 return false; | 92 return false; |
84 return TryCancel(child_id, route_id, final_status); | 93 return TryCancel(child_id, route_id, final_status); |
85 } | 94 } |
86 | 95 |
87 bool PrerenderTracker::GetFinalStatus(int child_id, int route_id, | 96 bool PrerenderTracker::GetFinalStatus(int child_id, int route_id, |
88 FinalStatus* final_status) const { | 97 FinalStatus* final_status) const { |
89 ChildRouteIdPair child_route_id_pair(child_id, route_id); | 98 ChildRouteIdPair child_route_id_pair(child_id, route_id); |
90 | 99 |
91 base::AutoLock lock(final_status_map_lock_); | 100 base::AutoLock lock(final_status_map_lock_); |
92 FinalStatusMap::const_iterator final_status_it = | 101 FinalStatusMap::const_iterator final_status_it = |
93 final_status_map_.find(child_route_id_pair); | 102 final_status_map_.find(child_route_id_pair); |
94 if (final_status_map_.end() == final_status_map_.find(child_route_id_pair)) | 103 if (final_status_map_.count(child_route_id_pair) == 0) |
95 return false; | 104 return false; |
96 *final_status = final_status_it->second.final_status; | 105 *final_status = final_status_it->second.final_status; |
97 return true; | 106 return true; |
98 } | 107 } |
99 | 108 |
100 void PrerenderTracker::OnPrerenderingStarted( | 109 void PrerenderTracker::OnPrerenderStart( |
101 int child_id, int route_id, PrerenderManager* prerender_manager) { | 110 PrerenderContents* prerender_contents) { |
102 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 111 DCHECK(CalledOnValidThread()); |
103 DCHECK_GE(child_id, 0); | 112 int child_id; |
104 DCHECK_GE(route_id, 0); | 113 if (!prerender_contents->GetChildId(&child_id)) |
114 return; | |
115 int route_id; | |
116 if (!prerender_contents->GetRouteId(&route_id)) | |
117 return; | |
mmenke
2012/12/04 18:59:16
I'm perfectly happy with the current order. Howev
gavinp
2012/12/04 22:26:07
Done.
| |
105 | 118 |
106 ChildRouteIdPair child_route_id_pair(child_id, route_id); | 119 ChildRouteIdPair child_route_id_pair(child_id, route_id); |
107 | 120 |
108 // The RenderView should not already be prerendering. | 121 // The RenderView should not already be prerendering. |
109 DCHECK(final_status_map_.end() == | 122 DCHECK_EQ(0u, final_status_map_.count(child_route_id_pair)); |
110 final_status_map_.find(child_route_id_pair)); | |
111 | 123 |
112 BrowserThread::PostTask( | 124 BrowserThread::PostTask( |
113 BrowserThread::IO, FROM_HERE, | 125 BrowserThread::IO, FROM_HERE, |
114 base::Bind(&AddPrerenderOnIOThreadTask, child_route_id_pair)); | 126 base::Bind(&AddPrerenderOnIOThreadTask, child_route_id_pair)); |
115 | 127 |
116 base::AutoLock lock(final_status_map_lock_); | 128 base::AutoLock lock(final_status_map_lock_); |
117 | 129 |
118 final_status_map_.insert( | 130 final_status_map_.insert( |
119 std::make_pair(child_route_id_pair, RenderViewInfo(prerender_manager))); | 131 std::make_pair(child_route_id_pair, |
132 RenderViewInfo(prerender_contents->prerender_manager()))); | |
120 } | 133 } |
121 | 134 |
122 void PrerenderTracker::OnPrerenderingFinished(int child_id, int route_id) { | 135 void PrerenderTracker::OnPrerenderStop( |
123 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 136 PrerenderContents* prerender_contents) { |
124 DCHECK_GE(child_id, 0); | 137 DCHECK(CalledOnValidThread()); |
125 DCHECK_GE(route_id, 0); | 138 DCHECK_EQ(1u, observing_set_.count(prerender_contents)); |
139 observing_set_.erase(prerender_contents); | |
140 int child_id; | |
141 if (!prerender_contents->GetChildId(&child_id)) | |
142 return; | |
143 int route_id; | |
144 if (!prerender_contents->GetRouteId(&route_id)) | |
145 return; | |
mmenke
2012/12/04 18:59:16
Same as comment above.
gavinp
2012/12/04 22:26:07
Done.
| |
126 | 146 |
127 ChildRouteIdPair child_route_id_pair(child_id, route_id); | 147 ChildRouteIdPair child_route_id_pair(child_id, route_id); |
128 | 148 |
129 BrowserThread::PostTask( | 149 BrowserThread::PostTask( |
130 BrowserThread::IO, FROM_HERE, | 150 BrowserThread::IO, FROM_HERE, |
131 base::Bind(&RemovePrerenderOnIOThreadTask, child_route_id_pair)); | 151 base::Bind(&RemovePrerenderOnIOThreadTask, child_route_id_pair)); |
132 | 152 |
133 base::AutoLock lock(final_status_map_lock_); | 153 base::AutoLock lock(final_status_map_lock_); |
mmenke
2012/12/04 18:59:16
Could also DCHECK on final_status_map_.count(child
gavinp
2012/12/04 22:26:07
I think the DCHECK on num_erased is good enough. I
mmenke
2012/12/06 19:54:21
Oops...Somehow managed to miss that. Yea, it's ju
| |
134 size_t num_erased = final_status_map_.erase(child_route_id_pair); | 154 size_t num_erased = final_status_map_.erase(child_route_id_pair); |
135 DCHECK_EQ(1u, num_erased); | 155 DCHECK_EQ(1u, num_erased); |
136 } | 156 } |
137 | 157 |
138 bool PrerenderTracker::SetFinalStatus(int child_id, int route_id, | 158 bool PrerenderTracker::SetFinalStatus(int child_id, int route_id, |
139 FinalStatus desired_final_status, | 159 FinalStatus desired_final_status, |
140 FinalStatus* actual_final_status) { | 160 FinalStatus* actual_final_status) { |
141 DCHECK(desired_final_status >= FINAL_STATUS_USED && | 161 DCHECK(desired_final_status >= FINAL_STATUS_USED && |
142 desired_final_status < FINAL_STATUS_MAX); | 162 desired_final_status < FINAL_STATUS_MAX); |
143 | 163 |
(...skipping 27 matching lines...) Expand all Loading... | |
171 if (actual_final_status) | 191 if (actual_final_status) |
172 *actual_final_status = final_status_it->second.final_status; | 192 *actual_final_status = final_status_it->second.final_status; |
173 return false; | 193 return false; |
174 } | 194 } |
175 | 195 |
176 bool PrerenderTracker::IsPrerenderingOnIOThread(int child_id, | 196 bool PrerenderTracker::IsPrerenderingOnIOThread(int child_id, |
177 int route_id) const { | 197 int route_id) const { |
178 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 198 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
179 | 199 |
180 ChildRouteIdPair child_route_id_pair(child_id, route_id); | 200 ChildRouteIdPair child_route_id_pair(child_id, route_id); |
181 return possibly_prerendering_io_thread_set_.end() != | 201 return possibly_prerendering_io_thread_set_.count(child_route_id_pair) > 0; |
182 possibly_prerendering_io_thread_set_.find(child_route_id_pair); | |
183 } | 202 } |
184 | 203 |
185 void PrerenderTracker::AddPrerenderOnIOThread( | 204 void PrerenderTracker::AddPrerenderOnIOThread( |
186 const ChildRouteIdPair& child_route_id_pair) { | 205 const ChildRouteIdPair& child_route_id_pair) { |
187 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 206 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
188 DCHECK(!IsPrerenderingOnIOThread(child_route_id_pair.first, | 207 DCHECK(!IsPrerenderingOnIOThread(child_route_id_pair.first, |
189 child_route_id_pair.second)); | 208 child_route_id_pair.second)); |
190 | 209 |
191 possibly_prerendering_io_thread_set_.insert(child_route_id_pair); | 210 possibly_prerendering_io_thread_set_.insert(child_route_id_pair); |
192 } | 211 } |
(...skipping 18 matching lines...) Expand all Loading... | |
211 GetDefault()->AddPrerenderOnIOThread(child_route_id_pair); | 230 GetDefault()->AddPrerenderOnIOThread(child_route_id_pair); |
212 } | 231 } |
213 | 232 |
214 // static | 233 // static |
215 void PrerenderTracker::RemovePrerenderOnIOThreadTask( | 234 void PrerenderTracker::RemovePrerenderOnIOThreadTask( |
216 const ChildRouteIdPair& child_route_id_pair) { | 235 const ChildRouteIdPair& child_route_id_pair) { |
217 GetDefault()->RemovePrerenderOnIOThread(child_route_id_pair); | 236 GetDefault()->RemovePrerenderOnIOThread(child_route_id_pair); |
218 } | 237 } |
219 | 238 |
220 } // namespace prerender | 239 } // namespace prerender |
OLD | NEW |