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

Unified Diff: chrome/browser/prerender/prerender_manager.cc

Issue 1710853002: android: Add a method to let Java know whether a prerender has finished loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 5c6e0daa1d125f0c5520bb090191ce02742a60d8..4bb07b23169a97432e1a9cb06d1239f8751ae0d1 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -662,13 +662,25 @@ bool PrerenderManager::HasPrerenderedUrl(
content::SessionStorageNamespace* session_storage_namespace = web_contents->
GetController().GetDefaultSessionStorageNamespace();
- for (ScopedVector<PrerenderData>::const_iterator it =
- active_prerenders_.begin();
- it != active_prerenders_.end(); ++it) {
- PrerenderContents* prerender_contents = (*it)->contents();
- if (prerender_contents->Matches(url, session_storage_namespace)) {
+ for (const auto& prerender_data : active_prerenders_) {
+ PrerenderContents* prerender_contents = prerender_data->contents();
+ if (prerender_contents->Matches(url, session_storage_namespace))
+ return true;
+ }
+ return false;
+}
+
+bool PrerenderManager::HasPrerenderedAndFinishedLoadingUrl(
+ GURL url,
+ content::WebContents* web_contents) const {
+ content::SessionStorageNamespace* session_storage_namespace =
+ web_contents->GetController().GetDefaultSessionStorageNamespace();
+
+ for (const auto& prerender_data : active_prerenders_) {
+ PrerenderContents* prerender_contents = prerender_data->contents();
+ if (prerender_contents->Matches(url, session_storage_namespace) &&
+ prerender_contents->has_finished_loading())
return true;
- }
}
return false;
}

Powered by Google App Engine
This is Rietveld 408576698