Compare commits

...

2 Commits

Author SHA1 Message Date
Marshall Greenblatt 057c1b1409 cmake: Fix set_property argument (fixes #3775) 2024-09-30 12:49:22 -04:00
Marshall Greenblatt 96ddcee086 Fix dangling ptr in RenderProcessHostTaskProvider (fixes #3758) 2024-09-30 12:19:33 -04:00
3 changed files with 34 additions and 1 deletions

View File

@ -142,7 +142,7 @@ set(CMAKE_CONFIGURATION_TYPES Debug Release)
project(cef) project(cef)
# Use folders in the resulting project files. # Use folders in the resulting project files.
set_property(GLOBAL PROPERTY OS_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# #

View File

@ -756,5 +756,11 @@ patches = [
# win: Add missing <limits> include for cef_sandbox build. # win: Add missing <limits> include for cef_sandbox build.
# https://chromium-review.googlesource.com/c/chromium/src/+/5891459 # https://chromium-review.googlesource.com/c/chromium/src/+/5891459
'name': 'win_base_pa_oom_5891459' 'name': 'win_base_pa_oom_5891459'
},
{
# Fix dangling RenderProcessHost ptr in RenderProcessHostTaskProvider.
# https://github.com/chromiumembedded/cef/issues/3758
# https://chromium-review.googlesource.com/c/chromium/src/+/5894650
'name': 'chrome_browser_task_manager_5894650'
} }
] ]

View File

@ -0,0 +1,27 @@
diff --git chrome/browser/task_manager/providers/render_process_host_task_provider.cc chrome/browser/task_manager/providers/render_process_host_task_provider.cc
index 11b05cbfc6077..45a5b11158a21 100644
--- chrome/browser/task_manager/providers/render_process_host_task_provider.cc
+++ chrome/browser/task_manager/providers/render_process_host_task_provider.cc
@@ -110,18 +110,14 @@ void RenderProcessHostTaskProvider::OnRenderProcessHostCreated(
void RenderProcessHostTaskProvider::RenderProcessExited(
content::RenderProcessHost* host,
const content::ChildProcessTerminationInfo& info) {
- if (is_updating_) {
- DeleteTask(host->GetID());
- host_observation_.RemoveObservation(host);
- }
+ DeleteTask(host->GetID());
+ host_observation_.RemoveObservation(host);
}
void RenderProcessHostTaskProvider::RenderProcessHostDestroyed(
content::RenderProcessHost* host) {
- if (is_updating_) {
- DeleteTask(host->GetID());
- host_observation_.RemoveObservation(host);
- }
+ DeleteTask(host->GetID());
+ host_observation_.RemoveObservation(host);
}
} // namespace task_manager