Chromium Code Reviews| 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 "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
| 8 #include "content/browser/bad_message.h" | 8 #include "content/browser/bad_message.h" |
| 9 #include "content/browser/frame_host/cross_process_frame_connector.h" | 9 #include "content/browser/frame_host/cross_process_frame_connector.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 static_cast<RenderWidgetHostViewChildFrame*>(view)); | 92 static_cast<RenderWidgetHostViewChildFrame*>(view)); |
| 93 } | 93 } |
| 94 | 94 |
| 95 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { | 95 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { |
| 96 return frame_tree_node_->frame_tree()->GetRenderViewHost( | 96 return frame_tree_node_->frame_tree()->GetRenderViewHost( |
| 97 site_instance_.get()); | 97 site_instance_.get()); |
| 98 } | 98 } |
| 99 | 99 |
| 100 void RenderFrameProxyHost::TakeFrameHostOwnership( | 100 void RenderFrameProxyHost::TakeFrameHostOwnership( |
| 101 scoped_ptr<RenderFrameHostImpl> render_frame_host) { | 101 scoped_ptr<RenderFrameHostImpl> render_frame_host) { |
| 102 CHECK(render_frame_host_ == nullptr); | |
|
nasko
2015/05/14 14:09:01
CHECK_EQ?
ncarter (slow)
2015/05/14 17:16:13
Tried five things:
CHECK(render_frame_host_ == nu
| |
| 102 render_frame_host_ = render_frame_host.Pass(); | 103 render_frame_host_ = render_frame_host.Pass(); |
| 103 render_frame_host_->set_render_frame_proxy_host(this); | 104 render_frame_host_->set_render_frame_proxy_host(this); |
| 104 } | 105 } |
| 105 | 106 |
| 106 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { | 107 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { |
| 107 render_frame_host_->set_render_frame_proxy_host(NULL); | 108 render_frame_host_->set_render_frame_proxy_host(NULL); |
| 108 return render_frame_host_.Pass(); | 109 return render_frame_host_.Pass(); |
| 109 } | 110 } |
| 110 | 111 |
| 111 bool RenderFrameProxyHost::Send(IPC::Message *msg) { | 112 bool RenderFrameProxyHost::Send(IPC::Message *msg) { |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 256 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts, | 257 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts, |
| 257 message_port_message_filter, target_rfh->GetRoutingID(), | 258 message_port_message_filter, target_rfh->GetRoutingID(), |
| 258 new_params)); | 259 new_params)); |
| 259 } else { | 260 } else { |
| 260 target_rfh->Send( | 261 target_rfh->Send( |
| 261 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); | 262 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); |
| 262 } | 263 } |
| 263 } | 264 } |
| 264 | 265 |
| 265 } // namespace content | 266 } // namespace content |
| OLD | NEW |