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

Side by Side Diff: content/renderer/render_frame_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: InterfaceRequest in RenderFrameSetup 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 12 matching lines...) Expand all
23 #include "content/child/quota_dispatcher.h" 23 #include "content/child/quota_dispatcher.h"
24 #include "content/child/request_extra_data.h" 24 #include "content/child/request_extra_data.h"
25 #include "content/child/service_worker/service_worker_network_provider.h" 25 #include "content/child/service_worker/service_worker_network_provider.h"
26 #include "content/child/service_worker/web_service_worker_provider_impl.h" 26 #include "content/child/service_worker/web_service_worker_provider_impl.h"
27 #include "content/child/web_socket_stream_handle_impl.h" 27 #include "content/child/web_socket_stream_handle_impl.h"
28 #include "content/child/webmessageportchannel_impl.h" 28 #include "content/child/webmessageportchannel_impl.h"
29 #include "content/child/websocket_bridge.h" 29 #include "content/child/websocket_bridge.h"
30 #include "content/common/clipboard_messages.h" 30 #include "content/common/clipboard_messages.h"
31 #include "content/common/frame_messages.h" 31 #include "content/common/frame_messages.h"
32 #include "content/common/input_messages.h" 32 #include "content/common/input_messages.h"
33 #include "content/common/render_frame_setup.mojom.h"
33 #include "content/common/service_worker/service_worker_types.h" 34 #include "content/common/service_worker/service_worker_types.h"
34 #include "content/common/socket_stream_handle_data.h" 35 #include "content/common/socket_stream_handle_data.h"
35 #include "content/common/swapped_out_messages.h" 36 #include "content/common/swapped_out_messages.h"
36 #include "content/common/view_messages.h" 37 #include "content/common/view_messages.h"
37 #include "content/public/common/bindings_policy.h" 38 #include "content/public/common/bindings_policy.h"
38 #include "content/public/common/content_constants.h" 39 #include "content/public/common/content_constants.h"
39 #include "content/public/common/content_switches.h" 40 #include "content/public/common/content_switches.h"
40 #include "content/public/common/context_menu_params.h" 41 #include "content/public/common/context_menu_params.h"
41 #include "content/public/common/url_constants.h" 42 #include "content/public/common/url_constants.h"
42 #include "content/public/common/url_utils.h" 43 #include "content/public/common/url_utils.h"
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 429
429 render_view_->RegisterRenderFrame(this); 430 render_view_->RegisterRenderFrame(this);
430 431
431 #if defined(OS_ANDROID) 432 #if defined(OS_ANDROID)
432 new JavaBridgeDispatcher(this); 433 new JavaBridgeDispatcher(this);
433 #endif 434 #endif
434 435
435 #if defined(ENABLE_NOTIFICATIONS) 436 #if defined(ENABLE_NOTIFICATIONS)
436 notification_provider_ = new NotificationProvider(this); 437 notification_provider_ = new NotificationProvider(this);
437 #endif 438 #endif
439
440 InitializeServiceRegistry();
438 } 441 }
439 442
440 RenderFrameImpl::~RenderFrameImpl() { 443 RenderFrameImpl::~RenderFrameImpl() {
441 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone()); 444 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, RenderFrameGone());
442 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct()); 445 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnDestruct());
443 446
444 #if defined(VIDEO_HOLE) 447 #if defined(VIDEO_HOLE)
445 if (media_player_manager_) 448 if (media_player_manager_)
446 render_view_->UnregisterVideoHoleFrame(this); 449 render_view_->UnregisterVideoHoleFrame(this);
447 #endif // defined(VIDEO_HOLE) 450 #endif // defined(VIDEO_HOLE)
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 const blink::WebURLRequest& request, 1340 const blink::WebURLRequest& request,
1338 blink::WebNavigationPolicy policy) { 1341 blink::WebNavigationPolicy policy) {
1339 DCHECK(!frame_ || frame_ == frame); 1342 DCHECK(!frame_ || frame_ == frame);
1340 loadURLExternally(frame, request, policy, WebString()); 1343 loadURLExternally(frame, request, policy, WebString());
1341 } 1344 }
1342 1345
1343 void RenderFrameImpl::ExecuteJavaScript(const base::string16& javascript) { 1346 void RenderFrameImpl::ExecuteJavaScript(const base::string16& javascript) {
1344 OnJavaScriptExecuteRequest(javascript, 0, false); 1347 OnJavaScriptExecuteRequest(javascript, 0, false);
1345 } 1348 }
1346 1349
1350 ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
1351 return &service_registry_;
1352 }
1353
1347 void RenderFrameImpl::OnChildFrameProcessGone() { 1354 void RenderFrameImpl::OnChildFrameProcessGone() {
1348 if (compositing_helper_) 1355 if (compositing_helper_)
1349 compositing_helper_->ChildFrameGone(); 1356 compositing_helper_->ChildFrameGone();
1350 } 1357 }
1351 1358
1352 // blink::WebFrameClient implementation ---------------------------------------- 1359 // blink::WebFrameClient implementation ----------------------------------------
1353 1360
1354 blink::WebPlugin* RenderFrameImpl::createPlugin( 1361 blink::WebPlugin* RenderFrameImpl::createPlugin(
1355 blink::WebLocalFrame* frame, 1362 blink::WebLocalFrame* frame,
1356 const blink::WebPluginParams& params) { 1363 const blink::WebPluginParams& params) {
(...skipping 2214 matching lines...) Expand 10 before | Expand all | Expand 10 after
3571 } 3578 }
3572 3579
3573 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3580 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3574 if (!cdm_manager_) 3581 if (!cdm_manager_)
3575 cdm_manager_ = new RendererCdmManager(this); 3582 cdm_manager_ = new RendererCdmManager(this);
3576 return cdm_manager_; 3583 return cdm_manager_;
3577 } 3584 }
3578 3585
3579 #endif // defined(OS_ANDROID) 3586 #endif // defined(OS_ANDROID)
3580 3587
3588 void RenderFrameImpl::InitializeServiceRegistry() {
3589 if (!RenderThread::Get()->GetServiceRegistry())
3590 return;
3591
3592 RenderFrameSetupPtr setup;
3593 RenderThread::Get()->GetServiceRegistry()->GetInterface(&setup);
3594 mojo::IInterfaceProviderPtr interface_provider;
3595 setup->ConnectToInterfaceProvider(routing_id_,
3596 mojo::Get(&interface_provider));
3597 service_registry_.Bind(interface_provider.PassMessagePipe());
3598 }
3599
3581 } // namespace content 3600 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698