git: c0f99428c357 - 2022Q3 - www/chromium: update to 106.0.5249.61
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 28 Sep 2022 08:02:03 UTC
The branch 2022Q3 has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c0f99428c35709cbda75aecf4ae9cd3735a2210d
commit c0f99428c35709cbda75aecf4ae9cd3735a2210d
Author: Robert Nagy <robert@openbsd.org>
AuthorDate: 2022-09-25 10:55:03 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-09-28 08:01:47 +0000
www/chromium: update to 106.0.5249.61
Security: 18529cb0-3e9c-11ed-9bc7-3065ec8fd3ec
(cherry picked from commit c080558054e014c94435ab11f399e518324abe31)
---
www/chromium/Makefile | 3 +-
www/chromium/distinfo | 14 ++---
www/chromium/files/patch-BUILD.gn | 16 +++---
www/chromium/files/patch-base_BUILD.gn | 31 ++++++----
...rtition__allocator_page__allocator__constants.h | 10 ++--
...rtition__allocator_partition__address__space.cc | 4 +-
...__allocator_partition__alloc__base_time_time.cc | 11 ----
...partition__allocator_partition__alloc__config.h | 10 ++--
...tition__allocator_partition__alloc__constants.h | 20 +++----
...llocator_partition__allocator_partition__page.h | 6 +-
...locator_partition__allocator_partition__root.cc | 10 ++--
...tch-base_files_file__path__watcher__unittest.cc | 6 +-
.../files/patch-base_process_process__metrics.cc | 15 +++--
.../files/patch-base_process_process__metrics.h | 24 +++++---
...patch-base_process_process__metrics__freebsd.cc | 26 +++++----
...patch-base_process_process__metrics__openbsd.cc | 27 +++++----
...atch-base_process_process__metrics__unittest.cc | 20 +++++++
.../files/patch-base_system_sys__info__unittest.cc | 4 +-
.../patch-base_test_launcher_test__launcher.cc | 6 +-
.../files/patch-base_threading_platform__thread.h | 4 +-
...patch-base_threading_platform__thread__linux.cc | 14 ++---
...ch-base_threading_platform__thread__unittest.cc | 8 +--
www/chromium/files/patch-base_time_time.cc | 11 ----
...atch-base_trace__event_process__memory__dump.cc | 12 ++--
www/chromium/files/patch-build_config_BUILD.gn | 4 +-
.../files/patch-build_config_compiler_BUILD.gn | 34 +++++------
www/chromium/files/patch-cc_BUILD.gn | 6 +-
.../patch-chrome_app_chrome__main__delegate.cc | 26 ++++-----
.../patch-chrome_app_generated__resources.grd | 37 ++++++++++--
.../files/patch-chrome_app_settings__strings.grdp | 6 +-
.../files/patch-chrome_browser_about__flags.cc | 39 ++++++++-----
.../patch-chrome_browser_browser__process__impl.cc | 8 +--
.../patch-chrome_browser_browser__process__impl.h | 4 +-
.../patch-chrome_browser_browser__resources.grd | 4 +-
..._browser_chrome__browser__interface__binders.cc | 14 ++---
.../patch-chrome_browser_chrome__browser__main.cc | 12 ++--
...ome_browser_chrome__content__browser__client.cc | 28 ++++-----
...rome_browser_chrome__content__browser__client.h | 4 +-
...-chrome_browser_dev__ui__browser__resources.grd | 6 +-
...download_chrome__download__manager__delegate.cc | 19 ++----
...rome_browser_download_download__file__picker.cc | 20 +++----
...hrome_browser_download_download__item__model.cc | 15 ++++-
...nectors_analysis_analysis__service__settings.cc | 4 +-
...t_device__trust__connector__service__factory.cc | 24 ++++++--
...evice__trust_device__trust__service__factory.cc | 4 +-
...ser_commands_key__rotation__command__factory.cc | 14 ++---
...tors_reporting_browser__crash__event__router.cc | 19 ++++++
...ctors_reporting_browser__crash__event__router.h | 20 +++++++
.../files/patch-chrome_browser_extensions_BUILD.gn | 4 +-
...rprise__reporting__private_conversion__utils.cc | 6 +-
..._browser_extensions_external__provider__impl.cc | 6 +-
...e__file__system__access__permission__context.cc | 4 +-
.../patch-chrome_browser_flag__descriptions.cc | 27 ++++++---
.../patch-chrome_browser_flag__descriptions.h | 23 +++++---
...chrome__browser__main__extra__parts__metrics.cc | 4 +-
...ser_metrics_chrome__metrics__service__client.cc | 28 +++++++--
...rowser_net_system__network__context__manager.cc | 14 ++---
...d__manager_password__reuse__manager__factory.cc | 4 +-
...onfiguration__policy__handler__list__factory.cc | 58 +++++++++++++------
.../patch-chrome_browser_prefs_browser__prefs.cc | 27 +++++----
...h-chrome_browser_printing_print__job__worker.cc | 4 +-
...hrome__browser__main__extra__parts__profiles.cc | 6 +-
.../patch-chrome_browser_profiles_profile__impl.cc | 6 +-
...atch-chrome_browser_profiles_profiles__state.cc | 4 +-
...ources_sandbox__internals_sandbox__internals.ts | 14 ++---
...s_settings_autofill__page_passwords__shared.css | 8 +--
...atch-chrome_browser_resources_settings_route.ts | 8 +--
...ome_browser_resources_signin_signin__shared.css | 6 +-
...sync__confirmation_sync__confirmation__app.html | 10 ++--
...d__content__scanning_binary__upload__service.cc | 20 +++++++
...ser_sharing_sharing__handler__registry__impl.cc | 4 +-
...rowser_sync_device__info__sync__client__impl.cc | 4 +-
.../patch-chrome_browser_ui_browser__dialogs.h | 4 +-
.../files/patch-chrome_browser_ui_chrome__pages.h | 4 +-
...browser_ui_signin__view__controller__delegate.h | 4 +-
.../files/patch-chrome_browser_ui_tab__helpers.cc | 8 +--
...owser_ui_views_download_download__item__view.cc | 6 +-
...er__non__client__frame__view__factory__views.cc | 15 ++++-
...-chrome_browser_ui_views_frame_browser__view.cc | 4 +-
..._ui_views_frame_opaque__browser__frame__view.cc | 6 +-
..._ui_views_profiles_profile__menu__view__base.cc | 4 +-
...es_signin__view__controller__delegate__views.cc | 6 +-
...les_signin__view__controller__delegate__views.h | 4 +-
..._browser_ui_views_tabs_tab__drag__controller.cc | 10 ++--
...i_web__applications_app__browser__controller.cc | 4 +-
...i_webui_chrome__web__ui__controller__factory.cc | 12 ++--
..._browser_ui_webui_ntp_app__launcher__handler.cc | 4 +-
...tings_settings__localized__strings__provider.cc | 12 ++--
...hrome_browser_ui_window__sizer_window__sizer.cc | 4 +-
...lications_os__integration_web__app__shortcut.cc | 25 +++++---
...plications_os__integration_web__app__shortcut.h | 17 ++++--
...browser_web__applications_web__app__provider.cc | 4 +-
...thn_chrome__authenticator__request__delegate.cc | 4 +-
.../files/patch-chrome_common_channel__info.h | 4 +-
.../files/patch-chrome_common_chrome__features.cc | 14 ++---
.../files/patch-chrome_common_chrome__features.h | 8 +--
.../files/patch-chrome_common_pref__names.cc | 14 ++---
.../files/patch-chrome_common_pref__names.h | 14 ++---
.../patch-chrome_common_webui__url__constants.cc | 12 ++--
.../patch-chrome_common_webui__url__constants.h | 8 +--
...browser_system__signals__service__host__impl.cc | 20 -------
..._browser_system__signals__service__host__impl.h | 20 -------
www/chromium/files/patch-chrome_test_BUILD.gn | 4 +-
...medriver_keycode__text__conversion__unittest.cc | 6 +-
..._interaction_webui__interaction__test__util.cc} | 6 +-
.../files/patch-chrome_updater_app_app__install.cc | 4 +-
.../files/patch-chrome_updater_configurator.cc | 4 +-
...hrome_updater_device__management_dm__storage.cc | 15 ++++-
.../files/patch-chrome_updater_installer.cc | 4 +-
.../files/patch-chrome_utility_services.cc | 35 +++++++++--
...hromecast_browser_cast__browser__main__parts.cc | 10 ++--
...ecast_browser_cast__content__browser__client.cc | 4 +-
...ast_renderer_cast__content__renderer__client.cc | 11 ----
..._assistant_browser_autofill__assistant__impl.cc | 4 +-
...utofill_core_browser_personal__data__manager.cc | 4 +-
...ill_core_common_autofill__payments__features.cc | 4 +-
.../files/patch-components_crash_core_app_BUILD.gn | 8 +--
...evice__signals_core_common_signals__features.cc | 11 ++++
...device__signals_core_common_signals__features.h | 11 ++++
...nals_core_system__signals_platform__delegate.cc | 11 ++++
...e__engagement_public_feature__configurations.cc | 4 +-
...eature__engagement_public_feature__constants.cc | 8 +--
...feature__engagement_public_feature__constants.h | 6 +-
...nts_feature__engagement_public_feature__list.cc | 8 +--
...ents_feature__engagement_public_feature__list.h | 12 ++--
.../files/patch-components_metrics_motherboard.cc | 10 ++++
...patch-components_neterror_resources_neterror.js | 6 +-
...zation__guide_core_optimization__guide__util.cc | 11 ++++
...ger_core_browser_sync_password__sync__bridge.cc | 6 +-
...ager_core_common_password__manager__features.cc | 10 ++--
...nager_core_common_password__manager__features.h | 12 ++--
...tch-components_performance__manager_features.cc | 11 ----
...mponents_performance__manager_public_features.h | 11 ++++
...icy_core_browser_policy__pref__mapping__test.cc | 4 +-
...ponents_policy_resources_policy__templates.json | 67 ++++++++++++----------
...onents_policy_tools_generate__policy__source.py | 10 ++--
..._ai_sandbox_screen__ai__sandbox__hook__linux.cc | 4 +-
...sync__device__info_local__device__info__util.cc | 10 ++--
...evice__info_local__device__info__util__linux.cc | 10 ++--
...omponents_viz_service_display_skia__renderer.cc | 4 +-
...e__sinks_root__compositor__frame__sink__impl.cc | 4 +-
...me__sinks_root__compositor__frame__sink__impl.h | 4 +-
.../files/patch-content_app_content__main.cc | 4 +-
...atch-content_app_content__main__runner__impl.cc | 24 ++++----
www/chromium/files/patch-content_browser_BUILD.gn | 4 +-
..._browser_browser__child__process__host__impl.cc | 4 +-
...ontent_browser_media_media__interface__proxy.cc | 6 +-
...r_renderer__host_render__process__host__impl.cc | 16 +++---
...er_renderer__host_render__process__host__impl.h | 12 ++--
...derer__host_render__widget__host__view__aura.cc | 12 ++--
...nderer__host_render__widget__host__view__aura.h | 4 +-
...wser_web__contents_web__contents__view__aura.cc | 8 +--
.../files/patch-content_child_child__process.cc | 4 +-
www/chromium/files/patch-content_common_BUILD.gn | 4 +-
www/chromium/files/patch-content_gpu_gpu__main.cc | 4 +-
.../patch-content_gpu_gpu__sandbox__hook__linux.cc | 4 +-
...-content_public_browser_render__process__host.h | 4 +-
...atch-content_public_common_content__features.cc | 8 +--
...patch-content_public_common_content__features.h | 4 +-
...atch-content_public_common_content__switches.cc | 6 +-
...patch-content_public_common_content__switches.h | 4 +-
...ntent_public_test_mock__render__process__host.h | 4 +-
...tch-content_public_test_mock__render__thread.cc | 4 +-
.../patch-content_renderer_render__thread__impl.cc | 8 +--
...ent_renderer_renderer__blink__platform__impl.cc | 14 ++---
...tent_renderer_renderer__blink__platform__impl.h | 8 +--
www/chromium/files/patch-content_shell_BUILD.gn | 4 +-
www/chromium/files/patch-content_test_BUILD.gn | 6 +-
.../patch-extensions_browser_extension__prefs.cc | 4 +-
.../files/patch-extensions_browser_pref__names.cc | 4 +-
.../files/patch-extensions_browser_pref__names.h | 4 +-
...-extensions_renderer_bindings_argument__spec.cc | 11 ++++
...ns_shell_browser_shell__browser__main__parts.cc | 4 +-
...image_angle__vulkan__image__backing__factory.cc | 4 +-
...ommand__buffer_service_webgpu__decoder__impl.cc | 4 +-
.../files/patch-gpu_ipc_service_gpu__init.cc | 16 +++---
.../patch-gpu_vulkan_vulkan__device__queue.cc | 6 +-
.../files/patch-gpu_vulkan_vulkan__device__queue.h | 4 +-
www/chromium/files/patch-ipc_ipc__message__utils.h | 4 +-
www/chromium/files/patch-media_BUILD.gn | 4 +-
.../files/patch-media_base_media__switches.cc | 4 +-
.../files/patch-media_cdm_cdm__paths__unittest.cc | 4 +-
...-media_gpu_chromeos_video__decoder__pipeline.cc | 6 +-
.../patch-media_gpu_vaapi_vaapi__video__decoder.cc | 4 +-
www/chromium/files/patch-media_media__options.gni | 6 +-
..._stable__video__decoder__types__mojom__traits.h | 4 +-
...ia_video_video__encode__accelerator__adapter.cc | 6 +-
www/chromium/files/patch-mojo_core_BUILD.gn | 4 +-
www/chromium/files/patch-mojo_core_channel.cc | 4 +-
www/chromium/files/patch-net_BUILD.gn | 16 +++---
.../patch-net_base_network__change__notifier.cc | 4 +-
.../files/patch-net_cert_cert__verify__proc.cc | 4 +-
.../patch-net_cert_cert__verify__proc__unittest.cc | 8 +--
www/chromium/files/patch-net_dns_BUILD.gn | 8 +--
.../files/patch-net_dns_host__resolver__manager.cc | 4 +-
.../files/patch-net_socket_udp__socket__posix.cc | 8 +--
...ffic__annotation_network__traffic__annotation.h | 6 +-
.../files/patch-remoting_host_policy__watcher.cc | 12 ++--
.../patch-remoting_host_remoting__me2me__host.cc | 32 +++++------
...hn_remote__webauthn__caller__security__utils.cc | 4 +-
...services_device_compute__pressure_cpu__probe.cc | 8 +--
www/chromium/files/patch-services_network_BUILD.gn | 4 +-
.../patch-services_network_network__service.cc | 4 +-
...atch-third__party_abseil-cpp_absl_base_config.h | 6 +-
...sl_time_internal_cctz_src_time__zone__format.cc | 4 +-
.../files/patch-third__party_angle_BUILD.gn | 10 ++--
...tch-third__party_angle_src_libANGLE_Display.cpp | 12 ++--
...ird__party_angle_src_third__party_volk_BUILD.gn | 2 +-
...h-third__party_blink_public_platform_platform.h | 4 +-
...blink_renderer_controller_blink__initializer.cc | 6 +-
...erer_core_execution__context_navigator__base.cc | 11 ++++
...blink_renderer_core_exported_web__view__impl.cc | 6 +-
...y_blink_renderer_core_frame_web__frame__test.cc | 6 +-
...arty_blink_renderer_core_layout_layout__view.cc | 4 +-
...party_blink_renderer_core_paint_paint__layer.cc | 4 +-
...odules_webgl_webgl__rendering__context__base.cc | 4 +-
...h-third__party_blink_renderer_platform_BUILD.gn | 4 +-
...rty_blink_renderer_platform_fonts_font__cache.h | 4 +-
...derer_platform_runtime__enabled__features.json5 | 12 ++--
...nk_renderer_platform_scheduler_common_thread.cc | 4 +-
...widget_compositing_categorized__worker__pool.cc | 4 +-
...boringssl_src_crypto_fipsmodule_rand_internal.h | 4 +-
...ird__party_boringssl_src_crypto_refcount__c11.c | 8 +--
...ird__party_boringssl_src_include_openssl_base.h | 4 +-
...ch-third__party_dawn_src_dawn_common_Platform.h | 4 +-
...rd__party_ipcz_src_reference__drivers_random.cc | 4 +-
...st_cpp_src_phonenumbers_base_memory_singleton.h | 21 ++++---
...pp_src_phonenumbers_base_synchronization_lock.h | 21 ++++---
...ist_cpp_src_phonenumbers_base_thread__checker.h | 24 ++++----
...ird__party_pdfium_core_fxge_cfx__fontmapper.cpp | 4 +-
...erfetto_protos_perfetto_trace_ftrace_v4l2.proto | 56 ++++++++++++++++++
...-third__party_perfetto_src_base_unix__socket.cc | 4 +-
www/chromium/files/patch-third__party_ruy_BUILD.gn | 8 +--
...rd__party_webrtc_modules_audio__device_BUILD.gn | 4 +-
.../patch-third__party_webrtc_rtc__base_BUILD.gn | 4 +-
.../patch-tools_gn_src_base_files_file__posix.cc | 4 +-
...-ui_base_ime_init_input__method__initializer.cc | 29 ----------
...linux_linux__input__method__context__factory.cc | 10 ++--
.../files/patch-ui_base_ui__base__features.cc | 6 +-
www/chromium/files/patch-ui_color_color__id.h | 4 +-
www/chromium/files/patch-ui_events_event.cc | 6 +-
www/chromium/files/patch-ui_gfx_BUILD.gn | 4 +-
.../files/patch-ui_gfx_gpu__memory__buffer.h | 6 +-
www/chromium/files/patch-ui_gl_BUILD.gn | 6 +-
.../files/patch-ui_gl_generate__bindings.py | 4 +-
...platform_headless_headless__surface__factory.cc | 4 +-
...h-ui_ozone_platform_x11_ozone__platform__x11.cc | 4 +-
.../files/patch-ui_ozone_public_ozone__platform.h | 4 +-
...rm__window_platform__window__init__properties.h | 8 +--
...ings_translations_app__locale__settings__bn.xtb | 4 +-
...ings_translations_app__locale__settings__ja.xtb | 4 +-
...ings_translations_app__locale__settings__ko.xtb | 4 +-
...ings_translations_app__locale__settings__ml.xtb | 4 +-
...ings_translations_app__locale__settings__th.xtb | 4 +-
...s_translations_app__locale__settings__zh-CN.xtb | 4 +-
...s_translations_app__locale__settings__zh-TW.xtb | 4 +-
.../patch-ui_views_controls_prefix__selector.cc | 4 +-
.../patch-ui_views_controls_textfield_textfield.cc | 6 +-
.../patch-ui_views_controls_textfield_textfield.h | 4 +-
.../files/patch-ui_views_focus_focus__manager.cc | 6 +-
...__aura_desktop__window__tree__host__platform.cc | 8 +--
www/chromium/files/patch-v8_BUILD.gn | 8 +--
www/chromium/files/patch-v8_include_v8-internal.h | 11 ++++
www/chromium/files/patch-v8_src_api_api.cc | 4 +-
.../patch-v8_src_base_platform_platform-posix.cc | 8 +--
www/chromium/files/patch-v8_src_sandbox_sandbox.cc | 11 ++++
...src_wasm_baseline_ia32_liftoff-assembler-ia32.h | 28 ++++-----
...layer_browser_content__browser__client__impl.cc | 4 +-
268 files changed, 1457 insertions(+), 1111 deletions(-)
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 8e6211dde377..ee6df1585add 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 105.0.5195.125
+PORTVERSION= 106.0.5249.61
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
@@ -93,7 +93,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \
enable_js_type_check=false \
enable_nacl=false \
enable_remoting=false \
- enable_wmax_tokens=false \
fatal_linker_warnings=false \
icu_use_data_file=false \
is_clang=true \
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 17762f0c30a1..aea55df9118e 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1663188936
-SHA256 (chromium-105.0.5195.125.tar.xz) = 201b5c44668a415e3e05c0a806ab43a0904024340531332fc3ce39eb0cf10a66
-SIZE (chromium-105.0.5195.125.tar.xz) = 1597584952
-SHA256 (chrome-linux-105.0.5195.125-llvm13.profdata.tar.xz) = a7180aec05ab138c250b36bce4e4c1aef7d3874ee16a7c1c09d7f621025451e8
-SIZE (chrome-linux-105.0.5195.125-llvm13.profdata.tar.xz) = 24841916
-SHA256 (chromium-105.0.5195.125-testdata.tar.xz) = 9d9b1de3bc4808d00fde6d6fe97ba3557a7d45758c6c1c23b4175acda69f01ef
-SIZE (chromium-105.0.5195.125-testdata.tar.xz) = 264246492
+TIMESTAMP = 1664291743
+SHA256 (chromium-106.0.5249.61.tar.xz) = f27acb929b12fc9e60b035c2f9f1879866eec7cfe1665dccf544048e9e931497
+SIZE (chromium-106.0.5249.61.tar.xz) = 1621965008
+SHA256 (chrome-linux-106.0.5249.61-llvm13.profdata.tar.xz) = 2de41aab46eefc2d4696bc64f7ce65f93de4422a5a01d82a0c56f9fc21e67e8d
+SIZE (chrome-linux-106.0.5249.61-llvm13.profdata.tar.xz) = 25058192
+SHA256 (chromium-106.0.5249.61-testdata.tar.xz) = 48ec11b9bef3e742cc0c225fd301d456dd41fb4ff0df4503dd56bb52cdb92590
+SIZE (chromium-106.0.5249.61-testdata.tar.xz) = 263065588
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index a6357f969e30..94898e0b104e 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-08-31 12:19:35 UTC
+--- BUILD.gn.orig 2022-09-24 10:57:32 UTC
+++ BUILD.gn
@@ -53,7 +53,7 @@ declare_args() {
root_extra_deps = []
@@ -9,7 +9,7 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -85,7 +85,6 @@ group("gn_all") {
+@@ -83,7 +83,6 @@ group("gn_all") {
"//codelabs",
"//components:components_unittests",
"//components/gwp_asan:gwp_asan_unittests",
@@ -17,7 +17,7 @@
"//net:net_unittests",
"//sandbox:sandbox_unittests",
"//services:services_unittests",
-@@ -435,7 +434,7 @@ group("gn_all") {
+@@ -441,7 +440,7 @@ group("gn_all") {
]
}
@@ -26,7 +26,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -624,6 +623,15 @@ group("gn_all") {
+@@ -642,6 +641,15 @@ group("gn_all") {
deps += [ "//gpu/tools/compositor_model_bench" ]
}
@@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
-@@ -672,7 +680,7 @@ group("gn_all") {
+@@ -690,7 +698,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1187,7 +1195,7 @@ if (!is_ios) {
+@@ -1202,7 +1210,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -60,7 +60,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1196,7 +1204,7 @@ if (!is_ios) {
+@@ -1211,7 +1219,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -69,7 +69,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1645,7 +1653,7 @@ group("chromium_builder_perf") {
+@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 9ca1c2331d10..41a2ee639fb6 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,4 +1,4 @@
---- base/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+--- base/BUILD.gn.orig 2022-09-24 10:57:32 UTC
+++ base/BUILD.gn
@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
@@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
-@@ -1014,7 +1014,7 @@ mixed_component("base") {
+@@ -1031,7 +1031,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@@ -18,7 +18,7 @@
sources += [
"profiler/stack_copier_signal.cc",
"profiler/stack_copier_signal.h",
-@@ -1023,6 +1023,12 @@ mixed_component("base") {
+@@ -1040,6 +1040,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@@ -31,7 +31,7 @@
}
if (is_win) {
-@@ -1507,11 +1513,23 @@ mixed_component("base") {
+@@ -1541,11 +1547,23 @@ mixed_component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@@ -56,7 +56,7 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
-@@ -1539,7 +1557,7 @@ mixed_component("base") {
+@@ -1573,7 +1591,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -65,7 +65,7 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1595,7 +1613,7 @@ mixed_component("base") {
+@@ -1629,7 +1647,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -74,7 +74,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2183,6 +2201,42 @@ mixed_component("base") {
+@@ -2211,6 +2229,42 @@ mixed_component("base") {
}
}
@@ -117,7 +117,16 @@
# iOS
if (is_ios) {
sources -= [
-@@ -3496,7 +3550,7 @@ test("base_unittests") {
+@@ -2310,7 +2364,7 @@ mixed_component("base") {
+ }
+
+ if (dep_libevent) {
+- deps += [ "//third_party/libevent" ]
++ public_deps += [ "//third_party/libevent" ]
+ }
+
+ if (use_libevent) {
+@@ -3545,7 +3599,7 @@ test("base_unittests") {
}
}
@@ -126,7 +135,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3543,7 +3597,7 @@ test("base_unittests") {
+@@ -3593,7 +3647,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -135,7 +144,7 @@
sources += [
"profiler/stack_copier_signal_unittest.cc",
"profiler/thread_delegate_posix_unittest.cc",
-@@ -3553,7 +3607,7 @@ test("base_unittests") {
+@@ -3603,7 +3657,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -144,7 +153,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3741,7 +3795,7 @@ test("base_unittests") {
+@@ -3791,7 +3845,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
index 1d14687939fd..39bacb518604 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-08-31 12:19:35 UTC
+--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-09-24 10:57:32 UTC
+++ base/allocator/partition_allocator/page_allocator_constants.h
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
// elimination.
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
@@ -9,7 +9,7 @@
// This should work for all POSIX (if needed), but currently all other
// supported OS/architecture combinations use either hard-coded values
// (such as x86) or have means to determine these values without needing
-@@ -79,7 +79,7 @@ PageAllocationGranularityShift() {
+@@ -81,7 +81,7 @@ PageAllocationGranularityShift() {
return 14; // 16kB
#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
return static_cast<size_t>(vm_page_shift);
@@ -18,7 +18,7 @@
// arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
// page sizes. Retrieve from or initialize cache.
size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
-@@ -100,7 +100,7 @@ PageAllocationGranularity() {
+@@ -102,7 +102,7 @@ PageAllocationGranularity() {
// This is literally equivalent to |1 << PageAllocationGranularityShift()|
// below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
return vm_page_size;
@@ -27,7 +27,7 @@
// arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
// initialize cache.
size_t size = page_characteristics.size.load(std::memory_order_relaxed);
-@@ -139,7 +139,7 @@ SystemPageShift() {
+@@ -141,7 +141,7 @@ SystemPageShift() {
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
SystemPageSize() {
#if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
index 5ba98fe032f3..b99b75c18061 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-08-31 12:19:35 UTC
+--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-09-24 10:57:32 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
-@@ -233,7 +233,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
+@@ -238,7 +238,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_ = 0;
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc
deleted file mode 100644
index aa3133e6ce8d..000000000000
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/allocator/partition_allocator/partition_alloc_base/time/time.cc.orig 2022-07-22 17:30:31 UTC
-+++ base/allocator/partition_allocator/partition_alloc_base/time/time.cc
-@@ -6,7 +6,7 @@
-
- #include "build/build_config.h"
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // time.h is a widely included header and its size impacts build time.
- // Try not to raise this limit unless necessary. See
- // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
index d6413d76da7e..74306761eef5 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-07-22 17:30:31 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-09-24 10:57:32 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
-@@ -68,7 +68,7 @@ static_assert(sizeof(void*) != 8, "");
+@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
@@ -9,7 +9,7 @@
#define PA_HAS_LINUX_KERNEL
#endif
-@@ -187,7 +187,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -195,7 +195,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
@@ -18,12 +18,12 @@
#define PA_HAS_ATFORK_HANDLER
#endif
-@@ -227,7 +227,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -235,7 +235,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
#define PA_PREFER_SMALLER_SLOT_SPANS
- #endif // BUILDFLAG(IS_LINUX)
+ #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
index df44ff1d52bf..f8d6e94a9a28 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-08-31 12:19:35 UTC
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-09-24 10:57:32 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -91,7 +91,7 @@ PartitionPageShift() {
return 18; // 256 KiB
@@ -9,12 +9,12 @@
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
-@@ -247,7 +247,7 @@ constexpr size_t kSuperPageBaseMask = ~kSuperPageOffse
- #if defined(PA_HAS_64_BITS_POINTERS)
- // The Configurable Pool is only available in 64-bit mode
- constexpr size_t kNumPools = 3;
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Special-case macOS. Contrary to other platforms, there is no sandbox limit
- // there, meaning that a single renderer could "happily" consume >8GiB. So the
- // 8GiB pool size is a regression. Make the limit higher on this platform only
+@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3;
+ // Special-case Android and iOS, which incur test failures with larger
+ // GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is
+ // unrealistic as of 2022.
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ constexpr size_t kPoolMaxSize = 8 * kGiB;
+ #else
+ constexpr size_t kPoolMaxSize = 16 * kGiB;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
index abf25cf132ff..76c0ca47b9af 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_page.h.orig 2022-06-17 14:20:10 UTC
+--- base/allocator/partition_allocator/partition_page.h.orig 2022-09-24 10:57:32 UTC
+++ base/allocator/partition_allocator/partition_page.h
-@@ -130,13 +130,14 @@ struct SlotSpanMetadata {
+@@ -131,13 +131,14 @@ struct SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
@@ -17,7 +17,7 @@
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash).
-@@ -150,7 +151,9 @@ struct SlotSpanMetadata {
+@@ -151,7 +152,9 @@ struct SlotSpanMetadata {
#endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
// The maximum number of bits needed to cover all currently supported OSes.
static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
index a788aa40be35..bb41e042aed2 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2022-08-31 12:19:35 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2022-09-24 10:57:32 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -33,7 +33,7 @@
#include "wow64apiset.h"
@@ -18,16 +18,16 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
-@@ -309,7 +309,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -321,7 +321,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
- SystemPageSize();
+ MaxPurgeableSlotSize();
-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
-+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
++#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64))
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -652,7 +652,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -709,7 +709,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
index 3bd1d03cc820..04f15603fea3 100644
--- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_unittest.cc.orig 2022-05-19 14:06:27 UTC
+--- base/files/file_path_watcher_unittest.cc.orig 2022-09-24 10:57:32 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
@@ -9,7 +9,7 @@
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
-@@ -1108,7 +1108,7 @@ enum Permission {
+@@ -1118,7 +1118,7 @@ enum Permission {
Execute
};
@@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
-@@ -1139,7 +1139,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -1149,7 +1149,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index 612be1c5ded0..61b17232ca71 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics.cc.orig 2022-06-17 14:20:10 UTC
+--- base/process/process_metrics.cc.orig 2022-09-25 13:48:17 UTC
+++ base/process/process_metrics.cc
@@ -17,7 +17,7 @@ namespace base {
namespace {
@@ -27,16 +27,23 @@
Value meminfo = memory_info_.ToValue();
Value vmstat = vmstat_info_.ToValue();
meminfo.MergeDictionary(&vmstat);
-@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+@@ -99,7 +99,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX)
-+#if !BUILDFLAG(IS_BSD) || !BUILDFLAG(IS_POSIX)
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
TimeDelta cumulative_cpu = GetCumulativeCPUUsage();
TimeTicks time = TimeTicks::Now();
-@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
+@@ -122,7 +121,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
+
+ return 100.0 * cpu_time_delta / time_delta;
+ }
+-#endif
+
+ #if BUILDFLAG(IS_WIN)
+ double ProcessMetrics::GetPreciseCPUUsage() {
+@@ -150,7 +148,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index dfd8f228a00e..7cf5adc13ca5 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,4 +1,4 @@
---- base/process/process_metrics.h.orig 2022-08-31 12:19:35 UTC
+--- base/process/process_metrics.h.orig 2022-09-25 07:07:39 UTC
+++ base/process/process_metrics.h
@@ -36,7 +36,7 @@
#endif
@@ -63,7 +63,17 @@
CPU::CoreType GetCoreType(uint32_t core_index);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
-@@ -294,7 +294,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -284,9 +284,7 @@ class BASE_EXPORT ProcessMetrics {
+ // Used to store the previous times and CPU usage counts so we can
+ // compute the CPU usage between calls.
+ TimeTicks last_cpu_time_;
+-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX)
+ TimeDelta last_cumulative_cpu_;
+-#endif
+
+ #if BUILDFLAG(IS_WIN)
+ TimeTicks last_cpu_time_for_precise_cpu_usage_;
+@@ -294,7 +292,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -72,7 +82,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
-@@ -337,7 +337,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -337,7 +335,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -81,7 +91,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -372,7 +372,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -372,7 +370,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -90,7 +100,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
-@@ -387,7 +387,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -387,7 +385,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -99,7 +109,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -424,7 +422,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -108,7 +118,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
-@@ -611,7 +611,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -611,7 +609,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;
diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
index 33b263a8c1fd..5171fa6f68ba 100644
--- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_freebsd.cc.orig 2022-09-01 05:13:41 UTC
+--- base/process/process_metrics_freebsd.cc.orig 2022-09-25 13:48:17 UTC
+++ base/process/process_metrics_freebsd.cc
@@ -3,20 +3,39 @@
// found in the LICENSE file.
@@ -42,31 +42,37 @@
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -26,17 +45,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+ return WrapUnique(new ProcessMetrics(process));
+ }
- double ProcessMetrics::GetPlatformIndependentCPUUsage() {
+-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
struct kinfo_proc info;
- int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
- size_t length = sizeof(info);
+ size_t length = sizeof(struct kinfo_proc);
++ struct timeval tv;
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
+
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
-+ return 0.0;
++ return TimeDelta();
- return (info.ki_pctcpu / FSCALE) * 100.0;
-+ return static_cast<double>((info.ki_pctcpu * 100.0) / FSCALE);
++ return Microseconds(info.ki_runtime);
}
- TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
+-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED();
-+ NOTIMPLEMENTED();
- return TimeDelta();
+- return TimeDelta();
+-}
+-
+ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
+ return false;
}
-
-@@ -67,4 +87,221 @@ size_t GetSystemCommitCharge() {
+@@ -67,4 +83,221 @@ size_t GetSystemCommitCharge() {
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
}
diff --git a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
index 7cf86d373978..70b2aa744c6c 100644
--- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_openbsd.cc.orig 2022-04-21 18:48:31 UTC
+--- base/process/process_metrics_openbsd.cc.orig 2022-09-24 10:57:32 UTC
+++ base/process/process_metrics_openbsd.cc
@@ -6,14 +6,23 @@
@@ -24,17 +24,18 @@
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
ProcessHandle process) {
-@@ -24,49 +33,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
+@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
return false;
}
-static int GetProcessCPU(pid_t pid) {
-+double ProcessMetrics::GetPlatformIndependentCPUUsage() {
++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
struct kinfo_proc info;
- size_t length;
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
- sizeof(struct kinfo_proc), 0 };
+ size_t length = sizeof(struct kinfo_proc);
++ struct timeval tv;
- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
- return -1;
@@ -45,11 +46,12 @@
-
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
-+ return 0.0;
++ return TimeDelta();
- return info.p_pctcpu;
-+ return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE);
- }
+-}
++ tv.tv_sec = info.p_rtime_sec;
++ tv.tv_usec = info.p_rtime_usec;
-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
- TimeTicks time = TimeTicks::Now();
@@ -66,13 +68,14 @@
- double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
-
- return percentage;
--}
--
- TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
- NOTREACHED();
- return TimeDelta();
++ return Microseconds(TimeValToMicroseconds(tv));
}
+-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
+- NOTREACHED();
+- return TimeDelta();
+-}
+-
-ProcessMetrics::ProcessMetrics(ProcessHandle process)
- : process_(process),
- last_cpu_(0) {}
@@ -80,7 +83,7 @@
size_t GetSystemCommitCharge() {
int mib[] = { CTL_VM, VM_METER };
int pagesize;
-@@ -84,6 +68,129 @@ size_t GetSystemCommitCharge() {
+@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() {
pagesize = getpagesize();
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
diff --git a/www/chromium/files/patch-base_process_process__metrics__unittest.cc b/www/chromium/files/patch-base_process_process__metrics__unittest.cc
new file mode 100644
index 000000000000..1e4ff0087053
--- /dev/null
+++ b/www/chromium/files/patch-base_process_process__metrics__unittest.cc
@@ -0,0 +1,20 @@
+--- base/process/process_metrics_unittest.cc.orig 2022-09-24 10:57:32 UTC
++++ base/process/process_metrics_unittest.cc
+@@ -44,7 +44,7 @@ namespace debug {
+
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+
+ namespace {
*** 6945 LINES SKIPPED ***