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

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

Issue 121293002: Add new prerender origin type for <link rel=next ...> launched prerenders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to upstream fix 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
« no previous file with comments | « chrome/browser/prerender/prerender_manager.h ('k') | chrome/browser/prerender/prerender_origin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index bee549a950864481555ff56c6b7e9385a3053c21..5e678ddbe8613d0cea3de9f11cabdafa39d8451e 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -48,6 +48,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/prerender_messages.h"
+#include "chrome/common/prerender_types.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/navigation_controller.h"
@@ -314,9 +315,12 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender(
int process_id,
int route_id,
const GURL& url,
+ const uint32 rel_types,
const content::Referrer& referrer,
const gfx::Size& size) {
- Origin origin = ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN;
+ Origin origin = rel_types & PrerenderRelTypePrerender ?
+ ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN :
+ ORIGIN_LINK_REL_NEXT;
SessionStorageNamespace* session_storage_namespace = NULL;
// Unit tests pass in a process_id == -1.
if (process_id != -1) {
@@ -328,8 +332,10 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender(
WebContents::FromRenderViewHost(source_render_view_host);
if (!source_web_contents)
return NULL;
- if (source_web_contents->GetURL().host() == url.host())
+ if (origin == ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN &&
+ source_web_contents->GetURL().host() == url.host()) {
origin = ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN;
+ }
// TODO(ajwong): This does not correctly handle storage for isolated apps.
session_storage_namespace =
source_web_contents->GetController()
« no previous file with comments | « chrome/browser/prerender/prerender_manager.h ('k') | chrome/browser/prerender/prerender_origin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698