Changes to not use the prerendered contents when window.opener needs to be set.

chrome/browser/prerender/prerender_manager.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 54 matching lines @@
   // PrerenderManagerMode is used in a UMA_HISTOGRAM, so please do not
   // add in the middle.
   enum PrerenderManagerMode {
     PRERENDER_MODE_DISABLED,
     PRERENDER_MODE_ENABLED,
     PRERENDER_MODE_EXPERIMENT_CONTROL_GROUP,
     PRERENDER_MODE_EXPERIMENT_PRERENDER_GROUP,
     PRERENDER_MODE_MAX
   };
 
+  struct PrerenderedPageProperties {

[cbentzel, 2011/05/04 17:10:15]

This seems like overkill right now.

I'd just have an enum to pass in specifying whether opener is expected.

[Shishir, 2011/05/05 23:09:54]

Then I think we might as well have a bool for now and add the struct if more
reasons show up. Changing.

+    PrerenderedPageProperties() : has_opener_set_(false) { }
+    // Is the page supposed to have the window.opener property set.
+    bool has_opener_set_;
+  };
+
   // Owned by a Profile object for the lifetime of the profile.
   explicit PrerenderManager(Profile* profile);
 
   virtual ~PrerenderManager();
 
   // Preloads |url| if valid.  |child_route_id_pair| identifies the
   // RenderViewHost that the prerender request came from and is used to
   // set the initial window size of the RenderViewHost used for prerendering.
   // Returns true if the URL was added, false if it was not.
   bool AddPreload(
       const std::pair<int, int>& child_route_id_pair,
       const GURL& url,
       const GURL& referrer);
 
   void AddPendingPreload(const std::pair<int, int>& child_route_id_pair,
                          const GURL& url,
                          const GURL& referrer);
 
   // Destroy all preloads for the given child route id pair and assign a final
   // status to them.
   void DestroyPreloadForChildRouteIdPair(
       const std::pair<int, int>& child_route_id_pair,
       FinalStatus final_status);
 
   // For a given TabContents that wants to navigate to the URL supplied,
   // determines whether a preloaded version of the URL can be used,
   // and substitutes the prerendered RVH into the TabContents.  Returns
   // whether or not a prerendered RVH could be used or not.
-  bool MaybeUsePreloadedPage(TabContents* tab_contents, const GURL& url);
-  bool MaybeUsePreloadedPageOld(TabContents* tab_contents, const GURL& url);
+  bool MaybeUsePreloadedPage(
+      TabContents* tab_contents,
+      const GURL& url,
+      const PrerenderManager::PrerenderedPageProperties& properties);
+  bool MaybeUsePreloadedPageOld(
+      TabContents* tab_contents,
+      const GURL& url,
+      const PrerenderManager::PrerenderedPageProperties& properties);
 
   // Allows PrerenderContents to remove itself when prerendering should
   // be cancelled.
   void RemoveEntry(PrerenderContents* entry);
 
   // Retrieves the PrerenderContents object for the specified URL, if it
   // has been prerendered.  The caller will then have ownership of the
   // PrerenderContents object and is responsible for freeing it.
   // Returns NULL if the specified URL has not been prerendered.
   PrerenderContents* GetEntry(const GURL& url);
@@ skipping 162 matching lines @@
 
   // Track time of last prerender to limit prerender spam.
   base::TimeTicks last_prerender_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_