mirror of https://github.com/electron/electron
85 lines
3.9 KiB
Diff
85 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Bryant Chandler <bryantchandler@chromium.org>
|
|
Date: Mon, 24 Jun 2024 17:28:53 +0000
|
|
Subject: Fix pointer tear down order problem
|
|
|
|
Holding a RenderFrameHost* in the `OnceBinding` isn't safe,
|
|
because the `RenderFrameHost` can be destroyed before the
|
|
binding. This CL changes the task strategy so that the
|
|
RenderFrameHost* doesn't need to be bound in a callback.
|
|
|
|
Tested using the repro steps in the bug and this change stops
|
|
it from reproducing.
|
|
|
|
Fixed: 347373236
|
|
Change-Id: Id639f317b0f37a508833aba9fe52ffc5c0ed590c
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5640501
|
|
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
|
|
Commit-Queue: Bryant Chandler <bryantchandler@chromium.org>
|
|
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
|
|
Cr-Commit-Position: refs/heads/main@{#1318653}
|
|
|
|
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
|
|
index 5db8665f1466dcfd896b3de3b2f3a2ae307e87de..0153cd1160cb47de471df92211c320920758058a 100644
|
|
--- a/content/browser/renderer_host/media/media_stream_manager.cc
|
|
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
|
|
@@ -2847,25 +2847,19 @@ void MediaStreamManager::GetRawDeviceIdsOpenedForFrame(
|
|
RenderFrameHost* render_frame_host,
|
|
blink::mojom::MediaStreamType type,
|
|
GetRawDeviceIdsOpenedForFrameCallback callback) const {
|
|
- DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
- CHECK(render_frame_host);
|
|
- auto collect_all_render_frame_host_ids = base::BindOnce(
|
|
- [](RenderFrameHost* render_frame_host) {
|
|
- base::flat_set<GlobalRenderFrameHostId> all_render_frame_host_ids;
|
|
- render_frame_host->ForEachRenderFrameHost(
|
|
- [&all_render_frame_host_ids](RenderFrameHost* render_frame_host) {
|
|
- all_render_frame_host_ids.insert(
|
|
- render_frame_host->GetGlobalId());
|
|
- });
|
|
- return all_render_frame_host_ids;
|
|
- },
|
|
- render_frame_host);
|
|
-
|
|
- GetUIThreadTaskRunner()->PostTaskAndReplyWithResult(
|
|
- FROM_HERE, std::move(collect_all_render_frame_host_ids),
|
|
- base::BindPostTaskToCurrentDefault(
|
|
- base::BindOnce(&MediaStreamManager::GetRawDeviceIdsOpenedForFrameIds,
|
|
- base::Unretained(this), type, std::move(callback))));
|
|
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
+
|
|
+ base::flat_set<GlobalRenderFrameHostId> all_render_frame_host_ids;
|
|
+ render_frame_host->ForEachRenderFrameHost(
|
|
+ [&all_render_frame_host_ids](RenderFrameHost* render_frame_host) {
|
|
+ all_render_frame_host_ids.insert(render_frame_host->GetGlobalId());
|
|
+ });
|
|
+
|
|
+ GetIOThreadTaskRunner()->PostTask(
|
|
+ FROM_HERE,
|
|
+ base::BindOnce(&MediaStreamManager::GetRawDeviceIdsOpenedForFrameIds,
|
|
+ base::Unretained(this), type, std::move(callback),
|
|
+ all_render_frame_host_ids));
|
|
}
|
|
|
|
void MediaStreamManager::GetRawDeviceIdsOpenedForFrameIds(
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
|
index 00e0321382a562ffb3733c48540d4f3071f13527..90cd9138510cf1c4a77bdd39610890a407870a22 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -10613,12 +10613,9 @@ void WebContentsImpl::GetMediaCaptureRawDeviceIdsOpened(
|
|
return;
|
|
}
|
|
|
|
- GetIOThreadTaskRunner({})->PostTask(
|
|
- FROM_HERE,
|
|
- base::BindOnce(&MediaStreamManager::GetRawDeviceIdsOpenedForFrame,
|
|
- base::Unretained(media_stream_manager),
|
|
- GetPrimaryMainFrame(), type,
|
|
- base::BindPostTaskToCurrentDefault(std::move(callback))));
|
|
+ media_stream_manager->GetRawDeviceIdsOpenedForFrame(
|
|
+ GetPrimaryMainFrame(), type,
|
|
+ base::BindPostTaskToCurrentDefault(std::move(callback)));
|
|
}
|
|
|
|
} // namespace content
|