Make page popups work under OOPIF

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 "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 45 matching lines @@
   // 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_) {
     view_->set_cross_process_frame_connector(this);
     SetDeviceScaleFactor(device_scale_factor_);
-    SetSize(child_frame_rect_);
+    SetRect(child_frame_rect_);
   }
 }
 
 void CrossProcessFrameConnector::RenderProcessGone() {
   frame_proxy_in_parent_renderer_->Send(new FrameMsg_ChildFrameProcessGone(
       frame_proxy_in_parent_renderer_->GetRoutingID()));
 }
 
 void CrossProcessFrameConnector::SetChildFrameSurface(
     const cc::SurfaceId& surface_id,
@@ skipping 24 matching lines @@
   }
   surface->AddDestructionDependency(sequence);
 }
 
 void CrossProcessFrameConnector::OnInitializeChildFrame(gfx::Rect frame_rect,
                                                         float scale_factor) {
   if (scale_factor != device_scale_factor_)
     SetDeviceScaleFactor(scale_factor);
 
   if (!frame_rect.size().IsEmpty())
-    SetSize(frame_rect);
+    SetRect(frame_rect);
 }
 
 gfx::Rect CrossProcessFrameConnector::ChildFrameRect() {
   return child_frame_rect_;
 }
 
 void CrossProcessFrameConnector::GetScreenInfo(blink::WebScreenInfo* results) {
   // Inner WebContents's root FrameTreeNode does not have a parent(), so
   // GetRenderWidgetHostView() call below will fail.
   // TODO(lazyboy): Fix this.
@@ skipping 81 matching lines @@
   if (event->type == blink::WebInputEvent::MouseWheel) {
     view_->ProcessMouseWheelEvent(
         *static_cast<const blink::WebMouseWheelEvent*>(event));
     return;
   }
 }
 
 void CrossProcessFrameConnector::OnFrameRectChanged(
     const gfx::Rect& frame_rect) {
   if (!frame_rect.size().IsEmpty())
-    SetSize(frame_rect);
+    SetRect(frame_rect);
 }
 
 void CrossProcessFrameConnector::OnVisibilityChanged(bool visible) {
   if (!view_)
     return;
 
   // If there is an inner WebContents, it should be notified of the change in
   // the visibility. The Show/Hide methods will not be called if an inner
   // WebContents exists since the corresponding WebContents will itself call
   // Show/Hide on all the RenderWidgetHostViews (including this) one.
@@ skipping 15 matching lines @@
 void CrossProcessFrameConnector::SetDeviceScaleFactor(float scale_factor) {
   device_scale_factor_ = scale_factor;
   // The RenderWidgetHost is null in unit tests.
   if (view_ && view_->GetRenderWidgetHost()) {
     RenderWidgetHostImpl* child_widget =
         RenderWidgetHostImpl::From(view_->GetRenderWidgetHost());
     child_widget->NotifyScreenInfoChanged();
   }
 }
 
-void CrossProcessFrameConnector::SetSize(gfx::Rect frame_rect) {
+void CrossProcessFrameConnector::SetRect(const gfx::Rect& frame_rect) {
   child_frame_rect_ = frame_rect;
   if (view_)
-    view_->SetSize(frame_rect.size());
+    view_->SetBounds(frame_rect);
 }
 
 RenderWidgetHostViewBase*
 CrossProcessFrameConnector::GetRootRenderWidgetHostView() {
   RenderFrameHostImpl* top_host = frame_proxy_in_parent_renderer_->
       frame_tree_node()->frame_tree()->root()->current_frame_host();
 
   // This method should return the root RWHV from the top-level WebContents,
   // in the case of nested WebContents.
   while (top_host->frame_tree_node()->render_manager()->ForInnerDelegate()) {
@@ skipping 21 matching lines @@
 
   if (parent) {
     return static_cast<RenderWidgetHostViewBase*>(
         parent->current_frame_host()->GetView());
   }
 
   return nullptr;
 }
 
 }  // namespace content