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

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc	(revision 239602)
+++ chrome/renderer/chrome_content_renderer_client.cc	(working copy)
@@ -27,6 +27,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/benchmarking_extension.h"
+#include "chrome/renderer/chrome_render_frame_observer.h"
 #include "chrome/renderer/chrome_render_process_observer.h"
 #include "chrome/renderer/chrome_render_view_observer.h"
 #include "chrome/renderer/content_settings_observer.h"
@@ -352,6 +353,7 @@
 
 void ChromeContentRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
+  new ChromeRenderFrameObserver(render_frame);

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

I'm assuming this is this called for the main frame?  If so, the fact that this
is called for the main frame, but WebContentsObserver::RenderFrameCreated is not
seems like a recipe for bugs.

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

It's called for every RenderFrame that's created.

Right now, we have one RenderFrame per RenderView. That will change soon and
there will be a RenderFrame per blink::WebFrame. The code will work with either
scenario though.
WCO::RenderFrameCreated is created for every RenderFrameHost, and there's a 1:1
mapping between RenderFrameHost and RenderFrame.

 #if defined(ENABLE_PLUGINS)
   new PepperHelper(render_frame);
 #endif
@@ -473,20 +475,20 @@
 }
 
 void ChromeContentRendererClient::DeferMediaLoad(
-    content::RenderView* render_view,
+    content::RenderFrame* render_frame,
     const base::Closure& closure) {
 #if defined(OS_ANDROID)
   // Chromium for Android doesn't support prerender yet.
   closure.Run();
   return;
 #else
-  if (!prerender::PrerenderHelper::IsPrerendering(render_view)) {
+  if (!prerender::PrerenderHelper::IsPrerendering(render_frame)) {
     closure.Run();
     return;
   }
 
-  // Lifetime is tied to |render_view| via content::RenderViewObserver.
-  new prerender::PrerenderMediaLoadDeferrer(render_view, closure);
+  // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
+  new prerender::PrerenderMediaLoadDeferrer(render_frame, closure);
 #endif
 }
 
@@ -662,7 +664,7 @@
         // TODO(mmenke):  In the case of prerendering, feed into
         //                ChromeContentRendererClient::CreatePlugin instead, to
         //                reduce the chance of future regressions.
-        if (prerender::PrerenderHelper::IsPrerendering(render_view)) {
+        if (prerender::PrerenderHelper::IsPrerendering(render_frame)) {
           placeholder = ChromePluginPlaceholder::CreateBlockedPlugin(
               render_view,
               render_frame,
@@ -1169,9 +1171,9 @@
 }
 
 bool ChromeContentRendererClient::ShouldOverridePageVisibilityState(
-    const content::RenderView* render_view,
+    const content::RenderFrame* render_frame,
     blink::WebPageVisibilityState* override_state) {
-  if (!prerender::PrerenderHelper::IsPrerendering(render_view))
+  if (!prerender::PrerenderHelper::IsPrerendering(render_frame))
     return false;
 
   *override_state = blink::WebPageVisibilityStatePrerender;