chromium/src
0
Fork 0
Code Activity

Delete WebContentsImpl::CreateRenderFrameForRenderManager.

Browse Source 
It's no longer doing anything interesting anymore, so removing it
makes the code easier to follow.

Change-Id: Ia4b71aedd483395eb1afe250461876e1a239a410
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359591
Commit-Queue: Nasko Oskov <nasko@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805764}
This commit is contained in:
Fergal Daly
2020-09-10 15:47:05 +00:00
committed by Commit Bot
parent 3315ccc659
commit 4ef6b07520
4 changed files with 3 additions and 44 deletions

6
content/browser/renderer_host/render_frame_host_manager.cc

@ -2586,9 +2586,9 @@ bool RenderFrameHostManager::InitRenderFrame(
int previous_routing_id =
GetReplacementRoutingId(existing_proxy, render_frame_host);
return delegate_->CreateRenderFrameForRenderManager(
render_frame_host, previous_routing_id, opener_frame_token,
parent_routing_id, previous_sibling_routing_id);
return render_frame_host->CreateRenderFrame(
previous_routing_id, opener_frame_token, parent_routing_id,
previous_sibling_routing_id);
}
int RenderFrameHostManager::GetReplacementRoutingId(

6
content/browser/renderer_host/render_frame_host_manager.h

@ -128,12 +128,6 @@ class CONTENT_EXPORT RenderFrameHostManager
int proxy_routing_id) = 0;
virtual void CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) = 0;
virtual bool CreateRenderFrameForRenderManager(
RenderFrameHost* render_frame_host,
int proxy_routing_id,
const base::Optional<base::UnguessableToken>& opener_frame_token,
int parent_routing_id,
int previous_sibling_routing_id) = 0;
virtual void BeforeUnloadFiredFromRenderManager(
bool proceed,
const base::TimeTicks& proceed_time,

29
content/browser/web_contents/web_contents_impl.cc

@ -7970,35 +7970,6 @@ bool WebContentsImpl::CreateRenderViewForRenderManager(
return true;
}
bool WebContentsImpl::CreateRenderFrameForRenderManager(
RenderFrameHost* render_frame_host,
int previous_routing_id,
const base::Optional<base::UnguessableToken>& opener_frame_token,
int parent_routing_id,
int previous_sibling_routing_id) {
TRACE_EVENT2(
"browser,navigation",
"WebContentsImpl::CreateRenderFrameForRenderManager", "render_frame_host",
base::trace_event::ToTracedValue(render_frame_host), "params",
base::trace_event::TracedValue::Build(
{{"previous_routing_id", previous_routing_id},
{"parent_routing_id", parent_routing_id},
{"previous_sibling_routing_id", previous_sibling_routing_id}}));
RenderFrameHostImpl* rfh =
static_cast<RenderFrameHostImpl*>(render_frame_host);
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
// RenderWidgetHostView or a new one should be created here.
return true;
}
#if defined(OS_ANDROID)
base::android::ScopedJavaLocalRef<jobject>

6
content/browser/web_contents/web_contents_impl.h

@ -959,12 +959,6 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
int proxy_routing_id) override;
void CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) override;
bool CreateRenderFrameForRenderManager(
RenderFrameHost* render_frame_host,
int previous_routing_id,
const base::Optional<base::UnguessableToken>& opener_frame_token,
int parent_routing_id,
int previous_sibling_routing_id) override;
void BeforeUnloadFiredFromRenderManager(
bool proceed,
const base::TimeTicks& proceed_time,