Move ownership of ChildFrameCompositingHelper from frame to proxy.

content/browser/frame_host/cross_process_frame_connector.cc

 // Copyright 2014 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 "content/browser/frame_host/cross_process_frame_connector.h"
 
-#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/frame_messages.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 namespace content {
 
 CrossProcessFrameConnector::CrossProcessFrameConnector(
-    RenderFrameHostImpl* frame_proxy_in_parent_renderer)
+    RenderFrameProxyHost* frame_proxy_in_parent_renderer)
     : frame_proxy_in_parent_renderer_(frame_proxy_in_parent_renderer),
       view_(NULL),
       device_scale_factor_(1) {
-  frame_proxy_in_parent_renderer->set_cross_process_frame_connector(this);
 }
 
 CrossProcessFrameConnector::~CrossProcessFrameConnector() {
   if (view_)
     view_->set_cross_process_frame_connector(NULL);
 }
 
 bool CrossProcessFrameConnector::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
 
@@ skipping 23 matching lines @@
   // Attach ourselves to the new view and size it appropriately.
   if (view_) {
     view_->set_cross_process_frame_connector(this);
     SetDeviceScaleFactor(device_scale_factor_);
     SetSize(child_frame_rect_);
   }
 }
 
 void CrossProcessFrameConnector::RenderProcessGone() {
   frame_proxy_in_parent_renderer_->Send(new FrameMsg_ChildFrameProcessGone(
-      frame_proxy_in_parent_renderer_->routing_id()));
+      frame_proxy_in_parent_renderer_->GetRoutingID()));
 }
 
 void CrossProcessFrameConnector::ChildFrameBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& gpu_params,
     int gpu_host_id) {
 
   FrameMsg_BuffersSwapped_Params params;
   params.size = gpu_params.size;
   params.mailbox = gpu_params.mailbox;
   params.gpu_route_id = gpu_params.route_id;
   params.gpu_host_id = gpu_host_id;
 
-  frame_proxy_in_parent_renderer_->Send(
-      new FrameMsg_BuffersSwapped(
-          frame_proxy_in_parent_renderer_->routing_id(),
-          params));
+  frame_proxy_in_parent_renderer_->Send(new FrameMsg_BuffersSwapped(
+      frame_proxy_in_parent_renderer_->GetRoutingID(), params));
 }
 
 void CrossProcessFrameConnector::ChildFrameCompositorFrameSwapped(
     uint32 output_surface_id,
     int host_id,
     int route_id,
     scoped_ptr<cc::CompositorFrame> frame) {
   FrameMsg_CompositorFrameSwapped_Params params;
   frame->AssignTo(&params.frame);
   params.output_surface_id = output_surface_id;
   params.producing_route_id = route_id;
   params.producing_host_id = host_id;
   frame_proxy_in_parent_renderer_->Send(new FrameMsg_CompositorFrameSwapped(
-      frame_proxy_in_parent_renderer_->routing_id(), params));
+      frame_proxy_in_parent_renderer_->GetRoutingID(), params));
 }
 
 void CrossProcessFrameConnector::OnBuffersSwappedACK(
     const FrameHostMsg_BuffersSwappedACK_Params& params) {
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.mailbox = params.mailbox;
   ack_params.sync_point = params.sync_point;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(params.gpu_route_id,
                                                  params.gpu_host_id,
                                                  ack_params);
@@ skipping 31 matching lines @@
 }
 
 void CrossProcessFrameConnector::OnForwardInputEvent(
     const blink::WebInputEvent* event) {
   if (!view_)
     return;
 
   RenderWidgetHostImpl* child_widget =
       RenderWidgetHostImpl::From(view_->GetRenderWidgetHost());
   RenderWidgetHostImpl* parent_widget =
-      frame_proxy_in_parent_renderer_->render_view_host();
+      frame_proxy_in_parent_renderer_->GetRenderViewHost();
 
   if (blink::WebInputEvent::isKeyboardEventType(event->type)) {
     if (!parent_widget->GetLastKeyboardEvent())
       return;
     NativeWebKeyboardEvent keyboard_event(
         *parent_widget->GetLastKeyboardEvent());
     child_widget->ForwardKeyboardEvent(keyboard_event);
     return;
   }
 
@@ skipping 19 matching lines @@
   }
 }
 
 void CrossProcessFrameConnector::SetSize(gfx::Rect frame_rect) {
   child_frame_rect_ = frame_rect;
   if (view_)
     view_->SetSize(frame_rect.size());
 }
 
 }  // namespace content