| 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_hittest.h" | 8 #include "cc/surfaces/surface_hittest.h" |
| 9 #include "cc/surfaces/surface_manager.h" | 9 #include "cc/surfaces/surface_manager.h" |
| 10 #include "content/browser/compositor/surface_utils.h" | 10 #include "content/browser/compositor/surface_utils.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 SetRect(child_frame_rect_); | 82 SetRect(child_frame_rect_); |
| 83 } | 83 } |
| 84 } | 84 } |
| 85 | 85 |
| 86 void CrossProcessFrameConnector::RenderProcessGone() { | 86 void CrossProcessFrameConnector::RenderProcessGone() { |
| 87 frame_proxy_in_parent_renderer_->Send(new FrameMsg_ChildFrameProcessGone( | 87 frame_proxy_in_parent_renderer_->Send(new FrameMsg_ChildFrameProcessGone( |
| 88 frame_proxy_in_parent_renderer_->GetRoutingID())); | 88 frame_proxy_in_parent_renderer_->GetRoutingID())); |
| 89 } | 89 } |
| 90 | 90 |
| 91 void CrossProcessFrameConnector::SetChildFrameSurface( | 91 void CrossProcessFrameConnector::SetChildFrameSurface( |
| 92 const cc::SurfaceId& surface_id, | 92 const cc::SurfaceInfo& surface_info, |
| 93 const gfx::Size& frame_size, | |
| 94 float scale_factor, | |
| 95 const cc::SurfaceSequence& sequence) { | 93 const cc::SurfaceSequence& sequence) { |
| 96 frame_proxy_in_parent_renderer_->Send(new FrameMsg_SetChildFrameSurface( | 94 frame_proxy_in_parent_renderer_->Send(new FrameMsg_SetChildFrameSurface( |
| 97 frame_proxy_in_parent_renderer_->GetRoutingID(), surface_id, frame_size, | 95 frame_proxy_in_parent_renderer_->GetRoutingID(), surface_info, sequence)); |
| 98 scale_factor, sequence)); | |
| 99 } | 96 } |
| 100 | 97 |
| 101 void CrossProcessFrameConnector::OnSatisfySequence( | 98 void CrossProcessFrameConnector::OnSatisfySequence( |
| 102 const cc::SurfaceSequence& sequence) { | 99 const cc::SurfaceSequence& sequence) { |
| 103 GetSurfaceManager()->SatisfySequence(sequence); | 100 GetSurfaceManager()->SatisfySequence(sequence); |
| 104 } | 101 } |
| 105 | 102 |
| 106 void CrossProcessFrameConnector::OnRequireSequence( | 103 void CrossProcessFrameConnector::OnRequireSequence( |
| 107 const cc::SurfaceId& id, | 104 const cc::SurfaceId& id, |
| 108 const cc::SurfaceSequence& sequence) { | 105 const cc::SurfaceSequence& sequence) { |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 | 374 |
| 378 if (parent) { | 375 if (parent) { |
| 379 return static_cast<RenderWidgetHostViewBase*>( | 376 return static_cast<RenderWidgetHostViewBase*>( |
| 380 parent->current_frame_host()->GetView()); | 377 parent->current_frame_host()->GetView()); |
| 381 } | 378 } |
| 382 | 379 |
| 383 return nullptr; | 380 return nullptr; |
| 384 } | 381 } |
| 385 | 382 |
| 386 } // namespace content | 383 } // namespace content |
| OLD | NEW |