Renderer-side changes for NoState Prefetch

chrome/renderer/prerender/prerender_helper.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/prerender/prerender_helper.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/prerender_messages.h"
 #include "content/public/renderer/document_state.h"
@@ skipping 16 matching lines @@
   if (render_view->GetMainRenderFrame() == render_frame) {
     render_view->GetWebView()->setVisibilityState(
         render_frame->GetVisibilityState(), false);
   }
 }
 
 }  // namespace
 
 namespace prerender {
 
-PrerenderHelper::PrerenderHelper(content::RenderFrame* render_frame)
+PrerenderHelper::PrerenderHelper(content::RenderFrame* render_frame,
+                                 PrerenderMode prerender_mode)
     : content::RenderFrameObserver(render_frame),
-      content::RenderFrameObserverTracker<PrerenderHelper>(render_frame) {
+      content::RenderFrameObserverTracker<PrerenderHelper>(render_frame),
+      prerender_mode_(prerender_mode) {
+  DCHECK_NE(prerender_mode_, NO_PRERENDER);
   UpdateVisibilityState(render_frame);
 }
 
+PrerenderHelper::PrerenderHelper(content::RenderFrame* sub_frame)
+    : PrerenderHelper(sub_frame,
+                      GetPrerenderMode(
+                          sub_frame->GetRenderView()->GetMainRenderFrame())) {

[mmenke, 2016/08/19 16:42:50]

DCHECK that render_frame is not the main render frame?

[droger, 2016/08/22 09:30:06]

Done.

+}
+
 PrerenderHelper::~PrerenderHelper() {
 }
 
 // static.
 bool PrerenderHelper::IsPrerendering(const content::RenderFrame* render_frame) {
-  return PrerenderHelper::Get(render_frame) != NULL;
+  return PrerenderHelper::GetPrerenderMode(render_frame) != NO_PRERENDER;
+}
+
+// static.
+PrerenderMode PrerenderHelper::GetPrerenderMode(
+    const content::RenderFrame* render_frame) {
+  PrerenderHelper* helper = PrerenderHelper::Get(render_frame);
+  if (!helper)
+    return NO_PRERENDER;
+
+  DCHECK_NE(helper->prerender_mode_, NO_PRERENDER);
+  return helper->prerender_mode_;
 }
 
 bool PrerenderHelper::OnMessageReceived(
     const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(PrerenderHelper, message)
     IPC_MESSAGE_HANDLER(PrerenderMsg_SetIsPrerendering, OnSetIsPrerendering)
   IPC_END_MESSAGE_MAP()
   // Return false on PrerenderMsg_SetIsPrerendering so other observers can see
   // the message.
   return false;
@@ skipping 12 matching lines @@
   delete this;
 
   UpdateVisibilityState(frame);
 }
 
 void PrerenderHelper::OnDestruct() {
   delete this;
 }
 
 }  // namespace prerender