Add new prerender origin type for <link rel=next ...> launched prerenders.

chrome/browser/prerender/prerender_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 30 matching lines @@
 #include "chrome/browser/prerender/prerender_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.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"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ skipping 252 matching lines @@
     local_predictor_->Shutdown();
   profile_ = NULL;
 
   DCHECK(active_prerenders_.empty());
 }
 
 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;

[davidben, 2014/01/04 00:19:46]

Nit: I'm personally paranoid about C precedence and would probably put parens
around rel_types & PrerenderRelTypePrerender to be safe. (But if C does actually
interpret that the sensible way, I don't insist.)

   SessionStorageNamespace* session_storage_namespace = NULL;
   // Unit tests pass in a process_id == -1.
   if (process_id != -1) {
     RenderViewHost* source_render_view_host =
         RenderViewHost::FromID(process_id, route_id);
     if (!source_render_view_host)
       return NULL;
     WebContents* source_web_contents =
         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()
             .GetDefaultSessionStorageNamespace();
   }
 
   // If the prerender request comes from a recently cancelled prerender that
   // |this| still owns, then abort the prerender.
   for (ScopedVector<PrerenderData>::iterator it = to_delete_prerenders_.begin();
        it != to_delete_prerenders_.end(); ++it) {
@@ skipping 1519 matching lines @@
 void PrerenderManager::RecordEvent(PrerenderContents* contents,
                                    PrerenderEvent event) const {
   if (!contents)
     histograms_->RecordEvent(ORIGIN_NONE, kNoExperiment, event);
   else
     histograms_->RecordEvent(contents->origin(), contents->experiment_id(),
                              event);
 }
 
 }  // namespace prerender