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

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

Issue 285333003: Support exposing Mojo services between render frames, render threads, and their respective hosts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gn Created 6 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/metrics/user_metrics_action.h" 10 #include "base/metrics/user_metrics_action.h"
11 #include "content/browser/child_process_security_policy_impl.h" 11 #include "content/browser/child_process_security_policy_impl.h"
12 #include "content/browser/frame_host/cross_process_frame_connector.h" 12 #include "content/browser/frame_host/cross_process_frame_connector.h"
13 #include "content/browser/frame_host/cross_site_transferring_request.h" 13 #include "content/browser/frame_host/cross_site_transferring_request.h"
14 #include "content/browser/frame_host/frame_tree.h" 14 #include "content/browser/frame_host/frame_tree.h"
15 #include "content/browser/frame_host/frame_tree_node.h" 15 #include "content/browser/frame_host/frame_tree_node.h"
16 #include "content/browser/frame_host/navigator.h" 16 #include "content/browser/frame_host/navigator.h"
17 #include "content/browser/frame_host/render_frame_host_delegate.h" 17 #include "content/browser/frame_host/render_frame_host_delegate.h"
18 #include "content/browser/frame_host/render_frame_proxy_host.h" 18 #include "content/browser/frame_host/render_frame_proxy_host.h"
19 #include "content/browser/renderer_host/input/input_router.h" 19 #include "content/browser/renderer_host/input/input_router.h"
20 #include "content/browser/renderer_host/input/timeout_monitor.h" 20 #include "content/browser/renderer_host/input/timeout_monitor.h"
21 #include "content/browser/renderer_host/render_view_host_impl.h" 21 #include "content/browser/renderer_host/render_view_host_impl.h"
22 #include "content/browser/renderer_host/render_widget_host_impl.h" 22 #include "content/browser/renderer_host/render_widget_host_impl.h"
23 #include "content/common/desktop_notification_messages.h" 23 #include "content/common/desktop_notification_messages.h"
24 #include "content/common/frame_messages.h" 24 #include "content/common/frame_messages.h"
25 #include "content/common/input_messages.h" 25 #include "content/common/input_messages.h"
26 #include "content/common/inter_process_time_ticks_converter.h" 26 #include "content/common/inter_process_time_ticks_converter.h"
27 #include "content/common/render_frame_setup.mojom.h"
27 #include "content/common/swapped_out_messages.h" 28 #include "content/common/swapped_out_messages.h"
28 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
29 #include "content/public/browser/content_browser_client.h" 30 #include "content/public/browser/content_browser_client.h"
30 #include "content/public/browser/desktop_notification_delegate.h" 31 #include "content/public/browser/desktop_notification_delegate.h"
31 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
32 #include "content/public/browser/render_widget_host_view.h" 33 #include "content/public/browser/render_widget_host_view.h"
33 #include "content/public/browser/user_metrics.h" 34 #include "content/public/browser/user_metrics.h"
34 #include "content/public/common/content_constants.h" 35 #include "content/public/common/content_constants.h"
35 #include "content/public/common/url_constants.h" 36 #include "content/public/common/url_constants.h"
36 #include "content/public/common/url_utils.h" 37 #include "content/public/common/url_utils.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 case blink::WebTextDirectionLeftToRight: 117 case blink::WebTextDirectionLeftToRight:
117 return base::i18n::LEFT_TO_RIGHT; 118 return base::i18n::LEFT_TO_RIGHT;
118 case blink::WebTextDirectionRightToLeft: 119 case blink::WebTextDirectionRightToLeft:
119 return base::i18n::RIGHT_TO_LEFT; 120 return base::i18n::RIGHT_TO_LEFT;
120 default: 121 default:
121 NOTREACHED(); 122 NOTREACHED();
122 return base::i18n::UNKNOWN_DIRECTION; 123 return base::i18n::UNKNOWN_DIRECTION;
123 } 124 }
124 } 125 }
125 126
127 class RenderFrameSetupImpl : public mojo::InterfaceImpl<RenderFrameSetup> {
128 public:
129 explicit RenderFrameSetupImpl(int process_id) : process_id_(process_id) {}
130
131 virtual void ConnectToInterfaceProvider(
darin (slow to review) 2014/06/12 05:27:12 @davemoore and I were again discussing the names o
Sam McNally 2014/06/12 08:56:39 Sounds reasonable, but I'd like to stick with IInt
132 int32_t view_routing_id,
133 mojo::ScopedMessagePipeHandle handle) OVERRIDE {
134 RenderFrameHostImpl* frame_host = static_cast<RenderFrameHostImpl*>(
135 RenderFrameHost::FromID(process_id_, view_routing_id));
136 if (!frame_host)
137 return;
138
139 frame_host->BindServiceRegistry(handle.Pass());
140 }
141
142 virtual void OnConnectionError() OVERRIDE { delete this; }
143
144 private:
145 const int process_id_;
146 };
147
148 void CreateRenderFrameHostSetup(int process_id,
149 mojo::ScopedMessagePipeHandle handle) {
150 mojo::BindToPipe(new RenderFrameSetupImpl(process_id), handle.Pass());
151 }
152
126 } // namespace 153 } // namespace
127 154
128 RenderFrameHost* RenderFrameHost::FromID(int render_process_id, 155 RenderFrameHost* RenderFrameHost::FromID(int render_process_id,
129 int render_frame_id) { 156 int render_frame_id) {
130 return RenderFrameHostImpl::FromID(render_process_id, render_frame_id); 157 return RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
131 } 158 }
132 159
133 // static 160 // static
134 RenderFrameHostImpl* RenderFrameHostImpl::FromID( 161 RenderFrameHostImpl* RenderFrameHostImpl::FromID(
135 int process_id, int routing_id) { 162 int process_id, int routing_id) {
(...skipping 18 matching lines...) Expand all
154 frame_tree_(frame_tree), 181 frame_tree_(frame_tree),
155 frame_tree_node_(frame_tree_node), 182 frame_tree_node_(frame_tree_node),
156 routing_id_(routing_id), 183 routing_id_(routing_id),
157 is_swapped_out_(is_swapped_out), 184 is_swapped_out_(is_swapped_out),
158 weak_ptr_factory_(this) { 185 weak_ptr_factory_(this) {
159 frame_tree_->RegisterRenderFrameHost(this); 186 frame_tree_->RegisterRenderFrameHost(this);
160 GetProcess()->AddRoute(routing_id_, this); 187 GetProcess()->AddRoute(routing_id_, this);
161 g_routing_id_frame_map.Get().insert(std::make_pair( 188 g_routing_id_frame_map.Get().insert(std::make_pair(
162 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 189 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
163 this)); 190 this));
191
192 if (GetProcess()->GetServiceRegistry()) {
193 GetProcess()->GetServiceRegistry()->AddService<RenderFrameSetup>(
194 base::Bind(CreateRenderFrameHostSetup, GetProcess()->GetID()));
195 }
164 } 196 }
165 197
166 RenderFrameHostImpl::~RenderFrameHostImpl() { 198 RenderFrameHostImpl::~RenderFrameHostImpl() {
167 GetProcess()->RemoveRoute(routing_id_); 199 GetProcess()->RemoveRoute(routing_id_);
168 g_routing_id_frame_map.Get().erase( 200 g_routing_id_frame_map.Get().erase(
169 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); 201 RenderFrameHostID(GetProcess()->GetID(), routing_id_));
170 if (delegate_) 202 if (delegate_)
171 delegate_->RenderFrameDeleted(this); 203 delegate_->RenderFrameDeleted(this);
172 204
173 // Notify the FrameTree that this RFH is going away, allowing it to shut down 205 // Notify the FrameTree that this RFH is going away, allowing it to shut down
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_, 266 Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_,
235 javascript, 267 javascript,
236 key, true)); 268 key, true));
237 javascript_callbacks_.insert(std::make_pair(key, callback)); 269 javascript_callbacks_.insert(std::make_pair(key, callback));
238 } 270 }
239 271
240 RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() { 272 RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
241 return render_view_host_; 273 return render_view_host_;
242 } 274 }
243 275
276 ServiceRegistry* RenderFrameHostImpl::GetServiceRegistry() {
277 return &service_registry_;
278 }
279
244 bool RenderFrameHostImpl::Send(IPC::Message* message) { 280 bool RenderFrameHostImpl::Send(IPC::Message* message) {
245 if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) { 281 if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) {
246 return render_view_host_->input_router()->SendInput( 282 return render_view_host_->input_router()->SendInput(
247 make_scoped_ptr(message)); 283 make_scoped_ptr(message));
248 } 284 }
249 285
250 if (render_view_host_->IsSwappedOut()) { 286 if (render_view_host_->IsSwappedOut()) {
251 DCHECK(render_frame_proxy_host_); 287 DCHECK(render_frame_proxy_host_);
252 return render_frame_proxy_host_->Send(message); 288 return render_frame_proxy_host_->Send(message);
253 } 289 }
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 void RenderFrameHostImpl::NotificationClosed(int notification_id) { 925 void RenderFrameHostImpl::NotificationClosed(int notification_id) {
890 cancel_notification_callbacks_.erase(notification_id); 926 cancel_notification_callbacks_.erase(notification_id);
891 } 927 }
892 928
893 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone( 929 void RenderFrameHostImpl::DesktopNotificationPermissionRequestDone(
894 int callback_context) { 930 int callback_context) {
895 Send(new DesktopNotificationMsg_PermissionRequestDone( 931 Send(new DesktopNotificationMsg_PermissionRequestDone(
896 routing_id_, callback_context)); 932 routing_id_, callback_context));
897 } 933 }
898 934
935 void RenderFrameHostImpl::BindServiceRegistry(
936 mojo::ScopedMessagePipeHandle shell_handle) {
937 service_registry_.Bind(shell_handle.Pass());
938 }
939
899 } // namespace content 940 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698