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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6625066: Add pending preloads indexed by routing id. Start preloading once we navigate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include "base/process_util.h" 7 #include "base/process_util.h"
8 #include "base/task.h" 8 #include "base/task.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/background_contents_service.h" 10 #include "chrome/browser/background_contents_service.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 params.current_history_list_offset = -1; 141 params.current_history_list_offset = -1;
142 params.current_history_list_length = 0; 142 params.current_history_list_length = 0;
143 params.url = prerender_url_; 143 params.url = prerender_url_;
144 params.transition = PageTransition::LINK; 144 params.transition = PageTransition::LINK;
145 params.navigation_type = ViewMsg_Navigate_Type::PRERENDER; 145 params.navigation_type = ViewMsg_Navigate_Type::PRERENDER;
146 params.referrer = referrer_; 146 params.referrer = referrer_;
147 147
148 render_view_host_->Navigate(params); 148 render_view_host_->Navigate(params);
149 } 149 }
150 150
151 bool PrerenderContents::GetChildId(int* child_id) const {
152 CHECK(child_id);
153 if (render_view_host_) {
154 *child_id = render_view_host_->process()->id();
155 return true;
156 }
157 return false;
158 }
159
160 bool PrerenderContents::GetRouteId(int* route_id) const {
161 CHECK(route_id);
162 if (render_view_host_) {
163 *route_id = render_view_host_->routing_id();
164 return true;
165 }
166 return false;
167 }
168
151 void PrerenderContents::set_final_status(FinalStatus final_status) { 169 void PrerenderContents::set_final_status(FinalStatus final_status) {
152 DCHECK(final_status >= FINAL_STATUS_USED && final_status < FINAL_STATUS_MAX); 170 DCHECK(final_status >= FINAL_STATUS_USED && final_status < FINAL_STATUS_MAX);
153 DCHECK_EQ(FINAL_STATUS_MAX, final_status_); 171 DCHECK_EQ(FINAL_STATUS_MAX, final_status_);
154 172
155 final_status_ = final_status; 173 final_status_ = final_status;
156 } 174 }
157 175
158 FinalStatus PrerenderContents::final_status() const { 176 FinalStatus PrerenderContents::final_status() const {
159 return final_status_; 177 return final_status_;
160 } 178 }
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 return; 491 return;
474 492
475 size_t private_bytes, shared_bytes; 493 size_t private_bytes, shared_bytes;
476 if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) { 494 if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
477 if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024) 495 if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024)
478 Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED); 496 Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
479 } 497 }
480 } 498 }
481 499
482 } // namespace prerender 500 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_final_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698