Use GlobalFrameRoutingId for shared worker clients
This simplifies the code a bit and removes any possibilities of
mixing RenderProcessHost IDs and frame routing IDs.
Change-Id: I0d7c8df9b6ebc9c7e20d5fbc6f36074125761f74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977966
Commit-Queue: Patrick Monette <[email protected]>
Reviewed-by: Emily Stark <[email protected]>
Reviewed-by: Matt Falkenhagen <[email protected]>
Reviewed-by: Hiroki Nakagawa <[email protected]>
Reviewed-by: Sigurður Ásgeirsson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#729958}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 296a8a9b8..80ace8e 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -822,17 +822,19 @@
GlobalFrameRoutingId render_frame_host_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
!BrowserThread::IsThreadInitialized(BrowserThread::UI));
- return WebContents::FromRenderFrameHost(
- RenderFrameHost::FromID(render_frame_host_id));
+ RenderFrameHost* render_frame_host =
+ RenderFrameHost::FromID(render_frame_host_id);
+ if (!render_frame_host)
+ return nullptr;
+
+ return WebContents::FromRenderFrameHost(render_frame_host);
}
// static
WebContents* WebContentsImpl::FromRenderFrameHostID(int render_process_host_id,
int render_frame_host_id) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
- !BrowserThread::IsThreadInitialized(BrowserThread::UI));
- return WebContents::FromRenderFrameHost(
- RenderFrameHost::FromID(render_process_host_id, render_frame_host_id));
+ return FromRenderFrameHostID(
+ GlobalFrameRoutingId(render_process_host_id, render_frame_host_id));
}
// static
