Add DocumentInterfaceBroker mojom interface
This change adds a new mojom interface DocumentInterfaceBroker and its
implementation in RenderFrameHostImpl. RenderFrameImpl and
LocalFrameClientImpl now store content and blink versions of
pointers to this new interface and add methods that make it available
to other classes.
Bug: 718652
Change-Id: Iad2030a51e7ee2ca6443723f3758d9e53d1f9e9a
Reviewed-on: https://chromium-review.googlesource.com/c/1285324
Commit-Queue: Oksana Zhuravlova <[email protected]>
Reviewed-by: Tommy Li <[email protected]>
Reviewed-by: Dmitry Gozman <[email protected]>
Reviewed-by: Chrome Cunningham <[email protected]>
Reviewed-by: Rebekah Potter <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Cr-Commit-Position: refs/heads/master@{#620490}diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 6c9b951f..6949c53 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -198,6 +198,9 @@
RenderViewImpl* render_view,
int32_t routing_id,
service_manager::mojom::InterfaceProviderPtr interface_provider,
+ blink::mojom::DocumentInterfaceBrokerPtr
+ document_interface_broker_content,
+ blink::mojom::DocumentInterfaceBrokerPtr document_interface_broker_blink,
int32_t widget_routing_id,
bool hidden,
const ScreenInfo& screen_info,
@@ -229,6 +232,9 @@
static void CreateFrame(
int routing_id,
service_manager::mojom::InterfaceProviderPtr interface_provider,
+ blink::mojom::DocumentInterfaceBrokerPtr
+ document_interface_broker_content,
+ blink::mojom::DocumentInterfaceBrokerPtr document_interface_broker_blink,
int proxy_routing_id,
int opener_routing_id,
int parent_routing_id,
@@ -252,6 +258,8 @@
RenderViewImpl* render_view,
int32_t routing_id,
service_manager::mojom::InterfaceProviderPtr interface_provider,
+ blink::mojom::DocumentInterfaceBrokerPtr
+ document_interface_broker_content,
const base::UnguessableToken& devtools_frame_token);
~CreateParams();
@@ -261,6 +269,7 @@
RenderViewImpl* render_view;
int32_t routing_id;
service_manager::mojom::InterfaceProviderPtr interface_provider;
+ blink::mojom::DocumentInterfaceBrokerPtr document_interface_broker_content;
base::UnguessableToken devtools_frame_token;
};
@@ -480,6 +489,7 @@
const std::string& interface_name,
mojo::ScopedMessagePipeHandle interface_pipe) override;
service_manager::InterfaceProvider* GetRemoteInterfaces() override;
+ blink::mojom::DocumentInterfaceBroker* GetDocumentInterfaceBroker() override;
blink::AssociatedInterfaceRegistry* GetAssociatedInterfaceRegistry() override;
blink::AssociatedInterfaceProvider* GetRemoteAssociatedInterfaces() override;
#if BUILDFLAG(ENABLE_PLUGINS)
@@ -673,7 +683,9 @@
void DidCommitProvisionalLoad(
const blink::WebHistoryItem& item,
blink::WebHistoryCommitType commit_type,
- blink::WebGlobalObjectReusePolicy global_object_reuse_policy) override;
+ blink::WebGlobalObjectReusePolicy global_object_reuse_policy,
+ mojo::ScopedMessagePipeHandle document_interface_broker_blink_handle)
+ override;
void DidCreateNewDocument() override;
void DidClearWindowObject() override;
void DidCreateDocumentElement() override;
@@ -981,12 +993,17 @@
typedef std::map<GURL, double> HostZoomLevels;
// Creates a new RenderFrame. |render_view| is the RenderView object that this
- // frame belongs to, and |interface_provider| is the RenderFrameHost's
- // InterfaceProvider through which services are exposed to the RenderFrame.
+ // frame belongs to, |interface_provider| is the RenderFrameHost's
+ // InterfaceProvider through which services are exposed to the RenderFrame,
+ // and |document_interface_broker_content| is the RenderFrameHost's
+ // DocumentInterfaceBroker through which services are exposed to the
+ // RenderFrame.
static RenderFrameImpl* Create(
RenderViewImpl* render_view,
int32_t routing_id,
service_manager::mojom::InterfaceProviderPtr interface_provider,
+ blink::mojom::DocumentInterfaceBrokerPtr
+ document_interface_broker_content,
const base::UnguessableToken& devtools_frame_token);
// Functions to add and remove observers for this object.
@@ -1264,8 +1281,7 @@
blink::WebHistoryCommitType commit_type,
bool was_within_same_document,
ui::PageTransition transition,
- service_manager::mojom::InterfaceProviderRequest
- remote_interface_provider_request);
+ mojom::DidCommitProvisionalLoadInterfaceParamsPtr interface_params);
blink::WebComputedAXTree* GetOrCreateWebComputedAXTree() override;
@@ -1460,6 +1476,8 @@
service_manager::InterfaceProvider remote_interfaces_;
std::unique_ptr<BlinkInterfaceRegistryImpl> blink_interface_registry_;
+ blink::mojom::DocumentInterfaceBrokerPtr document_interface_broker_;
+
service_manager::BindSourceInfo local_info_;
service_manager::BindSourceInfo remote_info_;
