| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/cross_process_frame_connector.h" | 5 #include "content/browser/frame_host/cross_process_frame_connector.h" |
| 6 | 6 |
| 7 #include "cc/surfaces/surface.h" | 7 #include "cc/surfaces/surface.h" |
| 8 #include "cc/surfaces/surface_manager.h" | 8 #include "cc/surfaces/surface_manager.h" |
| 9 #include "content/browser/compositor/surface_utils.h" | 9 #include "content/browser/compositor/surface_utils.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 SetSize(child_frame_rect_); | 68 SetSize(child_frame_rect_); |
| 69 } | 69 } |
| 70 } | 70 } |
| 71 | 71 |
| 72 void CrossProcessFrameConnector::RenderProcessGone() { | 72 void CrossProcessFrameConnector::RenderProcessGone() { |
| 73 frame_proxy_in_parent_renderer_->Send(new FrameMsg_ChildFrameProcessGone( | 73 frame_proxy_in_parent_renderer_->Send(new FrameMsg_ChildFrameProcessGone( |
| 74 frame_proxy_in_parent_renderer_->GetRoutingID())); | 74 frame_proxy_in_parent_renderer_->GetRoutingID())); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void CrossProcessFrameConnector::ChildFrameCompositorFrameSwapped( | 77 void CrossProcessFrameConnector::ChildFrameCompositorFrameSwapped( |
| 78 uint32 output_surface_id, | 78 uint32_t output_surface_id, |
| 79 int host_id, | 79 int host_id, |
| 80 int route_id, | 80 int route_id, |
| 81 scoped_ptr<cc::CompositorFrame> frame) { | 81 scoped_ptr<cc::CompositorFrame> frame) { |
| 82 FrameMsg_CompositorFrameSwapped_Params params; | 82 FrameMsg_CompositorFrameSwapped_Params params; |
| 83 frame->AssignTo(¶ms.frame); | 83 frame->AssignTo(¶ms.frame); |
| 84 params.output_surface_id = output_surface_id; | 84 params.output_surface_id = output_surface_id; |
| 85 params.producing_route_id = route_id; | 85 params.producing_route_id = route_id; |
| 86 params.producing_host_id = host_id; | 86 params.producing_host_id = host_id; |
| 87 frame_proxy_in_parent_renderer_->Send(new FrameMsg_CompositorFrameSwapped( | 87 frame_proxy_in_parent_renderer_->Send(new FrameMsg_CompositorFrameSwapped( |
| 88 frame_proxy_in_parent_renderer_->GetRoutingID(), params)); | 88 frame_proxy_in_parent_renderer_->GetRoutingID(), params)); |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 // in the case of nested WebContents. | 252 // in the case of nested WebContents. |
| 253 while (top_host->frame_tree_node()->render_manager()->ForInnerDelegate()) { | 253 while (top_host->frame_tree_node()->render_manager()->ForInnerDelegate()) { |
| 254 top_host = top_host->frame_tree_node()->render_manager()-> | 254 top_host = top_host->frame_tree_node()->render_manager()-> |
| 255 GetOuterDelegateNode()->frame_tree()->root()->current_frame_host(); | 255 GetOuterDelegateNode()->frame_tree()->root()->current_frame_host(); |
| 256 } | 256 } |
| 257 | 257 |
| 258 return static_cast<RenderWidgetHostViewBase*>(top_host->GetView()); | 258 return static_cast<RenderWidgetHostViewBase*>(top_host->GetView()); |
| 259 } | 259 } |
| 260 | 260 |
| 261 } // namespace content | 261 } // namespace content |
| OLD | NEW |