Introduce RenderFrameProxyHost object and use it in RFHM.

content/browser/frame_host/render_frame_host_impl.h

 // Copyright 2013 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 CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 119 matching lines @@
   // a blank document.  The renderer should preserve the Frame object until it
   // exits, in case we come back.  The renderer can exit if it has no other
   // active RenderFrames, but not until WasSwappedOut is called (when it is no
   // longer visible).
   void SwapOut();
 
   void OnSwappedOut(bool timed_out);
   bool is_swapped_out() { return is_swapped_out_; }
   void set_swapped_out(bool is_swapped_out) {
     is_swapped_out_ = is_swapped_out;
+    created_for_pending_ = false;
+  }
+  bool is_created_for_pending() {
+    return created_for_pending_;
   }
 
   // Sets the RVH for |this| as pending shutdown. |on_swap_out| will be called
   // when the SwapOutACK is received.
   void SetPendingShutdown(const base::Closure& on_swap_out);
 
   // TODO(nasko): This method is public so RenderViewHostImpl::Navigate can
   // call it directly. It should be made private once Navigate moves here.
   // |to_different_document| will be true unless the load is a fragment
   // navigation, or triggered by history.pushState/replaceState.
@@ skipping 95 matching lines @@
   // The FrameTreeNode which this RenderFrameHostImpl is hosted in.
   FrameTreeNode* frame_tree_node_;
 
   // The mapping of pending JavaScript calls created by
   // ExecuteJavaScript and their corresponding callbacks.
   std::map<int, JavaScriptResultCallback> javascript_callbacks_;
 
   int routing_id_;
   bool is_swapped_out_;
 
+  // This boolean indicates whether this RenderFrameHostImpl was created as a
+  // pending RFH in cross-site navigation. Once it has swapped out once,
+  // the value is set to false for the lifetime of the object.
+  // TODO(nasko): This is a nasty hack which should be removed once we can
+  // properly transition RenderFrameHost to RenderFrameProxyHost and vice versa.
+  bool created_for_pending_;

[Charlie Reis, 2014/03/31 23:22:35]

What was wrong with the active_view_count hack?  It'd be really nice to avoid
adding this if possible.

[nasko, 2014/04/09 17:52:01]

Done.

+
   // When the last BeforeUnload message was sent.
   base::TimeTicks send_before_unload_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_