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

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

Issue 503933002: Remove implicit conversions from scoped_refptr to T* in content/browser/frame_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/browser/frame_host/cross_process_frame_connector.h" 7 #include "content/browser/frame_host/cross_process_frame_connector.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/frame_host/frame_tree_node.h" 9 #include "content/browser/frame_host/frame_tree_node.h"
10 #include "content/browser/frame_host/render_frame_host_impl.h" 10 #include "content/browser/frame_host/render_frame_host_impl.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 GetProcess()->RemoveRoute(routing_id_); 47 GetProcess()->RemoveRoute(routing_id_);
48 } 48 }
49 49
50 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) { 50 void RenderFrameProxyHost::SetChildRWHView(RenderWidgetHostView* view) {
51 cross_process_frame_connector_->set_view( 51 cross_process_frame_connector_->set_view(
52 static_cast<RenderWidgetHostViewChildFrame*>(view)); 52 static_cast<RenderWidgetHostViewChildFrame*>(view));
53 } 53 }
54 54
55 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() { 55 RenderViewHostImpl* RenderFrameProxyHost::GetRenderViewHost() {
56 return frame_tree_node_->frame_tree()->GetRenderViewHost(site_instance_); 56 return frame_tree_node_->frame_tree()->GetRenderViewHost(
57 site_instance_.get());
57 } 58 }
58 59
59 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() { 60 scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {
60 render_frame_host_->set_render_frame_proxy_host(NULL); 61 render_frame_host_->set_render_frame_proxy_host(NULL);
61 return render_frame_host_.Pass(); 62 return render_frame_host_.Pass();
62 } 63 }
63 64
64 bool RenderFrameProxyHost::Send(IPC::Message *msg) { 65 bool RenderFrameProxyHost::Send(IPC::Message *msg) {
65 // TODO(nasko): For now, RenderFrameHost uses this object to send IPC messages 66 // TODO(nasko): For now, RenderFrameHost uses this object to send IPC messages
66 // while swapped out. This can be removed once we don't have a swapped out 67 // while swapped out. This can be removed once we don't have a swapped out
(...skipping 20 matching lines...) Expand all
87 // initialized it) or may not (we have our own process or the old process 88 // initialized it) or may not (we have our own process or the old process
88 // crashed) have been initialized. Calling Init multiple times will be 89 // crashed) have been initialized. Calling Init multiple times will be
89 // ignored, so this is safe. 90 // ignored, so this is safe.
90 if (!site_instance_->GetProcess()->Init()) 91 if (!site_instance_->GetProcess()->Init())
91 return false; 92 return false;
92 93
93 DCHECK(GetProcess()->HasConnection()); 94 DCHECK(GetProcess()->HasConnection());
94 95
95 int parent_routing_id = MSG_ROUTING_NONE; 96 int parent_routing_id = MSG_ROUTING_NONE;
96 if (frame_tree_node_->parent()) { 97 if (frame_tree_node_->parent()) {
97 parent_routing_id = frame_tree_node_->parent()->render_manager()-> 98 parent_routing_id = frame_tree_node_->parent()
98 GetRoutingIdForSiteInstance(site_instance_); 99 ->render_manager()
100 ->GetRoutingIdForSiteInstance(site_instance_.get());
99 CHECK_NE(parent_routing_id, MSG_ROUTING_NONE); 101 CHECK_NE(parent_routing_id, MSG_ROUTING_NONE);
100 } 102 }
101 103
102 Send(new FrameMsg_NewFrameProxy( 104 Send(new FrameMsg_NewFrameProxy(routing_id_,
103 routing_id_, 105 parent_routing_id,
104 parent_routing_id, 106 frame_tree_node_->frame_tree()
105 frame_tree_node_->frame_tree()->GetRenderViewHost( 107 ->GetRenderViewHost(site_instance_.get())
106 site_instance_)->GetRoutingID())); 108 ->GetRoutingID()));
107 109
108 return true; 110 return true;
109 } 111 }
110 112
111 } // namespace content 113 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698