Make the renderer-side prerendering code use RenderFrames instead of RenderViews.

chrome/browser/prerender/prerender_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 
+#include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "base/values.h"
@@ skipping 137 matching lines @@
   // to be created, and is needed so that the prerendered URLs can be sent to it
   // so render-initiated navigations will swap in the prerendered page. |size|
   // indicates the rectangular dimensions that the prerendered page should be.
   // |session_storage_namespace| indicates the namespace that the prerendered
   // page should be part of.
   virtual void StartPrerendering(
       int creator_child_id,
       const gfx::Size& size,
       content::SessionStorageNamespace* session_storage_namespace);
 
+  // Tell the renderer that it's not prerendering anymore.
+  void PrerenderingDone();

[mmenke, 2013/12/10 20:56:41]

I think this method name is ambiguous, since prerendering is also done when we
decide we aren't using the contents, and destroy it.  Maybe OnBeforeUse /
OnBeforeSwap?  Or OnUse / OnSwap / OnUsePrerender?

Of better yet, do we even need this function?  Seems like it would make sense if
the code were moved to PrepareForUse().

[jam, 2013/12/10 21:14:17]

ah, I missed that method. Switched to it.

+
   // Verifies that the prerendering is not using too many resources, and kills
   // it if not.
   void DestroyWhenUsingTooManyResources();
 
   content::RenderViewHost* GetRenderViewHostMutable();
   const content::RenderViewHost* GetRenderViewHost() const;
 
   PrerenderManager* prerender_manager() { return prerender_manager_; }
 
   string16 title() const { return title_; }
@@ skipping 31 matching lines @@
 
   base::TimeTicks load_start_time() const { return load_start_time_; }
 
   // Indicates whether this prerendered page can be used for the provided
   // |url| and |session_storage_namespace|.
   bool Matches(
       const GURL& url,
       const content::SessionStorageNamespace* session_storage_namespace) const;
 
   // content::WebContentsObserver implementation.
+  virtual void RenderFrameCreated(
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
+  virtual void RenderFrameDeleted(
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
   virtual void DidStopLoading(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidStartProvisionalLoadForFrame(
       int64 frame_id,
       int64 parent_frame_id,
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
       bool is_iframe_srcdoc,
       content::RenderViewHost* render_view_host) OVERRIDE;
@@ skipping 202 matching lines @@
 
   typedef std::vector<history::HistoryAddPageArgs> AddPageVector;
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   // The alias session storage namespace for this prerender.
   scoped_refptr<content::SessionStorageNamespace>
       alias_session_storage_namespace;
 
+  // The RenderFrameHosts for this webcontents.

[mmenke, 2013/12/10 20:56:41]

Suggest webcontents -> WebContents (or "this webcontents" ->
"prerender_contents_")

[jam, 2013/12/10 21:14:17]

Done.

+  std::set<content::RenderFrameHost*> render_frame_hosts_;
+
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_