Pass frame token to content.mojom.CreateFrameParams
... to replace |opener_routing_id|.
This CL switches content.mojom.CreateFrameParams::opener_routing_id
to use mojo_base.mojom.UnguessableToken.
Note that it is a step forward toward stopping representing |opener
frames| through its routing ID when doing mojo communications between
browser -> renderer.
The next CL will move callers of CreateViewParams::opener_frame_route_id
to also use mojo_base.mojom.UnguessableToken (ie base::UnguessableToken).
That will allow the removal of RenderFrameHostManager::GetOpenerRoutingID()
altogether.
BUG=1051144
[email protected], [email protected], [email protected], [email protected]
Change-Id: Ib0789617cb35234c28cd59584064b4ac84c76bef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210635
Commit-Queue: Antonio Gomes <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Reviewed-by: Dominick Ng <[email protected]>
Reviewed-by: Dave Tapuska <[email protected]>
Cr-Commit-Position: refs/heads/master@{#771607}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b7493e2..a9c62d7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -6570,7 +6570,7 @@
bool WebContentsImpl::CreateRenderFrameForRenderManager(
RenderFrameHost* render_frame_host,
int previous_routing_id,
- int opener_routing_id,
+ const base::Optional<base::UnguessableToken>& opener_frame_token,
int parent_routing_id,
int previous_sibling_routing_id) {
TRACE_EVENT0("browser,navigation",
@@ -6578,9 +6578,10 @@
RenderFrameHostImpl* rfh =
static_cast<RenderFrameHostImpl*>(render_frame_host);
- if (!rfh->CreateRenderFrame(previous_routing_id, opener_routing_id,
- parent_routing_id, previous_sibling_routing_id))
+ if (!rfh->CreateRenderFrame(previous_routing_id, opener_frame_token,
+ parent_routing_id, previous_sibling_routing_id)) {
return false;
+ }
// TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed
// RenderFrameHost will have to be associated with the appropriate
