| 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/render_frame_proxy_host.h" | 5 #include "content/browser/frame_host/render_frame_proxy_host.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 8 #include "content/browser/bad_message.h" | 10 #include "content/browser/bad_message.h" |
| 9 #include "content/browser/frame_host/cross_process_frame_connector.h" | 11 #include "content/browser/frame_host/cross_process_frame_connector.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 12 #include "content/browser/frame_host/frame_tree.h" |
| 11 #include "content/browser/frame_host/frame_tree_node.h" | 13 #include "content/browser/frame_host/frame_tree_node.h" |
| 12 #include "content/browser/frame_host/render_frame_host_delegate.h" | 14 #include "content/browser/frame_host/render_frame_host_delegate.h" |
| 13 #include "content/browser/frame_host/render_frame_host_impl.h" | 15 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 14 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" | 16 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
| 15 #include "content/browser/message_port_message_filter.h" | 17 #include "content/browser/message_port_message_filter.h" |
| 16 #include "content/browser/renderer_host/render_view_host_impl.h" | 18 #include "content/browser/renderer_host/render_view_host_impl.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 } | 117 } |
| 116 | 118 |
| 117 RenderWidgetHostView* RenderFrameProxyHost::GetRenderWidgetHostView() { | 119 RenderWidgetHostView* RenderFrameProxyHost::GetRenderWidgetHostView() { |
| 118 return frame_tree_node_->parent()->render_manager() | 120 return frame_tree_node_->parent()->render_manager() |
| 119 ->GetRenderWidgetHostView(); | 121 ->GetRenderWidgetHostView(); |
| 120 } | 122 } |
| 121 | 123 |
| 122 void RenderFrameProxyHost::TakeFrameHostOwnership( | 124 void RenderFrameProxyHost::TakeFrameHostOwnership( |
| 123 scoped_ptr<RenderFrameHostImpl> render_frame_host) { | 125 scoped_ptr<RenderFrameHostImpl> render_frame_host) { |
| 124 CHECK(render_frame_host_ == nullptr); | 126 CHECK(render_frame_host_ == nullptr); |
| 125 render_frame_host_ = render_frame_host.Pass(); | 127 render_frame_host_ = std::move(render_frame_host); |
| 126 render_frame_host_->set_render_frame_proxy_host(this); | 128 render_frame_host_->set_render_frame_proxy_host(this); |
| 127 } | 129 } |
| 128 | 130 |
| 129 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { | 131 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { |
| 130 render_frame_host_->set_render_frame_proxy_host(NULL); | 132 render_frame_host_->set_render_frame_proxy_host(NULL); |
| 131 return render_frame_host_.Pass(); | 133 return std::move(render_frame_host_); |
| 132 } | 134 } |
| 133 | 135 |
| 134 bool RenderFrameProxyHost::Send(IPC::Message *msg) { | 136 bool RenderFrameProxyHost::Send(IPC::Message *msg) { |
| 135 return GetProcess()->Send(msg); | 137 return GetProcess()->Send(msg); |
| 136 } | 138 } |
| 137 | 139 |
| 138 bool RenderFrameProxyHost::OnMessageReceived(const IPC::Message& msg) { | 140 bool RenderFrameProxyHost::OnMessageReceived(const IPC::Message& msg) { |
| 139 if (cross_process_frame_connector_.get() && | 141 if (cross_process_frame_connector_.get() && |
| 140 cross_process_frame_connector_->OnMessageReceived(msg)) | 142 cross_process_frame_connector_->OnMessageReceived(msg)) |
| 141 return true; | 143 return true; |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, | 353 target_rfh->Send(new FrameMsg_AdvanceFocus(target_rfh->GetRoutingID(), type, |
| 352 source_proxy_routing_id)); | 354 source_proxy_routing_id)); |
| 353 } | 355 } |
| 354 | 356 |
| 355 void RenderFrameProxyHost::OnFrameFocused() { | 357 void RenderFrameProxyHost::OnFrameFocused() { |
| 356 frame_tree_node_->frame_tree()->SetFocusedFrame(frame_tree_node_, | 358 frame_tree_node_->frame_tree()->SetFocusedFrame(frame_tree_node_, |
| 357 GetSiteInstance()); | 359 GetSiteInstance()); |
| 358 } | 360 } |
| 359 | 361 |
| 360 } // namespace content | 362 } // namespace content |
| OLD | NEW |