Revert 271461 "Decouple RVH creation from CrossProcessFrameConne..."

trunk/src/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_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"
@@ skipping 35 matching lines @@
 }
 
 void CrossProcessFrameConnector::set_view(
     RenderWidgetHostViewChildFrame* view) {
   // Detach ourselves from the previous |view_|.
   if (view_)
     view_->set_cross_process_frame_connector(NULL);
 
   view_ = view;
 
-  // Attach ourselves to the new view and size it appropriately.
-  if (view_) {
+  // Attach ourselves to the new view.
+  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()));
 }
 
 void CrossProcessFrameConnector::ChildFrameBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& gpu_params,
     int gpu_host_id) {
@@ skipping 47 matching lines @@
 void CrossProcessFrameConnector::OnReclaimCompositorResources(
     const FrameHostMsg_ReclaimCompositorResources_Params& params) {
   RenderWidgetHostImpl::SendReclaimCompositorResources(params.route_id,
                                                        params.output_surface_id,
                                                        params.renderer_host_id,
                                                        params.ack);
 }
 
 void CrossProcessFrameConnector::OnInitializeChildFrame(gfx::Rect frame_rect,
                                                         float scale_factor) {
-  if (scale_factor != device_scale_factor_)
-    SetDeviceScaleFactor(scale_factor);
+  if (scale_factor != device_scale_factor_) {
+    device_scale_factor_ = scale_factor;
+    if (view_) {
+      RenderWidgetHostImpl* child_widget =
+          RenderWidgetHostImpl::From(view_->GetRenderWidgetHost());
+      child_widget->NotifyScreenInfoChanged();
+    }
+  }
 
-  if (!frame_rect.size().IsEmpty())
-    SetSize(frame_rect);
+  if (!frame_rect.size().IsEmpty()) {
+    child_frame_rect_ = frame_rect;
+    if (view_)
+      view_->SetSize(frame_rect.size());
+  }
 }
 
 gfx::Rect CrossProcessFrameConnector::ChildFrameRect() {
   return child_frame_rect_;
 }
 
 void CrossProcessFrameConnector::OnForwardInputEvent(
     const blink::WebInputEvent* event) {
   if (!view_)
     return;
@@ skipping 18 matching lines @@
     return;
   }
 
   if (event->type == blink::WebInputEvent::MouseWheel) {
     child_widget->ForwardWheelEvent(
         *static_cast<const blink::WebMouseWheelEvent*>(event));
     return;
   }
 }
 
-void CrossProcessFrameConnector::SetDeviceScaleFactor(float scale_factor) {
-  device_scale_factor_ = scale_factor;
-  if (view_) {
-    RenderWidgetHostImpl* child_widget =
-        RenderWidgetHostImpl::From(view_->GetRenderWidgetHost());
-    child_widget->NotifyScreenInfoChanged();
-  }
-}
-
-void CrossProcessFrameConnector::SetSize(gfx::Rect frame_rect) {
-  child_frame_rect_ = frame_rect;
-  if (view_)
-    view_->SetSize(frame_rect.size());
-}
-
 }  // namespace content