Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: content/browser/frame_host/render_frame_proxy_host.cc

Issue 606113005: Move RenderViewHost swap out state to RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix CrossSiteIframe test. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/frame_host/cross_process_frame_connector.h" 8 #include "content/browser/frame_host/cross_process_frame_connector.h"
9 #include "content/browser/frame_host/frame_tree.h" 9 #include "content/browser/frame_host/frame_tree.h"
10 #include "content/browser/frame_host/frame_tree_node.h" 10 #include "content/browser/frame_host/frame_tree_node.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { 79 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
80 cross_process_frame_connector_->set_view( 80 cross_process_frame_connector_->set_view(
81 static_cast<RenderWidgetHostViewChildFrame*>(view)); 81 static_cast<RenderWidgetHostViewChildFrame*>(view));
82 } 82 }
83 83
84 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { 84 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
85 return frame_tree_node_->frame_tree()->GetRenderViewHost( 85 return frame_tree_node_->frame_tree()->GetRenderViewHost(
86 site_instance_.get()); 86 site_instance_.get());
87 } 87 }
88 88
89 void RenderFrameProxyHost::TakeFrameHostOwnership(
90 scoped_ptr<RenderFrameHostImpl> render_frame_host) {
91 render_frame_host_ = render_frame_host.Pass();
92 render_frame_host_->set_render_frame_proxy_host(this);
Charlie Reis 2014/09/29 16:52:57 The proxy host wasn't getting set on main frames t
nasko 2014/09/29 20:28:09 Thanks!
93 }
94
89 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { 95 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {
90 render_frame_host_->set_render_frame_proxy_host(NULL); 96 render_frame_host_->set_render_frame_proxy_host(NULL);
91 return render_frame_host_.Pass(); 97 return render_frame_host_.Pass();
92 } 98 }
93 99
94 bool RenderFrameProxyHost::Send(IPC::Message *msg) { 100 bool RenderFrameProxyHost::Send(IPC::Message *msg) {
95 // TODO(nasko): For now, RenderFrameHost uses this object to send IPC messages 101 // TODO(nasko): For now, RenderFrameHost uses this object to send IPC messages
96 // while swapped out. This can be removed once we don't have a swapped out 102 // while swapped out. This can be removed once we don't have a swapped out
97 // state on RenderFrameHosts. See https://crbug.com/357747. 103 // state on RenderFrameHosts. See https://crbug.com/357747.
98 msg->set_routing_id(routing_id_); 104 msg->set_routing_id(routing_id_);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 ->GetRoutingID())); 143 ->GetRoutingID()));
138 144
139 return true; 145 return true;
140 } 146 }
141 147
142 void RenderFrameProxyHost::DisownOpener() { 148 void RenderFrameProxyHost::DisownOpener() {
143 Send(new FrameMsg_DisownOpener(GetRoutingID())); 149 Send(new FrameMsg_DisownOpener(GetRoutingID()));
144 } 150 }
145 151
146 } // namespace content 152 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698