| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index fe58b65b758864d090f39cd88d2da9fc6ec89e2e..3951ea16387c10ef55afa1ebc164f15b99444920 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -324,9 +324,7 @@ void RenderFrameProxy::OnChildFrameProcessGone() {
|
| }
|
|
|
| void RenderFrameProxy::OnSetChildFrameSurface(
|
| - const cc::SurfaceId& surface_id,
|
| - const gfx::Size& frame_size,
|
| - float scale_factor,
|
| + const cc::SurfaceInfo& surface_info,
|
| const cc::SurfaceSequence& sequence) {
|
| // If this WebFrame has already been detached, its parent will be null. This
|
| // can happen when swapping a WebRemoteFrame with a WebLocalFrame, where this
|
| @@ -339,8 +337,7 @@ void RenderFrameProxy::OnSetChildFrameSurface(
|
| compositing_helper_ =
|
| ChildFrameCompositingHelper::CreateForRenderFrameProxy(this);
|
| }
|
| - compositing_helper_->OnSetSurface(
|
| - cc::SurfaceInfo(surface_id, scale_factor, frame_size), sequence);
|
| + compositing_helper_->OnSetSurface(surface_info, sequence);
|
| }
|
|
|
| void RenderFrameProxy::OnUpdateOpener(int opener_routing_id) {
|
|
|