1 files changed, 25 insertions, 111 deletions

diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 1eeaab2..2e85a52 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -19,72 +19,18 @@ namespace content {
 
 namespace {
 
-// Facilitates lookup of RenderFrameProxy by routing_id.
 typedef std::map<int, RenderFrameProxy*> RoutingIDProxyMap;
 static base::LazyInstance<RoutingIDProxyMap> g_routing_id_proxy_map =
     LAZY_INSTANCE_INITIALIZER;
 
-// Facilitates lookup of RenderFrameProxy by WebFrame.
-typedef std::map<blink::WebFrame*, RenderFrameProxy*> FrameMap;
-base::LazyInstance<FrameMap> g_frame_map = LAZY_INSTANCE_INITIALIZER;
-
 }  // namespace
 
 // static
-RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
-    RenderFrameImpl* frame_to_replace,
-    int routing_id) {
-  CHECK_NE(routing_id, MSG_ROUTING_NONE);
-
-  scoped_ptr<RenderFrameProxy> proxy(
-      new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID()));
-#if 0
-  // TODO(nick): Enable this code when we're ready to create WebRemoteFrames.
-  blink::WebRemoteFrame* web_frame = NULL;
-  if (frame_to_replace->GetWebFrame()->parent() &&
-      frame_to_replace->GetWebFrame()->parent()->isWebRemoteFrame()) {
-    blink::WebRemoteFrame* parent_web_frame =
-        frame_to_replace->GetWebFrame()->parent()->toWebRemoteFrame();
-    web_frame = parent_web_frame->createRemoteChild("", proxy.get());
-  } else {
-    web_frame = blink::WebRemoteFrame::create(proxy.get());
-  }
-#else
-  blink::WebFrame* web_frame = frame_to_replace->GetWebFrame();
-#endif
-  proxy->Init(web_frame, frame_to_replace->render_view());
-  return proxy.release();
-}
-
-RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
-    int routing_id,
-    int parent_routing_id,
-    int render_view_routing_id) {
-  scoped_ptr<RenderFrameProxy> proxy(
-      new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
-  RenderViewImpl* render_view = NULL;
-  blink::WebRemoteFrame* web_frame = NULL;
-  if (parent_routing_id == MSG_ROUTING_NONE) {
-    // Create a top level frame.
-    render_view = RenderViewImpl::FromRoutingID(render_view_routing_id);
-    web_frame = blink::WebRemoteFrame::create(proxy.get());
-    render_view->webview()->setMainFrame(web_frame);
-  } else {
-    // Create a frame under an existing parent. The parent is always expected to
-    // be a RenderFrameProxy, because navigations initiated by local frames
-    // should not wind up here.
-    RenderFrameProxy* parent =
-        RenderFrameProxy::FromRoutingID(parent_routing_id);
-    CHECK(parent);
-    CHECK(parent->web_frame()->isWebRemoteFrame());
-    web_frame = parent->web_frame()->toWebRemoteFrame()->createRemoteChild(
-        "", proxy.get());
-    render_view = parent->render_view();
-  }
-
-  proxy->Init(web_frame, render_view);
-
-  return proxy.release();
+RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(int routing_id,
+                                                     int frame_routing_id) {
+  DCHECK_NE(routing_id, MSG_ROUTING_NONE);
+  RenderFrameProxy* proxy = new RenderFrameProxy(routing_id, frame_routing_id);
+  return proxy;
 }
 
 // static
@@ -94,58 +40,27 @@ RenderFrameProxy* RenderFrameProxy::FromRoutingID(int32 routing_id) {
   return it == proxies->end() ? NULL : it->second;
 }
 
-// static
-RenderFrameProxy* RenderFrameProxy::FromWebFrame(blink::WebFrame* web_frame) {
-  FrameMap::iterator iter = g_frame_map.Get().find(web_frame);
-  if (iter != g_frame_map.Get().end()) {
-    RenderFrameProxy* proxy = iter->second;
-    DCHECK_EQ(web_frame, proxy->web_frame());
-    return proxy;
-  }
-  return NULL;
-}
-
 RenderFrameProxy::RenderFrameProxy(int routing_id, int frame_routing_id)
     : routing_id_(routing_id),
-      frame_routing_id_(frame_routing_id),
-      web_frame_(NULL),
-      render_view_(NULL) {
+      frame_routing_id_(frame_routing_id) {
   std::pair<RoutingIDProxyMap::iterator, bool> result =
-      g_routing_id_proxy_map.Get().insert(std::make_pair(routing_id_, this));
+    g_routing_id_proxy_map.Get().insert(std::make_pair(routing_id_, this));
   CHECK(result.second) << "Inserting a duplicate item.";
   RenderThread::Get()->AddRoute(routing_id_, this);
+
+  render_frame_ = RenderFrameImpl::FromRoutingID(frame_routing_id);
+  CHECK(render_frame_);
+  render_frame_->render_view()->RegisterRenderFrameProxy(this);
 }
 
 RenderFrameProxy::~RenderFrameProxy() {
-  render_view()->UnregisterRenderFrameProxy(this);
-
-  FrameMap::iterator it = g_frame_map.Get().find(web_frame_);
-  CHECK(it != g_frame_map.Get().end());
-  CHECK_EQ(it->second, this);
-  g_frame_map.Get().erase(it);
-
+  render_frame_->render_view()->UnregisterRenderFrameProxy(this);
   RenderThread::Get()->RemoveRoute(routing_id_);
   g_routing_id_proxy_map.Get().erase(routing_id_);
-
-  // TODO(nick): Call close unconditionally when web_frame() is always remote.
-  if (web_frame()->isWebRemoteFrame())
-    web_frame()->close();
 }
 
-void RenderFrameProxy::Init(blink::WebFrame* web_frame,
-                            RenderViewImpl* render_view) {
-  CHECK(web_frame);
-  CHECK(render_view);
-
-  web_frame_ = web_frame;
-  render_view_ = render_view;
-
-  // TODO(nick): Should all RenderFrameProxies remain observers of their views?
-  render_view_->RegisterRenderFrameProxy(this);
-
-  std::pair<FrameMap::iterator, bool> result =
-      g_frame_map.Get().insert(std::make_pair(web_frame_, this));
-  CHECK(result.second) << "Inserted a duplicate item.";
+blink::WebFrame* RenderFrameProxy::GetWebFrame() {
+  return render_frame_->GetWebFrame();
 }
 
 void RenderFrameProxy::DidCommitCompositorFrame() {
@@ -164,10 +79,8 @@ bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
-  RenderFrameImpl* render_frame =
-      RenderFrameImpl::FromRoutingID(frame_routing_id_);
-  if (!handled && render_frame)
-    return render_frame->OnMessageReceived(msg);
+  if (!handled)
+    return render_frame_->OnMessageReceived(msg);
 
   return handled;
 }
@@ -184,9 +97,8 @@ bool RenderFrameProxy::Send(IPC::Message* message) {
 void RenderFrameProxy::OnDeleteProxy() {
   RenderFrameImpl* render_frame =
       RenderFrameImpl::FromRoutingID(frame_routing_id_);
-
-  if (render_frame)
-    render_frame->set_render_frame_proxy(NULL);
+  CHECK(render_frame);
+  render_frame->set_render_frame_proxy(NULL);
 
   delete this;
 }
@@ -198,9 +110,10 @@ void RenderFrameProxy::OnChildFrameProcessGone() {
 
 void RenderFrameProxy::OnBuffersSwapped(
     const FrameMsg_BuffersSwapped_Params& params) {
-  if (!compositing_helper_) {
+  if (!compositing_helper_.get()) {
     compositing_helper_ =
-        ChildFrameCompositingHelper::CreateForRenderFrameProxy(this);
+        ChildFrameCompositingHelper::CreateCompositingHelperForRenderFrame(
+            GetWebFrame(), this, routing_id_);
     compositing_helper_->EnableCompositing(true);
   }
   compositing_helper_->OnBuffersSwapped(
@@ -208,7 +121,7 @@ void RenderFrameProxy::OnBuffersSwapped(
       params.mailbox,
       params.gpu_route_id,
       params.gpu_host_id,
-      web_frame()->view()->deviceScaleFactor());
+      render_frame_->render_view()->GetWebView()->deviceScaleFactor());
 }
 
 void RenderFrameProxy::OnCompositorFrameSwapped(const IPC::Message& message) {
@@ -219,9 +132,10 @@ void RenderFrameProxy::OnCompositorFrameSwapped(const IPC::Message& message) {
   scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
   param.a.frame.AssignTo(frame.get());
 
-  if (!compositing_helper_) {
+  if (!compositing_helper_.get()) {
     compositing_helper_ =
-        ChildFrameCompositingHelper::CreateForRenderFrameProxy(this);
+        ChildFrameCompositingHelper::CreateCompositingHelperForRenderFrame(
+            GetWebFrame(), this, routing_id_);
     compositing_helper_->EnableCompositing(true);
   }
   compositing_helper_->OnCompositorFrameSwapped(frame.Pass(),