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

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

Issue 113803003: Add <link rel=next> support to prerender. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix memory leak 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_link_manager.cc
diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc
index 8213dedd8701b4abb3250e952cc564b2297ef250..30846b4b26e92107e453b4a8dfde977405a489f5 100644
--- a/chrome/browser/prerender/prerender_link_manager.cc
+++ b/chrome/browser/prerender/prerender_link_manager.cc
@@ -7,15 +7,18 @@
#include <functional>
#include <limits>
#include <set>
+#include <string>
#include <utility>
#include "base/memory/scoped_ptr.h"
+#include "base/metrics/field_trial.h"
#include "chrome/browser/prerender/prerender_contents.h"
#include "chrome/browser/prerender/prerender_handle.h"
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/prerender_messages.h"
+#include "chrome/common/prerender_types.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/session_storage_namespace.h"
@@ -28,8 +31,30 @@ using base::TimeTicks;
using content::RenderViewHost;
using content::SessionStorageNamespace;
+namespace prerender {
+
namespace {
+bool ShouldStartRelNextPrerenders() {
+ const std::string experiment_name =
+ base::FieldTrialList::FindFullName("PrerenderRelNextTrial");
+
+ return experiment_name.find("Yes") != std::string::npos;
+}
+
+bool ShouldStartPrerender(uint32 rel_types) {
+ const bool should_start_rel_next_prerenders =
+ ShouldStartRelNextPrerenders();
+
+ if (rel_types & PrerenderRelTypePrerender) {
+ return true;
+ } else if (should_start_rel_next_prerenders &&
+ (rel_types & PrerenderRelTypeNext) == PrerenderRelTypeNext) {
+ return true;
+ }
+ return false;
+}
+
void Send(int child_id, IPC::Message* raw_message) {
using content::RenderProcessHost;
scoped_ptr<IPC::Message> own_message(raw_message);
@@ -42,8 +67,6 @@ void Send(int child_id, IPC::Message* raw_message) {
} // namespace
-namespace prerender {
-
// Helper class to implement PrerenderContents::Observer and watch prerenders
// which launch other prerenders.
class PrerenderLinkManager::PendingPrerenderManager
@@ -109,6 +132,7 @@ PrerenderLinkManager::~PrerenderLinkManager() {
void PrerenderLinkManager::OnAddPrerender(int launcher_child_id,
int prerender_id,
const GURL& url,
+ uint32 rel_types,
const content::Referrer& referrer,
const gfx::Size& size,
int render_view_route_id) {
@@ -135,7 +159,7 @@ void PrerenderLinkManager::OnAddPrerender(int launcher_child_id,
}
LinkPrerender
- prerender(launcher_child_id, prerender_id, url, referrer, size,
+ prerender(launcher_child_id, prerender_id, url, rel_types, referrer, size,
render_view_route_id, manager_->GetCurrentTimeTicks(),
prerender_contents);
prerenders_.push_back(prerender);
@@ -196,6 +220,7 @@ PrerenderLinkManager::LinkPrerender::LinkPrerender(
int launcher_child_id,
int prerender_id,
const GURL& url,
+ uint32 rel_types,
const content::Referrer& referrer,
const gfx::Size& size,
int render_view_route_id,
@@ -204,6 +229,7 @@ PrerenderLinkManager::LinkPrerender::LinkPrerender(
: launcher_child_id(launcher_child_id),
prerender_id(prerender_id),
url(url),
+ rel_types(rel_types),
referrer(referrer),
size(size),
render_view_route_id(render_view_route_id),
@@ -314,6 +340,11 @@ void PrerenderLinkManager::StartPrerenders() {
}
}
+ if (!ShouldStartPrerender((*i)->rel_types)) {
+ prerenders_.erase(*i);
+ continue;
+ }
+
PrerenderHandle* handle = manager_->AddPrerenderFromLinkRelPrerender(
(*i)->launcher_child_id, (*i)->render_view_route_id,
(*i)->url, (*i)->referrer, (*i)->size);
« no previous file with comments | « chrome/browser/prerender/prerender_link_manager.h ('k') | chrome/browser/prerender/prerender_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698