Separate same domain and cross domain <link rel=...> prerenders for reporting.

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 214 matching lines @@
     int route_id,
     const GURL& url,
     const content::Referrer& referrer,
     const gfx::Size& size) {
 #if defined(OS_ANDROID)
   // TODO(jcivelli): http://crbug.com/113322 We should have an option to disable
   //                link-prerender and enable omnibox-prerender only.
   return NULL;
 #else
   DCHECK(!size.IsEmpty());
-  if (PrerenderData* parent_prerender_data =
-          FindPrerenderDataForChildAndRoute(process_id, route_id)) {
-    // Instead of prerendering from inside of a running prerender, we will defer
-    // this request until its launcher is made visible.
-    if (PrerenderContents* contents = parent_prerender_data->contents_) {
-      pending_prerender_list_.push_back(
-          linked_ptr<PrerenderData>(new PrerenderData(this)));
-      PrerenderHandle* prerender_handle =
-          new PrerenderHandle(pending_prerender_list_.back().get());
-      contents->AddPendingPrerender(
-          prerender_handle->weak_ptr_factory_.GetWeakPtr(),
-          ORIGIN_LINK_REL_PRERENDER, url, referrer, size);
-      return prerender_handle;
-    }
-  }
-
+  bool is_same_domain = false;
+  SessionStorageNamespace* session_storage_namespace = NULL;
   // Unit tests pass in a process_id == -1.
-  SessionStorageNamespace* session_storage_namespace = NULL;
   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;
+    is_same_domain = (source_web_contents->GetURL().host() == url.host());
     // TODO(ajwong): This does not correctly handle storage for isolated apps.
     session_storage_namespace =
         source_web_contents->GetController()
             .GetDefaultSessionStorageNamespace();
   }
 
-  return AddPrerender(ORIGIN_LINK_REL_PRERENDER,
+  if (PrerenderData* parent_prerender_data =
+          FindPrerenderDataForChildAndRoute(process_id, route_id)) {
+    // Instead of prerendering from inside of a running prerender, we will defer
+    // this request until its launcher is made visible.
+    if (PrerenderContents* contents = parent_prerender_data->contents_) {
+      pending_prerender_list_.push_back(
+          linked_ptr<PrerenderData>(new PrerenderData(this)));
+      PrerenderHandle* prerender_handle =
+          new PrerenderHandle(pending_prerender_list_.back().get());
+      contents->AddPendingPrerender(
+          prerender_handle->weak_ptr_factory_.GetWeakPtr(),
+          is_same_domain ? ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN
+                         : ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,
+          url, referrer, size);
+      return prerender_handle;
+    }
+  }
+
+  return AddPrerender(is_same_domain ? ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN
+                                     : ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN,

[mmenke, 2012/10/17 15:12:16]

rather than duplicating this logic, suggest replacing is_same_domain with an
origin, and defaulting to CROSSDOMAIN.

[gavinp, 2012/10/17 20:57:49]

Done.

                       process_id, url, referrer, size,
                       session_storage_namespace);
 #endif
 }
 
 PrerenderHandle* PrerenderManager::AddPrerenderFromOmnibox(
     const GURL& url,
     SessionStorageNamespace* session_storage_namespace,
     const gfx::Size& size) {
   if (!IsOmniboxEnabled(profile_))
@@ skipping 701 matching lines @@
     int process_id,
     const GURL& url_arg,
     const content::Referrer& referrer,
     const gfx::Size& size,
     SessionStorageNamespace* session_storage_namespace) {
   DCHECK(CalledOnValidThread());
 
   if (!IsEnabled())
     return NULL;
 
-  if (origin == ORIGIN_LINK_REL_PRERENDER &&
+  if ((origin == ORIGIN_LINK_REL_PRERENDER_CROSSDOMAIN ||
+       origin == ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN) &&

[mmenke, 2012/10/17 15:12:16]

Random comment:  Wonder if we even need an origin check here.  If it's not a
link rel prerender, won't referrer.url be blank?  Suppose if we end up keeping
the predictor, possibly not.

       IsGoogleSearchResultURL(referrer.url)) {
     origin = ORIGIN_GWS_PRERENDER;
   }
 
   DeleteOldEntries();
   DeletePendingDeleteEntries();
 
   GURL url = url_arg;
   GURL alias_url;
   uint8 experiment = GetQueryStringBasedExperiment(url_arg);
@@ skipping 362 matching lines @@
   if (!render_process_host || !render_process_host->GetBrowserContext())
     return NULL;
   Profile* profile = Profile::FromBrowserContext(
       render_process_host->GetBrowserContext());
   if (!profile)
     return NULL;
   return PrerenderManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 }  // namespace prerender