git: 4eb083eab9fd - main - www/chromium: update to 101.0.4951.41
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 28 Apr 2022 07:48:30 UTC
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=4eb083eab9fd6439de7fd85552c136140a5c3ad9 commit 4eb083eab9fd6439de7fd85552c136140a5c3ad9 Author: Robert Nagy <robert@openbsd.org> AuthorDate: 2022-04-21 21:09:02 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2022-04-28 07:47:56 +0000 www/chromium: update to 101.0.4951.41 Security: 26f2123b-c6c6-11ec-b66f-3065ec8fd3ec --- www/chromium/Makefile | 2 +- www/chromium/distinfo | 10 ++-- www/chromium/files/patch-BUILD.gn | 16 +++--- www/chromium/files/patch-base_BUILD.gn | 34 ++++++------- ...partition__allocator_partition__alloc__config.h | 15 ++++-- ...llocator_partition__allocator_partition__root.h | 11 ----- ...locator_partition__allocator_spinning__mutex.cc | 6 +-- .../files/patch-base_debug_debugger__posix.cc | 12 ++--- .../files/patch-base_files_file__util__posix.cc | 20 ++++---- .../files/patch-base_files_file__util__unittest.cc | 6 +-- www/chromium/files/patch-base_i18n_icu__util.cc | 4 +- .../patch-base_process_process__handle__freebsd.cc | 16 +++--- .../patch-base_process_process__handle__openbsd.cc | 18 +++---- ...atch-base_process_process__iterator__freebsd.cc | 20 ++++---- ...atch-base_process_process__iterator__openbsd.cc | 10 ++-- ...patch-base_process_process__metrics__freebsd.cc | 18 +++---- ...patch-base_process_process__metrics__openbsd.cc | 41 ++++------------ .../files/patch-base_process_process__posix.cc | 6 +-- .../files/patch-base_system_sys__info__freebsd.cc | 8 +-- .../files/patch-base_system_sys__info__openbsd.cc | 38 ++++++--------- .../files/patch-build_config_BUILDCONFIG.gn | 8 +-- .../files/patch-build_config_compiler_BUILD.gn | 24 +++++---- .../files/patch-build_linux_unbundle_libxml.gn | 10 ++++ .../files/patch-build_toolchain_gcc__toolchain.gni | 4 +- www/chromium/files/patch-cc_BUILD.gn | 6 +-- .../files/patch-chrome_app_chrome__command__ids.h | 11 ++++- .../patch-chrome_app_chrome__main__delegate.cc | 20 ++++---- .../files/patch-chrome_app_chromium__strings.grd | 8 +-- .../patch-chrome_app_generated__resources.grd | 12 ++--- .../patch-chrome_app_google__chrome__strings.grd | 8 +-- ...hrome_app_theme_chrome__unscaled__resources.grd | 4 +- .../files/patch-chrome_browser_about__flags.cc | 43 +++++++--------- ...pi_music__manager__private_device__id__linux.cc | 6 +-- ...er_apps_platform__apps_platform__app__launch.cc | 18 +++---- ...browser_background_background__mode__manager.cc | 4 +- .../patch-chrome_browser_browser__process__impl.cc | 8 +-- .../patch-chrome_browser_browser__process__impl.h | 4 +- ..._browser_chrome__browser__interface__binders.cc | 43 +++++++++++++--- .../patch-chrome_browser_chrome__browser__main.cc | 12 ++--- ...ome_browser_chrome__content__browser__client.cc | 37 ++++++-------- ...download_chrome__download__manager__delegate.cc | 18 +++---- ...ch-chrome_browser_download_download__commands.h | 4 +- ...rome_browser_download_download__file__picker.cc | 20 ++++++++ ...hrome_browser_download_download__item__model.cc | 6 +-- ...atch-chrome_browser_download_download__prefs.cc | 18 +++---- ...patch-chrome_browser_download_download__prefs.h | 6 +-- ...evice__trust_device__trust__service__factory.cc | 6 +-- ...ser_commands_key__rotation__command__factory.cc | 20 ++++++++ ...ice__trust_signals_signals__service__factory.cc | 14 +++--- ...extensions_api_settings__private_prefs__util.cc | 6 +-- .../patch-chrome_browser_flag__descriptions.cc | 18 +++---- .../patch-chrome_browser_flag__descriptions.h | 16 +++--- ...ser_metrics_chrome__metrics__service__client.cc | 8 +-- ...rowser_net_system__network__context__manager.cc | 10 ++-- ...rowser_performance__monitor_process__monitor.cc | 4 +- ...wser_policy_browser__signin__policy__handler.cc | 6 +-- ...onfiguration__policy__handler__list__factory.cc | 22 ++++----- .../patch-chrome_browser_prefs_browser__prefs.cc | 17 ++----- ...er_prefs_pref__service__incognito__allowlist.cc | 4 +- ...er_printing_print__backend__service__manager.cc | 29 +++++++++++ ...h-chrome_browser_printing_print__job__worker.cc | 4 +- ...tch-chrome_browser_process__singleton__posix.cc | 10 ++-- ...hrome__browser__main__extra__parts__profiles.cc | 4 +- .../patch-chrome_browser_profiles_profile__impl.cc | 6 +-- ...dent__reporting_incident__reporting__service.cc | 4 +- ...tch-chrome_browser_sync_chrome__sync__client.cc | 10 ++-- ...rowser_sync_device__info__sync__client__impl.cc | 4 +- .../patch-chrome_browser_themes_theme__helper.cc | 11 ----- .../patch-chrome_browser_themes_theme__service.cc | 38 +++++++++++++++ ...rome_browser_ui_browser__command__controller.cc | 37 ++++++++++++-- .../patch-chrome_browser_ui_browser__commands.cc | 20 ++++++++ .../patch-chrome_browser_ui_browser__commands.h | 11 +++++ .../patch-chrome_browser_ui_browser__dialogs.h | 20 +------- .../files/patch-chrome_browser_ui_chrome__pages.cc | 4 +- .../files/patch-chrome_browser_ui_chrome__pages.h | 4 +- ...rowser_ui_color_native__chrome__color__mixer.cc | 10 ++-- .../files/patch-chrome_browser_ui_sad__tab.cc | 4 +- ...chrome_browser_ui_startup_bad__flags__prompt.cc | 4 +- ...browser_ui_startup_startup__browser__creator.cc | 32 ++---------- .../files/patch-chrome_browser_ui_tab__helpers.cc | 8 +-- ...wser_ui_task__manager_task__manager__columns.cc | 8 +-- ...h-chrome_browser_ui_views_accelerator__table.cc | 17 +++++-- ...pps_chrome__native__app__window__views__aura.cc | 4 +- ...ser_ui_views_eye__dropper_eye__dropper__view.cc | 4 +- ..._browser__desktop__window__tree__host__linux.cc | 4 +- ...chrome_browser_ui_views_frame_browser__frame.cc | 6 +-- ...-chrome_browser_ui_views_frame_browser__view.cc | 4 +- ...es_signin__view__controller__delegate__views.cc | 6 +-- ...-chrome_browser_ui_views_tab__dialogs__views.cc | 20 ++++++++ ..._browser_ui_views_tabs_tab__drag__controller.cc | 13 ++++- ...r_ui_views_tabs_tab__hover__card__controller.cc | 4 +- ...i_web__applications_app__browser__controller.cc | 20 ++++++++ .../patch-chrome_browser_ui_webui_about__ui.cc | 6 +-- ...i_webui_chrome__web__ui__controller__factory.cc | 20 +++----- ..._browser_ui_webui_ntp_app__launcher__handler.cc | 21 +++----- ...rowser_ui_webui_settings_appearance__handler.cc | 6 +-- ...browser_ui_webui_settings_appearance__handler.h | 4 +- ...tings_settings__localized__strings__provider.cc | 10 ++-- ...hrome_browser_ui_webui_settings_settings__ui.cc | 20 -------- ...er_web__applications_extension__status__utils.h | 10 ++-- ...ications_extensions_extension__status__utils.cc | 10 ++-- ...lications_os__integration_web__app__shortcut.cc | 6 +-- ...plications_os__integration_web__app__shortcut.h | 6 +-- ...browser_web__applications_web__app__provider.cc | 4 +- ...thn_chrome__authenticator__request__delegate.cc | 4 +- .../files/patch-chrome_common_chrome__features.cc | 38 ++++----------- .../files/patch-chrome_common_chrome__features.h | 32 +++--------- .../files/patch-chrome_common_chrome__paths.cc | 16 +++--- .../files/patch-chrome_common_chrome__paths.h | 4 +- .../files/patch-chrome_common_chrome__switches.cc | 4 +- .../files/patch-chrome_common_chrome__switches.h | 4 +- ...ch-chrome_common_media_cdm__host__file__path.cc | 4 +- .../files/patch-chrome_common_pref__names.cc | 16 +++--- .../files/patch-chrome_common_pref__names.h | 12 ++--- .../files/patch-chrome_common_url__constants.cc | 11 +++++ .../files/patch-chrome_common_url__constants.h | 11 +++++ .../patch-chrome_common_webui__url__constants.cc | 42 +++------------- .../patch-chrome_common_webui__url__constants.h | 14 +++--- ...derer_pepper_pepper__flash__font__file__host.cc | 29 ----------- ...nderer_pepper_pepper__flash__font__file__host.h | 20 -------- ...mojom_safe__document__analyzer__mojom__traits.h | 4 +- www/chromium/files/patch-chrome_test_BUILD.gn | 6 +-- ...rome_test_chromedriver_chrome_chrome__finder.cc | 6 +-- .../files/patch-chrome_updater_app_app__install.cc | 4 +- .../files/patch-chrome_updater_installer.cc | 4 +- www/chromium/files/patch-chrome_updater_util.cc | 4 +- .../files/patch-chrome_utility_services.cc | 35 +++++++++++-- ...hromecast_browser_cast__browser__main__parts.cc | 16 +++--- ...ecast_browser_cast__content__browser__client.cc | 8 +-- ...tch-components_autofill__payments__strings.grdp | 4 +- ...ll_core_browser_autofill__external__delegate.cc | 11 ----- ...utofill_core_browser_personal__data__manager.cc | 4 +- ...ill_core_common_autofill__payments__features.cc | 4 +- ...nts_feature__engagement_public_feature__list.cc | 6 +-- ...ents_feature__engagement_public_feature__list.h | 10 ++-- .../patch-components_feed_core_v2_proto__util.cc | 6 +-- ...-components_feed_core_v2_test_proto__printer.cc | 4 +- ...rator_browser_network__session__configurator.cc | 4 +- ...ser_network__session__configurator__unittest.cc | 4 +- ...ch-components_os__crypt_keyring__util__linux.cc | 4 +- .../files/patch-components_os__crypt_os__crypt.h | 32 +++++++++--- ...ssword__manager_core_browser_login__database.cc | 8 +-- ...nager_core_browser_login__database__unittest.cc | 8 +-- ...ger_core_browser_sync_password__sync__bridge.cc | 6 +-- ...ager_core_common_password__manager__features.cc | 8 +-- ...nager_core_common_password__manager__features.h | 6 +-- ...ponents_policy_resources_policy__templates.json | 38 +++++++-------- ..._ai_sandbox_screen__ai__sandbox__hook__linux.cc | 18 +++++++ ...__ai_sandbox_screen__ai__sandbox__hook__linux.h | 16 ++++++ ...evice__info_local__device__info__util__linux.cc | 4 +- .../files/patch-components_viz_common_features.cc | 11 ----- ...isplay__embedder_skia__output__surface__impl.cc | 4 +- .../files/patch-content_app_content__main.cc | 4 +- www/chromium/files/patch-content_browser_BUILD.gn | 4 +- .../patch-content_browser_browser__main__loop.cc | 10 ++-- ...ent_browser_download_download__manager__impl.cc | 8 +-- .../patch-content_browser_gpu_compositor__util.cc | 6 +-- ...r_media_media__keys__listener__manager__impl.cc | 4 +- ...rowser_renderer__host_delegated__frame__host.cc | 4 +- ...ser_renderer__host_render__frame__host__impl.cc | 29 +++++++++++ ...wser_renderer__host_render__frame__host__impl.h | 20 ++++++++ ...r_renderer__host_render__process__host__impl.cc | 10 ++-- ...er_renderer__host_render__process__host__impl.h | 4 +- ...nderer__host_render__widget__host__view__aura.h | 4 +- ...scheduler_responsiveness_jank__monitor__impl.cc | 4 +- ...h-content_browser_utility__sandbox__delegate.cc | 20 +++++++- ...wser_web__contents_web__contents__view__aura.cc | 4 +- .../files/patch-content_child_child__process.cc | 4 +- .../files/patch-content_common_user__agent.cc | 13 ++++- ...atch-content_public_common_content__features.cc | 12 ++--- ...patch-content_public_common_content__features.h | 4 +- ...atch-content_public_common_content__switches.cc | 6 +-- ...patch-content_public_common_content__switches.h | 4 +- ...patch-content_renderer_render__process__impl.cc | 8 +-- .../patch-content_renderer_render__thread__impl.cc | 12 ++--- ...ent_renderer_renderer__blink__platform__impl.cc | 12 ++--- ...nt_shell_browser_shell__browser__main__parts.cc | 6 +-- www/chromium/files/patch-content_test_BUILD.gn | 4 +- .../files/patch-content_utility_utility__main.cc | 11 +++-- .../patch-extensions_browser_extension__prefs.cc | 10 ++-- .../files/patch-extensions_browser_pref__names.cc | 10 ++-- .../files/patch-extensions_browser_pref__names.h | 10 ++-- ..._command__buffer_service_external__semaphore.cc | 11 ----- ..._buffer_service_external__vk__image__backing.cc | 15 ++---- ...mmand__buffer_service_shared__image__factory.cc | 13 +++-- ...ommand__buffer_service_webgpu__decoder__impl.cc | 4 +- ...ch-gpu_command__buffer_tests_gl__test__utils.cc | 4 +- ...h-gpu_ipc_common_gpu__memory__buffer__support.h | 4 +- .../files/patch-gpu_ipc_service_gpu__init.cc | 16 +++--- .../files/patch-gpu_vulkan_generate__bindings.py | 22 +-------- .../patch-gpu_vulkan_vulkan__function__pointers.cc | 22 +-------- .../patch-gpu_vulkan_vulkan__function__pointers.h | 44 ++--------------- www/chromium/files/patch-media_BUILD.gn | 4 +- www/chromium/files/patch-media_audio_BUILD.gn | 4 +- .../patch-media_audio_alsa_audio__manager__alsa.cc | 14 +++--- .../files/patch-media_base_media__switches.cc | 14 +++--- .../files/patch-media_base_media__switches.h | 4 +- .../files/patch-media_base_video__frame.cc | 18 +++---- www/chromium/files/patch-media_base_video__frame.h | 4 +- .../files/patch-media_gpu_buffer__validation.cc | 6 +-- ...gpu_gpu__video__encode__accelerator__factory.cc | 4 +- .../files/patch-media_gpu_vaapi_vaapi__wrapper.cc | 4 +- ...ideo_gpu__memory__buffer__video__frame__pool.cc | 4 +- ...ia_video_video__encode__accelerator__adapter.cc | 6 +-- ...eo_video__encode__accelerator__adapter__test.cc | 4 +- .../files/patch-media_webrtc_audio__processor.cc | 4 +- www/chromium/files/patch-mojo_core_channel.cc | 4 +- .../files/patch-mojo_public_c_system_thunks.cc | 12 ++--- ...ch-mojo_public_js_mojo__bindings__resources.grd | 6 +-- www/chromium/files/patch-net_BUILD.gn | 20 ++++---- .../patch-net_base_network__change__notifier.cc | 6 +-- .../patch-net_cert_cert__verify__proc__unittest.cc | 6 +-- www/chromium/files/patch-net_dns_dns__util.cc | 4 +- .../files/patch-net_dns_host__resolver__manager.cc | 4 +- .../patch-net_http_http__auth__gssapi__posix.cc | 4 +- .../patch-net_socket_socks5__client__socket.cc | 4 +- .../files/patch-net_socket_tcp__socket__posix.cc | 4 +- .../files/patch-net_socket_udp__socket__posix.cc | 6 +-- .../patch-net_socket_udp__socket__unittest.cc | 24 ++++----- .../files/patch-net_third__party_quiche_BUILD.gn | 8 +-- .../files/patch-pdf_out__of__process__instance.cc | 20 -------- .../files/patch-pdf_pdfium_pdfium__engine.cc | 6 +-- .../files/patch-remoting_host_base_switches.cc | 11 ++++- .../files/patch-remoting_host_base_switches.h | 11 ++++- .../files/patch-remoting_host_host__attributes.cc | 4 +- .../files/patch-remoting_host_host__main.cc | 4 +- .../patch-remoting_host_remoting__me2me__host.cc | 57 ++++++++++++++++------ .../patch-remoting_resources_remoting__strings.grd | 6 +-- www/chromium/files/patch-sandbox_BUILD.gn | 4 +- www/chromium/files/patch-sandbox_policy_BUILD.gn | 8 +-- .../files/patch-sandbox_policy_features.cc | 4 +- ...atch-sandbox_policy_freebsd_sandbox__freebsd.cc | 4 +- .../files/patch-sandbox_policy_mojom_sandbox.mojom | 4 +- ...atch-sandbox_policy_openbsd_sandbox__openbsd.cc | 4 +- .../files/patch-sandbox_policy_sandbox__type.cc | 43 ++++++++++++++-- .../files/patch-sandbox_policy_switches.cc | 4 +- www/chromium/files/patch-sandbox_policy_switches.h | 4 +- ...me__zone__monitor_time__zone__monitor__linux.cc | 6 +-- www/chromium/files/patch-services_network_BUILD.gn | 4 +- ...atch-third__party_abseil-cpp_absl_base_config.h | 27 ++-------- ...l-cpp_absl_debugging_internal_elf__mem__image.h | 12 ++--- ...tch-third__party_angle_src_libANGLE_Display.cpp | 10 ++-- ...blink_renderer_core_exported_web__view__impl.cc | 4 +- ...y_blink_renderer_core_frame_web__frame__test.cc | 6 +-- ...odules_webgl_webgl__rendering__context__base.cc | 4 +- ...modules_webgl_webgl__webcodecs__video__frame.cc | 4 +- ...h-third__party_blink_renderer_platform_BUILD.gn | 4 +- ...atch-third__party_boringssl_BUILD.generated.gni | 6 +-- ...__party_crashpad_crashpad_util_posix_signals.cc | 4 +- ...ashpad_util_posix_symbolic__constants__posix.cc | 8 +-- ..._chromium_config_Chrome_openbsd_ia32_config.asm | 51 +++++++++++++++++-- ...eg_chromium_config_Chrome_openbsd_ia32_config.h | 55 ++++++++++++++++++--- ...arty_pdfium_core_fxge_linux_fx__linux__impl.cpp | 12 ++--- ...etto_src_tracing_core_tracing__service__impl.cc | 4 +- .../patch-third__party_skia_src_core_SkCpu.cpp | 23 ++++++++- ...-third__party_sqlite_src_amalgamation_sqlite3.c | 6 +-- .../files/patch-third__party_wayland_features.gni | 6 +-- .../files/patch-third__party_webrtc_BUILD.gn | 4 +- .../patch-ui_base_resource_resource__bundle.cc | 4 +- .../files/patch-ui_base_ui__base__features.cc | 6 +-- .../files/patch-ui_base_x_x11__cursor__loader.cc | 4 +- www/chromium/files/patch-ui_color_color__id.h | 4 +- .../files/patch-ui_compositor_compositor.cc | 4 +- ...ch-ui_events_keycodes_dom_keycode__converter.cc | 10 ++-- .../files/patch-ui_gl_gl__implementation.cc | 4 +- ...platform_headless_headless__surface__factory.cc | 20 ++++++++ ..._platform_headless_headless__surface__factory.h | 11 +++++ ..._platform_headless_ozone__platform__headless.cc | 11 +++++ ...rm__window_platform__window__init__properties.h | 4 +- .../patch-ui_strings_app__locale__settings.grd | 4 +- .../patch-ui_views_controls_textfield_textfield.cc | 6 +-- .../patch-ui_views_widget_native__widget__aura.cc | 6 +-- www/chromium/files/patch-ui_views_widget_widget.cc | 4 +- www/chromium/files/patch-v8_BUILD.gn | 8 +-- www/chromium/files/patch-v8_include_v8config.h | 14 +++--- www/chromium/files/patch-v8_src_api_api.cc | 12 ++--- www/chromium/files/patch-v8_src_base_atomicops.h | 12 ++--- .../patch-v8_src_base_platform_platform-posix.cc | 24 ++++----- ...atch-v8_src_trap-handler_handler-inside-posix.h | 4 +- .../files/patch-v8_src_trap-handler_trap-handler.h | 6 +-- ...-weblayer_browser_browser__main__parts__impl.cc | 6 +-- ...layer_browser_content__browser__client__impl.cc | 6 +-- 282 files changed, 1718 insertions(+), 1455 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index cf4fefea675c..13a3dffcee9c 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,7 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 100.0.4896.127 +PORTVERSION= 101.0.4951.41 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:fonts diff --git a/www/chromium/distinfo b/www/chromium/distinfo index cacd334731d5..ac55e8ad2b6c 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1650025280 -SHA256 (chromium-100.0.4896.127.tar.xz) = 4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d -SIZE (chromium-100.0.4896.127.tar.xz) = 1358426108 -SHA256 (chromium-100.0.4896.127-testdata.tar.xz) = ad2d659c4850d9e48b298f192261c795be67e1393a3aecc42c062e6b751ca6a9 -SIZE (chromium-100.0.4896.127-testdata.tar.xz) = 260013080 +TIMESTAMP = 1650566380 +SHA256 (chromium-101.0.4951.41.tar.xz) = 099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37 +SIZE (chromium-101.0.4951.41.tar.xz) = 1414841332 +SHA256 (chromium-101.0.4951.41-testdata.tar.xz) = f172a895533f618369176e04904b6d5eae7dce698b1358d53c985527c4805169 +SIZE (chromium-101.0.4951.41-testdata.tar.xz) = 260727368 SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 30303505c930..67d26dc553f0 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2022-03-25 21:59:56 UTC +--- BUILD.gn.orig 2022-04-21 18:48:31 UTC +++ BUILD.gn -@@ -53,7 +53,7 @@ declare_args() { +@@ -54,7 +54,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) -@@ -452,7 +452,7 @@ group("gn_all") { +@@ -436,7 +436,7 @@ group("gn_all") { ] } @@ -18,7 +18,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -636,6 +636,15 @@ group("gn_all") { +@@ -625,6 +625,15 @@ group("gn_all") { } } @@ -34,7 +34,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -685,7 +694,7 @@ group("gn_all") { +@@ -674,7 +683,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -43,7 +43,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1147,7 +1156,7 @@ if (!is_ios) { +@@ -1141,7 +1150,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -52,7 +52,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1156,7 +1165,7 @@ if (!is_ios) { +@@ -1150,7 +1159,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -61,7 +61,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1531,7 +1540,7 @@ group("chromium_builder_perf") { +@@ -1540,7 +1549,7 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 1ae290e3f1c0..28df7dbb13f1 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2022-03-25 21:59:56 UTC +--- base/BUILD.gn.orig 2022-04-21 18:48:31 UTC +++ base/BUILD.gn -@@ -999,7 +999,7 @@ mixed_component("base") { +@@ -1010,7 +1010,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -1010,6 +1010,12 @@ mixed_component("base") { +@@ -1021,6 +1021,12 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,7 +22,7 @@ } if (is_win) { -@@ -1478,11 +1484,23 @@ mixed_component("base") { +@@ -1492,11 +1498,23 @@ mixed_component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -47,7 +47,7 @@ if (use_allocator_shim) { sources += [ "allocator/allocator_shim.cc", -@@ -1506,7 +1524,7 @@ mixed_component("base") { +@@ -1520,7 +1538,7 @@ mixed_component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -56,16 +56,16 @@ sources += [ "allocator/allocator_shim_override_cpp_symbols.h", "allocator/allocator_shim_override_glibc_weak_symbols.h", -@@ -1563,7 +1581,7 @@ mixed_component("base") { +@@ -1576,7 +1594,7 @@ mixed_component("base") { + # Allow more direct string conversions on platforms with native utf8 # strings - # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos -- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) { ++ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2243,6 +2261,42 @@ mixed_component("base") { +@@ -2255,6 +2273,42 @@ mixed_component("base") { } } @@ -108,7 +108,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3495,7 +3549,7 @@ test("base_unittests") { +@@ -3537,7 +3591,7 @@ test("base_unittests") { } } @@ -117,7 +117,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3543,7 +3597,7 @@ test("base_unittests") { +@@ -3585,7 +3639,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] @@ -126,16 +126,16 @@ sources += [ "cpu_affinity_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3555,7 +3609,7 @@ test("base_unittests") { +@@ -3596,7 +3650,7 @@ test("base_unittests") { + # Allow more direct string conversions on platforms with native utf8 # strings - # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos -- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) { ++ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3724,7 +3778,7 @@ test("base_unittests") { +@@ -3765,7 +3819,7 @@ test("base_unittests") { } } 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 454110a15f26..6adb646639f4 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-03-25 21:59:56 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-04-21 18:48:31 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -66,7 +66,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 -@@ -179,7 +179,7 @@ constexpr bool kUseLazyCommit = false; +@@ -186,7 +186,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,3 +18,12 @@ #define PA_HAS_ATFORK_HANDLER #endif +@@ -212,7 +212,7 @@ constexpr bool kUseLazyCommit = false; + // + // This is intended to roll out more broadly, but only enabled on Linux for now + // to get performance bot and real-world data pre-A/B experiment. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define PA_PREFER_SMALLER_SLOT_SPANS + #endif // BUILDFLAG(IS_LINUX) + diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h deleted file mode 100644 index dbd1382fed99..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/partition_root.h.orig 2022-03-25 21:59:56 UTC -+++ base/allocator/partition_allocator/partition_root.h -@@ -1071,7 +1071,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH - // essentially). - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \ - ((BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \ -- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_64_BITS))) -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_64_BITS))) - PA_CHECK(IsManagedByPartitionAlloc(object_addr)); - #endif - diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc index 2fa346356669..fc3fa41f6937 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-02-28 16:54:41 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-04-21 18:48:31 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc @@ -17,7 +17,15 @@ @@ -16,7 +16,7 @@ #include <sys/syscall.h> #include <unistd.h> #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -85,8 +93,13 @@ void SpinningMutex::FutexWait() { +@@ -116,8 +124,13 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -30,7 +30,7 @@ if (err) { // These are programming error, check them. -@@ -98,8 +111,14 @@ void SpinningMutex::FutexWait() { +@@ -129,8 +142,14 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 01e51311eb4a..447811370c92 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2022-02-28 16:54:41 UTC +--- base/debug/debugger_posix.cc.orig 2022-04-21 18:48:31 UTC +++ base/debug/debugger_posix.cc -@@ -36,6 +36,10 @@ +@@ -35,6 +35,10 @@ #include <sys/sysctl.h> #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -96,32 +100,51 @@ bool BeingDebugged() { +@@ -95,32 +99,51 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -24,7 +24,7 @@ +#endif #if BUILDFLAG(IS_OPENBSD) - if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; mib[5] = (info_size / sizeof(struct kinfo_proc)); @@ -34,11 +34,11 @@ + return being_debugged; + } + -+ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); ++ int sysctl_result = sysctl(mib, std::size(mib), info, &info_size, NULL, 0); #endif +#if !BUILDFLAG(IS_OPENBSD) - int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); + int sysctl_result = sysctl(mib, std::size(mib), &info, &info_size, NULL, 0); +#endif DCHECK_EQ(sysctl_result, 0); if (sysctl_result != 0) { diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index a1831d52549c..acafe295b237 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/files/file_util_posix.cc.orig 2022-04-21 18:48:31 UTC +++ base/files/file_util_posix.cc -@@ -694,32 +694,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -695,32 +695,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). @@ -21,29 +21,29 @@ } // Iterate through the parents and create the missing ones. - for (auto i = subpaths.rbegin(); i != subpaths.rend(); ++i) { -- if (DirectoryExists(*i)) + for (const FilePath& subpath : base::Reversed(subpaths)) { +- if (DirectoryExists(subpath)) - continue; -- if (mkdir(i->value().c_str(), 0700) == 0) +- if (mkdir(subpath.value().c_str(), 0700) == 0) - continue; - // Mkdir failed, but it might have failed with EEXIST, or some other error - // due to the directory appearing out of thin air. This can occur if - // two processes are trying to create the same file system tree at the same - // time. Check to see if it exists and make sure it is a directory. - int saved_errno = errno; -- if (!DirectoryExists(*i)) { +- if (!DirectoryExists(subpath)) { - if (error) - *error = File::OSErrorToFileError(saved_errno); - return false; -+ if (!PathExists(*i)) { -+ if ((mkdir(i->value().c_str(), 0700) == -1) && -+ ((full_path != *i) ? (errno != ENOENT) : (-1))) { ++ if (!PathExists(subpath)) { ++ if ((mkdir(subpath.value().c_str(), 0700) == -1) && ++ ((full_path != subpath) ? (errno != ENOENT) : (-1))) { + int saved_errno = errno; + if (error) + *error = File::OSErrorToFileError(saved_errno); + return false; + } -+ } else if (!DirectoryExists(*i)) { ++ } else if (!DirectoryExists(subpath)) { + if (error) + *error = File::OSErrorToFileError(ENOTDIR); + return false; diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 4ab8b350d668..7a1b5ff376fb 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- base/files/file_util_unittest.cc.orig 2022-04-21 18:48:31 UTC +++ base/files/file_util_unittest.cc -@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3523,7 +3523,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4240,7 +4240,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4239,7 +4239,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index f5d9b12738d7..efee9094958e 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2022-02-28 16:54:41 UTC +--- base/i18n/icu_util.cc.orig 2022-04-21 18:48:31 UTC +++ base/i18n/icu_util.cc @@ -52,7 +52,7 @@ #endif @@ -9,7 +9,7 @@ !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -346,7 +346,7 @@ void InitializeIcuTimeZone() { +@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index 446674518dba..5cc930471cea 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,12 +1,14 @@ ---- base/process/process_handle_freebsd.cc.orig 2021-09-24 04:25:55 UTC +--- base/process/process_handle_freebsd.cc.orig 2022-04-21 18:48:31 UTC +++ base/process/process_handle_freebsd.cc -@@ -12,15 +12,19 @@ - #include <unistd.h> +@@ -3,6 +3,7 @@ + // found in the LICENSE file. - #include "base/cxx17_backports.h" -+#include "base/files/file_path.h" + #include "base/process/process_handle.h" ++#include "base/files/file_util.h" - namespace base { + #include <limits.h> + #include <stddef.h> +@@ -15,10 +16,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; @@ -14,7 +16,7 @@ + size_t length = sizeof(struct kinfo_proc); int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) + return -1; + + if (length < sizeof(struct kinfo_proc)) diff --git a/www/chromium/files/patch-base_process_process__handle__openbsd.cc b/www/chromium/files/patch-base_process_process__handle__openbsd.cc index f176993b81b2..f8e318565de3 100644 --- a/www/chromium/files/patch-base_process_process__handle__openbsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_openbsd.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/process_handle_openbsd.cc.orig 2022-04-21 18:48:31 UTC +++ base/process/process_handle_openbsd.cc @@ -3,8 +3,11 @@ // found in the LICENSE file. @@ -12,7 +12,7 @@ #include <sys/sysctl.h> #include <sys/types.h> #include <unistd.h> -@@ -14,39 +17,59 @@ +@@ -12,39 +15,59 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { @@ -23,16 +23,16 @@ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; - if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(length); + mib[5] = (length / sizeof(struct kinfo_proc)); -- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return -1; -+ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) { + ppid = -1; + goto out; + } @@ -54,11 +54,11 @@ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; -- if (sysctl(mib, base::size(mib), NULL, &len, NULL, 0) == -1) -+ if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) == -1) +- if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) ++ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1) return FilePath(); - mib[5] = (len / sizeof(struct kinfo_proc)); -- if (sysctl(mib, base::size(mib), &kp, &len, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) - return FilePath(); - if ((kp.p_flag & P_SYSTEM) != 0) - return FilePath(); @@ -70,7 +70,7 @@ + + mib[5] = (length / sizeof(struct kinfo_proc)); + -+ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) + goto out; + + if ((info->p_flag & P_SYSTEM) != 0) diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index 94c3bb5ddfdd..88715effc731 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_iterator_freebsd.cc.orig 2021-09-24 04:25:55 UTC +--- base/process/process_iterator_freebsd.cc.orig 2022-04-21 18:48:31 UTC +++ base/process/process_iterator_freebsd.cc -@@ -21,7 +21,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -20,7 +20,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* : index_of_kinfo_proc_(), filter_(filter) { @@ -9,25 +9,25 @@ bool done = false; int try_num = 1; -@@ -40,7 +40,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -39,7 +39,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* num_of_kinfo_proc += 16; kinfo_procs_.resize(num_of_kinfo_proc); len = num_of_kinfo_proc * sizeof(struct kinfo_proc); -- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { -+ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { +- if (sysctl(mib, std::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { -@@ -50,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -49,7 +49,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right - size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc); -+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); ++ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); kinfo_procs_.resize(num_of_kinfo_proc); done = true; } -@@ -72,18 +72,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -71,18 +71,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; @@ -38,7 +38,7 @@ continue; - length = 0; -- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) { +- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) { - LOG(ERROR) << "failed to figure out the buffer size for a command line"; - continue; - } @@ -47,5 +47,5 @@ + data.resize(ARG_MAX); + length = ARG_MAX; - if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) { + if (sysctl(mib, std::size(mib), &data[0], &length, NULL, 0) < 0) { LOG(ERROR) << "failed to fetch a commandline"; diff --git a/www/chromium/files/patch-base_process_process__iterator__openbsd.cc b/www/chromium/files/patch-base_process_process__iterator__openbsd.cc index a48483289ff4..5b63c8ddba9d 100644 --- a/www/chromium/files/patch-base_process_process__iterator__openbsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_openbsd.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/process_iterator_openbsd.cc.orig 2022-04-21 18:48:31 UTC +++ base/process/process_iterator_openbsd.cc @@ -6,6 +6,9 @@ @@ -9,8 +9,8 @@ +#include <sys/proc.h> #include <sys/sysctl.h> - #include "base/cxx17_backports.h" -@@ -19,12 +22,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter* + #include "base/logging.h" +@@ -18,12 +21,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter* : index_of_kinfo_proc_(), filter_(filter) { @@ -25,7 +25,7 @@ do { size_t len = 0; -@@ -33,7 +37,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -32,7 +36,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* kinfo_procs_.resize(0); done = true; } else { @@ -34,7 +34,7 @@ // Leave some spare room for process table growth (more could show up // between when we check and now) num_of_kinfo_proc += 16; -@@ -49,7 +53,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -48,7 +52,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right 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 052477866871..6e1f650925be 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_freebsd.cc.orig 2022-03-25 21:59:56 UTC +--- base/process/process_metrics_freebsd.cc.orig 2022-04-21 18:48:31 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,21 +3,41 @@ +@@ -3,20 +3,39 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -16,18 +16,16 @@ +#include <kvm.h> +#include <libutil.h> + - #include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" namespace base { +namespace { - +int GetPageShift() { + int pagesize = getpagesize(); + int pageshift = 0; -+ + + while (pagesize > 1) { + pageshift++; + pagesize >>= 1; @@ -44,7 +42,7 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -27,17 +47,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -26,17 +45,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create double ProcessMetrics::GetPlatformIndependentCPUUsage() { struct kinfo_proc info; @@ -52,9 +50,9 @@ - size_t length = sizeof(info); + size_t length = sizeof(struct kinfo_proc); -+ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return 0; + return 0.0; @@ -68,7 +66,7 @@ return TimeDelta(); } -@@ -68,4 +89,221 @@ size_t GetSystemCommitCharge() { +@@ -67,4 +87,221 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } @@ -145,7 +143,7 @@ + + length = sizeof(total_count); + -+ if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), &total_count, &length, NULL, 0) < 0) { + total_count = -1; + } + 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 97102c7e4f92..7cf86d373978 100644 --- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc *** 8334 LINES SKIPPED ***