diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /www/iridium/files/patch-content_child_child__process.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-content_child_child__process.cc')
| -rw-r--r-- | www/iridium/files/patch-content_child_child__process.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/iridium/files/patch-content_child_child__process.cc b/www/iridium/files/patch-content_child_child__process.cc index 196a5a7a8066..d827eaf5dedd 100644 --- a/www/iridium/files/patch-content_child_child__process.cc +++ b/www/iridium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2025-09-11 13:19:19 UTC +--- content/child/child_process.cc.orig 2025-11-06 10:11:34 UTC +++ content/child/child_process.cc -@@ -34,7 +34,7 @@ +@@ -37,7 +37,7 @@ #include "content/common/android/cpu_time_metrics.h" #endif @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -192,7 +192,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th +@@ -215,7 +215,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th main_thread_.reset(thread); } |