Changes to RenderFrameProxy:

- Add accessors: web_frame(), routing_id(), render_view().
- Remove accessor: render_frame(). Where we do need to touch the
  RenderFrame, we'll look it up by its routing ID.
- Small change to the CompositingHelper to use the new getters.
- Add a map to allow finding a RenderFrameProxy by its associated
  blink::WebFrame.
- Introduce a second factory function and differentiate the two
  factory functions according to the two ways RenderFrameProxies will
  be created. The first is for when an extant local RenderFrame is
  being swapped out and replaced with a new RenderFrameProxy. The
  second is for when a RenderFrameProxy needs to be created without
  displacing an existing RenderFrame, as shall occur once we mirror
  the frame tree.
- This second factory function, which is uncalled at the moment, will
  create WebRemoteFrames. Also there is stubbed out code in the first
  factory function to create WebRemoteFrames. This code is in
  preparation for eliminating the RenderFrame (and its attendant
  WebLocalFrame) and having instead just a RenderFrameProxy.
- Add some defensive checks to prepare for when the render frame may
  not exist, as will happen once the second factory function
  enters use.
- Add an Init function so that code can be shared between the two
  factory functions.

As an adminstrative note, this patch is a chunk of nasko's 
larger "use RenderFrameProxyHost" effor (issue 241223002)

BUG=357747
TEST=browsertests, http://csreis.github.io/tests/cross-site-iframe.html renders after going cross-site under --site-per-process

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283572

Review URL: https://codereview.chromium.org/357043006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283965 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 8 deletions

diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index 8790ae2..480d3c0 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -40,20 +40,19 @@ ChildFrameCompositingHelper::SwapBuffersInfo::SwapBuffersInfo()
       shared_memory(NULL) {}
 
 ChildFrameCompositingHelper*
-ChildFrameCompositingHelper::CreateCompositingHelperForBrowserPlugin(
+ChildFrameCompositingHelper::CreateForBrowserPlugin(
     const base::WeakPtr<BrowserPlugin>& browser_plugin) {
   return new ChildFrameCompositingHelper(
       browser_plugin, NULL, NULL, browser_plugin->render_view_routing_id());
 }
 
 ChildFrameCompositingHelper*
-ChildFrameCompositingHelper::CreateCompositingHelperForRenderFrame(
-    blink::WebFrame* frame,
-    RenderFrameProxy* render_frame_proxy,
-    int host_routing_id) {
-  return new ChildFrameCompositingHelper(
-      base::WeakPtr<BrowserPlugin>(), frame, render_frame_proxy,
-      host_routing_id);
+ChildFrameCompositingHelper::CreateForRenderFrameProxy(
+    RenderFrameProxy* render_frame_proxy) {
+  return new ChildFrameCompositingHelper(base::WeakPtr<BrowserPlugin>(),
+                                         render_frame_proxy->web_frame(),
+                                         render_frame_proxy,
+                                         render_frame_proxy->routing_id());
 }
 
 ChildFrameCompositingHelper::ChildFrameCompositingHelper(