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

chrome/renderer/chrome_render_view_observer.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/renderer/chrome_render_view_observer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 10 matching lines @@
 #include "chrome/renderer/chrome_render_process_observer.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/prerender/prerender_helper.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 #include "chrome/renderer/translate/translate_helper.h"
 #include "chrome/renderer/webview_color_overlay.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/renderer/content_renderer_client.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/stack_frame.h"
 #include "net/base/data_url.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ skipping 274 matching lines @@
 #if defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_UpdateTopControlsState,
                         OnUpdateTopControlsState)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_RetrieveWebappInformation,
                         OnRetrieveWebappInformation)
 #endif
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetWindowFeatures, OnSetWindowFeatures)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
-  // Filter only.
-  IPC_BEGIN_MESSAGE_MAP(ChromeRenderViewObserver, message)
-    IPC_MESSAGE_HANDLER(PrerenderMsg_SetIsPrerendering, OnSetIsPrerendering);
-  IPC_END_MESSAGE_MAP()
-
   return handled;
 }
 
 void ChromeRenderViewObserver::OnWebUIJavaScript(
     const base::string16& frame_xpath,
     const base::string16& jscript,
     int id,
     bool notify_result) {
   webui_javascript_.reset(new WebUIJavaScript());
   webui_javascript_->frame_xpath = frame_xpath;
@@ skipping 416 matching lines @@
 }
 
 void ChromeRenderViewObserver::didNotAllowPlugins(WebFrame* frame) {
   content_settings_->DidNotAllowPlugins();
 }
 
 void ChromeRenderViewObserver::didNotAllowScript(WebFrame* frame) {
   content_settings_->DidNotAllowScript();
 }
 
-void ChromeRenderViewObserver::OnSetIsPrerendering(bool is_prerendering) {
-  if (is_prerendering) {
-    DCHECK(!prerender::PrerenderHelper::Get(render_view()));
-    // The PrerenderHelper will destroy itself either after recording histograms
-    // or on destruction of the RenderView.
-    new prerender::PrerenderHelper(render_view());
-  }
-}
-
 void ChromeRenderViewObserver::DidStartLoading() {
   if ((render_view()->GetEnabledBindings() & content::BINDINGS_POLICY_WEB_UI) &&
       webui_javascript_.get()) {
     render_view()->EvaluateScript(webui_javascript_->frame_xpath,
                                   webui_javascript_->jscript,
                                   webui_javascript_->id,
                                   webui_javascript_->notify_result);
     webui_javascript_.reset();
   }
 }
@@ skipping 86 matching lines @@
   if (main_frame->isViewSourceModeEnabled())
     return;
 
   // Don't index/capture pages that failed to load.  This only checks the top
   // level frame so the thumbnail may contain a frame that failed to load.
   WebDataSource* ds = main_frame->dataSource();
   if (ds && ds->hasUnreachableURL())
     return;
 
   // Don't index/capture pages that are being prerendered.
-  if (prerender::PrerenderHelper::IsPrerendering(render_view()))
+  if (prerender::PrerenderHelper::IsPrerendering(
+          render_view()->GetMainRenderFrame())) {
     return;
+  }
 
   // Retrieve the frame's full text (up to kMaxIndexChars), and pass it to the
   // translate helper for language detection and possible translation.
   base::string16 contents;
   base::TimeTicks capture_begin_time = base::TimeTicks::Now();
   CaptureText(main_frame, &contents);
   UMA_HISTOGRAM_TIMES(kTranslateCaptureText,
                       base::TimeTicks::Now() - capture_begin_time);
   if (translate_helper_)
     translate_helper_->PageCaptured(page_id, contents);
@@ skipping 110 matching lines @@
     WebElement element = node.to<WebElement>();
     if (!element.hasTagName(tag_name))
       continue;
     WebString value = element.getAttribute(attribute_name);
     if (value.isNull() || !LowerCaseEqualsASCII(value, "refresh"))
       continue;
     return true;
   }
   return false;
 }