git: 1e683edf9a25 - main - www/chromium: update to 100.0.4896.60
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Mar 2022 20:45:43 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1e683edf9a258d43c95b485ad96f5c39860770cb
commit 1e683edf9a258d43c95b485ad96f5c39860770cb
Author: Robert Nagy <robert@openbsd.org>
AuthorDate: 2022-03-29 20:42:38 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-03-29 20:44:59 +0000
www/chromium: update to 100.0.4896.60
Enable some more unit tests.
Security: ab2d7f62-af9d-11ec-a0b8-3065ec8fd3ec
---
www/chromium/Makefile | 5 +-
www/chromium/Makefile.tests | 6 +-
www/chromium/distinfo | 10 +--
www/chromium/files/patch-BUILD.gn | 14 ++--
...patch-ash_display_mirror__window__controller.cc | 4 +-
www/chromium/files/patch-base_BUILD.gn | 22 +++---
...__allocator_page__allocator__internals__posix.h | 4 +-
...partition__allocator_partition__alloc__config.h | 11 ++-
...llocator_partition__allocator_partition__page.h | 6 +-
...llocator_partition__allocator_partition__root.h | 6 +-
...r_partition__allocator_starscan_state__bitmap.h | 20 ------
www/chromium/files/patch-base_compiler__specific.h | 11 ---
.../files/patch-base_debug_stack__trace__posix.cc | 4 +-
.../files/patch-base_process_process__metrics.cc | 11 ++-
...patch-base_process_process__metrics__freebsd.cc | 21 +++++-
...patch-base_process_process__metrics__openbsd.cc | 48 +++++++++----
.../files/patch-base_process_process__posix.cc | 4 +-
www/chromium/files/patch-base_rand__util.h | 4 +-
.../files/patch-base_system_sys__info__freebsd.cc | 15 +++-
.../files/patch-base_system_sys__info__openbsd.cc | 20 +++---
.../files/patch-base_system_sys__info__posix.cc | 34 ++++++++-
.../files/patch-base_system_sys__info__unittest.cc | 4 +-
...e_threading_thread__local__storage__unittest.cc | 11 ---
...atch-base_trace__event_memory__dump__manager.cc | 4 +-
.../files/patch-build_config_compiler_BUILD.gn | 20 +++---
www/chromium/files/patch-build_config_rust.gni | 14 ++--
.../files/patch-build_toolchain_gcc__toolchain.gni | 4 +-
www/chromium/files/patch-cc_BUILD.gn | 6 +-
.../patch-chrome_app_chrome__main__delegate.cc | 24 +++----
.../files/patch-chrome_app_chromium__strings.grd | 6 +-
.../patch-chrome_app_generated__resources.grd | 10 +--
.../patch-chrome_app_google__chrome__strings.grd | 6 +-
...hrome_app_theme_chrome__unscaled__resources.grd | 35 +++++++--
.../files/patch-chrome_browser_about__flags.cc | 69 ++++++++----------
...browser_background_background__mode__manager.cc | 4 +-
.../patch-chrome_browser_browser__features.cc | 11 +++
.../patch-chrome_browser_browser__process__impl.cc | 6 +-
.../patch-chrome_browser_browser__process__impl.h | 4 +-
..._browser_chrome__browser__interface__binders.cc | 29 ++++++--
.../patch-chrome_browser_chrome__browser__main.cc | 6 +-
...ome_browser_chrome__content__browser__client.cc | 51 +++++++++----
...rome_browser_chrome__content__browser__client.h | 4 +-
.../files/patch-chrome_browser_defaults.cc | 12 ++--
...download_chrome__download__manager__delegate.cc | 12 ++--
...hrome_browser_download_download__item__model.cc | 6 +-
.../files/patch-chrome_browser_extensions_BUILD.gn | 4 +-
...extensions_api_settings__private_prefs__util.cc | 6 +-
..._browser_extensions_external__provider__impl.cc | 6 +-
.../patch-chrome_browser_flag__descriptions.cc | 34 ++++-----
.../patch-chrome_browser_flag__descriptions.h | 32 ++++-----
...chrome_browser_headless_headless__mode__util.cc | 8 +--
...-chrome_browser_media_router_discovery_BUILD.gn | 4 +-
...chrome__browser__main__extra__parts__metrics.cc | 6 +-
...ser_metrics_chrome__metrics__service__client.cc | 8 +--
...rowser_net_system__network__context__manager.cc | 10 +--
...cations_notification__display__service__impl.cc | 10 +--
...ce__monitor_process__metrics__recorder__util.cc | 4 +-
...browser_performance__monitor_process__monitor.h | 4 +-
...onfiguration__policy__handler__list__factory.cc | 12 ++--
.../patch-chrome_browser_prefs_browser__prefs.cc | 8 +--
...tch-chrome_browser_process__singleton__posix.cc | 8 +--
...hrome__browser__main__extra__parts__profiles.cc | 4 +-
.../patch-chrome_browser_profiles_profile__impl.cc | 6 +-
...h-chrome_browser_renderer__preferences__util.cc | 12 ++--
...wser_resources_new__tab__page_new__tab__page.js | 13 ----
...s_settings_appearance__page_appearance__page.ts | 12 ++--
...atch-chrome_browser_resources_settings_route.ts | 4 +-
...browsing_download__protection_file__analyzer.cc | 10 +--
.../patch-chrome_browser_signin_signin__util.cc | 4 +-
...tch-chrome_browser_sync_chrome__sync__client.cc | 4 +-
.../patch-chrome_browser_themes_theme__helper.cc | 4 +-
...rome_browser_ui_browser__command__controller.cc | 8 +--
.../files/patch-chrome_browser_ui_chrome__pages.cc | 11 +++
.../files/patch-chrome_browser_ui_chrome__pages.h | 20 ++++++
...rowser_ui_color_native__chrome__color__mixer.cc | 11 +++
...h-chrome_browser_ui_signin__view__controller.cc | 4 +-
...nin_dice__web__signin__interceptor__delegate.cc | 11 ---
...browser_ui_startup_startup__browser__creator.cc | 16 ++---
.../files/patch-chrome_browser_ui_tab__helpers.cc | 14 ++--
..._browser__desktop__window__tree__host__linux.cc | 4 +-
...chrome_browser_ui_views_frame_browser__frame.cc | 14 ++--
...-chrome_browser_ui_views_frame_browser__view.cc | 4 +-
..._ui_views_profiles_profile__menu__view__base.cc | 4 +-
...es_signin__view__controller__delegate__views.cc | 6 +-
.../patch-chrome_browser_ui_views_tabs_tab.cc | 4 +-
..._browser_ui_views_tabs_tab__drag__controller.cc | 8 +--
.../patch-chrome_browser_ui_webui_about__ui.cc | 6 +-
...i_webui_chrome__web__ui__controller__factory.cc | 26 +++++--
..._browser_ui_webui_ntp_app__launcher__handler.cc | 8 +--
...rowser_ui_webui_settings_appearance__handler.cc | 12 ++--
...browser_ui_webui_settings_appearance__handler.h | 6 +-
...tings_settings__localized__strings__provider.cc | 12 ++--
...hrome_browser_ui_webui_settings_settings__ui.cc | 6 +-
...ions_externally__managed__app__install__task.cc | 11 ---
...ration_web__app__file__handler__registration.h} | 4 +-
...ications_os__integration_web__app__shortcut.cc} | 4 +-
...lications_os__integration_web__app__shortcut.h} | 6 +-
...os__integration_web__app__shortcut__manager.cc} | 4 +-
...er_web__applications_web__app__install__task.cc | 11 ---
...browser_web__applications_web__app__provider.cc | 4 +-
...thn_chrome__authenticator__request__delegate.cc | 11 +++
.../files/patch-chrome_common_chrome__features.cc | 47 +++++-------
.../files/patch-chrome_common_chrome__features.h | 29 +++-----
.../files/patch-chrome_common_chrome__paths.cc | 12 ++--
.../files/patch-chrome_common_chrome__switches.cc | 4 +-
.../files/patch-chrome_common_chrome__switches.h | 4 +-
.../patch-chrome_common_extensions_command.cc | 4 +-
.../files/patch-chrome_common_pref__names.cc | 14 ++--
.../files/patch-chrome_common_pref__names.h | 12 ++--
.../patch-chrome_common_webui__url__constants.cc | 25 +++++--
.../patch-chrome_common_webui__url__constants.h | 15 ++--
...vices_printing_print__backend__service__impl.cc | 4 +-
www/chromium/files/patch-chrome_test_BUILD.gn | 4 +-
...ch-chrome_test_chromedriver_chrome__launcher.cc | 4 +-
...rome_test_chromedriver_chrome_chrome__finder.cc | 12 ++--
...e_test_chromedriver_key__converter__unittest.cc | 10 +--
...medriver_keycode__text__conversion__unittest.cc | 10 +--
.../files/patch-chrome_updater_app_app__install.cc | 4 +-
.../files/patch-chrome_updater_configurator.cc | 4 +-
www/chromium/files/patch-chrome_updater_updater.cc | 4 +-
www/chromium/files/patch-chrome_updater_util.cc | 4 +-
.../files/patch-chrome_utility_services.cc | 6 +-
...hromecast_browser_cast__browser__main__parts.cc | 16 ++---
...ecast_browser_cast__content__browser__client.cc | 4 +-
...content__browser__client__receiver__bindings.cc | 4 +-
...ast_renderer_cast__content__renderer__client.cc | 4 +-
...utofill_core_browser_personal__data__manager.cc | 4 +-
...ill_core_common_autofill__payments__features.cc | 4 +-
...e__engagement_public_feature__configurations.cc | 4 +-
...eature__engagement_public_feature__constants.cc | 6 +-
...feature__engagement_public_feature__constants.h | 6 +-
...nts_feature__engagement_public_feature__list.cc | 8 +--
...ents_feature__engagement_public_feature__list.h | 12 ++--
...s_feed_core_v2_feed__network__impl__unittest.cc | 13 ++++
...-components_feed_core_v2_test_proto__printer.cc | 4 +-
.../patch-components_flags__ui_flags__state.cc | 4 +-
...ser_network__session__configurator__unittest.cc | 4 +-
...ssword__manager_core_browser_login__database.cc | 8 +--
...ger_core_browser_sync_password__sync__bridge.cc | 13 +++-
...ager_core_common_password__manager__features.cc | 15 +++-
...nager_core_common_password__manager__features.h | 15 +++-
...tch-components_performance__manager_features.cc | 4 +-
...icy_core_browser_policy__pref__mapping__test.cc | 4 +-
...licy_core_common_cloud_cloud__policy__client.cc | 4 +-
...ponents_policy_resources_policy__templates.json | 44 ++++++------
...onents_policy_tools_generate__policy__source.py | 4 +-
...ontent_common_file__type__policies__unittest.cc | 4 +-
...onents_translate_core_common_translate__util.cc | 8 +--
.../files/patch-components_viz_common_features.cc | 4 +-
...isplay__embedder_skia__output__surface__impl.cc | 4 +-
...e__sinks_root__compositor__frame__sink__impl.cc | 6 +-
...me__sinks_root__compositor__frame__sink__impl.h | 4 +-
.../files/patch-content_app_content__main.cc | 6 +-
...atch-content_app_content__main__runner__impl.cc | 25 +++----
www/chromium/files/patch-content_browser_BUILD.gn | 4 +-
..._browser_browser__child__process__host__impl.cc | 4 +-
.../patch-content_browser_browser__main__loop.cc | 10 +--
...content_browser_compute__pressure_cpu__probe.cc | 4 +-
...ent_browser_download_download__manager__impl.cc | 8 +--
...browser_font__access_font__enumeration__cache.h | 11 ---
...font__access_font__enumeration__data__source.cc | 29 ++++++++
...rowser_gpu_gpu__data__manager__impl__private.cc | 11 ---
...r_media_media__keys__listener__manager__impl.cc | 4 +-
...er_memory_swap__metrics__driver__impl__linux.cc | 16 -----
...r_renderer__host_render__process__host__impl.cc | 10 +--
...er_renderer__host_render__process__host__impl.h | 4 +-
...derer__host_render__widget__host__view__aura.cc | 10 +--
...nderer__host_render__widget__host__view__aura.h | 4 +-
...wser_web__contents_web__contents__view__aura.cc | 4 +-
.../files/patch-content_child_child__process.cc | 4 +-
.../files/patch-content_common_user__agent.cc | 4 +-
www/chromium/files/patch-content_gpu_gpu__main.cc | 14 ++--
.../patch-content_gpu_gpu__sandbox__hook__linux.cc | 14 ++--
...t_public_common_common__param__traits__macros.h | 4 +-
...atch-content_public_common_content__features.cc | 19 ++---
...patch-content_public_common_content__features.h | 4 +-
...atch-content_public_common_content__switches.cc | 4 +-
...patch-content_public_common_content__switches.h | 8 +--
.../patch-content_renderer_render__thread__impl.cc | 6 +-
...ent_renderer_renderer__blink__platform__impl.cc | 12 ++--
...tent_renderer_renderer__blink__platform__impl.h | 12 ++--
www/chromium/files/patch-content_shell_BUILD.gn | 4 +-
www/chromium/files/patch-content_test_BUILD.gn | 6 +-
www/chromium/files/patch-device_fido_features.cc | 11 ---
...sions_browser_api_messaging_message__service.cc | 4 +-
..._browser__context__keyed__service__factories.cc | 4 +-
.../patch-extensions_browser_extension__prefs.cc | 4 +-
...h-google__apis_gcm_engine_heartbeat__manager.cc | 14 ++--
...ared__image__backing__factory__angle__vulkan.cc | 4 +-
...mmand__buffer_service_shared__image__factory.cc | 31 ++++----
...ommand__buffer_service_webgpu__decoder__impl.cc | 4 +-
...ffer_tests_gl__gpu__memory__buffer__unittest.cc | 29 ++++++++
...__buffer_tests_gl__oes__egl__image__unittest.cc | 20 ++++++
...ch-gpu_command__buffer_tests_gl__test__utils.cc | 20 ++++++
...tch-gpu_command__buffer_tests_gl__test__utils.h | 11 +++
www/chromium/files/patch-gpu_config_gpu__util.cc | 11 ---
.../files/patch-gpu_ipc_service_gpu__init.cc | 44 ++++--------
.../patch-gpu_vulkan_vulkan__device__queue.cc | 4 +-
.../patch-gpu_vulkan_vulkan__function__pointers.cc | 8 +--
.../patch-gpu_vulkan_vulkan__function__pointers.h | 16 ++---
...tch-gpu_vulkan_x_vulkan__implementation__x11.cc | 14 ----
...ss_lib_browser_headless__web__contents__impl.cc | 4 +-
...adless_lib_headless__content__main__delegate.cc | 4 +-
.../patch-headless_public_headless__browser.cc | 6 +-
.../files/patch-ipc_ipc__message__utils.cc | 4 +-
www/chromium/files/patch-ipc_ipc__message__utils.h | 4 +-
www/chromium/files/patch-media_audio_BUILD.gn | 4 +-
.../files/patch-media_base_media__switches.cc | 10 +--
.../files/patch-media_cdm_cdm__paths__unittest.cc | 13 +---
...-media_gpu_chromeos_video__decoder__pipeline.cc | 4 +-
.../files/patch-media_gpu_vaapi_vaapi__wrapper.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 +-
.../files/patch-media_webrtc_helpers__unittests.cc | 4 +-
.../files/patch-mojo_public_c_system_thunks.cc | 30 ++++----
...ch-mojo_public_js_mojo__bindings__resources.grd | 4 +-
www/chromium/files/patch-net_BUILD.gn | 24 +++----
.../patch-net_base_network__change__notifier.cc | 6 +-
.../files/patch-net_cert_cert__verify__proc.cc | 4 +-
.../files/patch-net_cert_cert__verify__proc.h | 6 +-
.../patch-net_cert_cert__verify__proc__unittest.cc | 4 +-
www/chromium/files/patch-net_dns_BUILD.gn | 14 +++-
.../files/patch-net_dns_address__sorter__posix.cc | 4 +-
www/chromium/files/patch-net_dns_dns__util.cc | 6 +-
.../files/patch-net_dns_host__resolver__manager.cc | 4 +-
.../files/patch-net_dns_host__resolver__proc.cc | 6 +-
www/chromium/files/patch-net_dns_public_BUILD.gn | 6 +-
.../files/patch-net_socket_tcp__socket__posix.cc | 4 +-
.../files/patch-net_socket_udp__socket__posix.cc | 4 +-
.../patch-net_socket_udp__socket__unittest.cc | 10 +--
.../files/patch-net_third__party_quiche_BUILD.gn | 8 +--
.../files/patch-net_url__request_url__fetcher.h | 4 +-
...patch-net_url__request_url__request__context.cc | 4 +-
.../patch-net_url__request_url__request__context.h | 4 +-
..._url__request_url__request__context__builder.cc | 4 +-
.../patch-printing_print__settings__conversion.cc | 4 +-
.../files/patch-remoting_host_host__main.cc | 4 +-
.../patch-remoting_host_remoting__me2me__host.cc | 24 +++----
...atch-sandbox_policy_openbsd_sandbox__openbsd.cc | 21 ++++--
...patch-sandbox_policy_openbsd_sandbox__openbsd.h | 8 ++-
.../patch-services_network_network__service.cc | 4 +-
..._instrumentation_queued__request__dispatcher.cc | 65 +++++++++++++++++
...tor_public_cpp_memory__instrumentation_BUILD.gn | 16 +++++
...cpp_memory__instrumentation_os__metrics__bsd.cc | 61 ++++++++++++++++
...p_memory__instrumentation_os__metrics__linux.cc | 83 ----------------------
.../patch-skia_ext_SkMemory__new__handler.cpp | 12 ++--
...party_angle_src_common_system__utils__posix.cpp | 4 +-
...tch-third__party_angle_src_libANGLE_Display.cpp | 14 ++--
...third__party_angle_src_libANGLE_formatutils.cpp | 11 +++
...erences_renderer__preferences__mojom__traits.cc | 6 +-
...n_renderer__preferences_renderer__preferences.h | 8 +--
...ferences_renderer__preferences__mojom__traits.h | 6 +-
...blink_renderer_core_exported_web__view__impl.cc | 6 +-
...nderer_core_html_forms_internal__popup__menu.cc | 4 +-
...arty_blink_renderer_core_layout_layout__view.cc | 6 +-
...peerconnection_webrtc__audio__renderer__test.cc | 4 +-
...h-third__party_blink_renderer_platform_BUILD.gn | 4 +-
...ty_blink_renderer_platform_fonts_font__cache.cc | 12 ++--
...rty_blink_renderer_platform_fonts_font__cache.h | 34 ++++-----
...nk_renderer_platform_fonts_font__description.cc | 10 +--
..._blink_renderer_platform_fonts_font__metrics.cc | 20 +++---
...er_platform_fonts_font__unique__name__lookup.cc | 22 +++---
...nderer_platform_fonts_skia_font__cache__skia.cc | 20 +++---
...er_platform_graphics_video__frame__submitter.cc | 6 +-
...nk_renderer_platform_scheduler_common_thread.cc | 8 +--
..._renderer_platform_wtf_container__annotations.h | 14 ++--
...arty_blink_renderer_platform_wtf_stack__util.cc | 30 ++++----
...atch-third__party_boringssl_BUILD.generated.gni | 12 +++-
.../files/patch-third__party_boringssl_BUILD.gn | 6 +-
...ty_boringssl_src_crypto_cpu__aarch64__openbsd.c | 60 ++++++++++++++++
...boringssl_src_crypto_fipsmodule_rand_internal.h | 4 +-
..._party_dawn_include_dawn_native_VulkanBackend.h | 11 +++
...h-third__party_dawn_src_dawn_common_Platform.h} | 7 +-
...arty_dawn_src_dawn_native_vulkan_BackendVk.cpp} | 4 +-
...y_dawn_src_include_dawn__native_VulkanBackend.h | 11 ---
...g_chromium_config_Chrome_openbsd_arm64_config.h | 55 ++++++++++++--
...g_chromium_config_Chrome_openbsd_x64_config.asm | 51 +++++++++++--
...peg_chromium_config_Chrome_openbsd_x64_config.h | 57 +++++++++++++--
.../files/patch-third__party_libxml_linux_config.h | 8 +--
.../files/patch-third__party_libxml_src_dict.c | 19 ++---
...etto_src_tracing_core_tracing__service__impl.cc | 4 +-
...tch-third__party_swiftshader_src_WSI_libXCB.cpp | 4 +-
...ty_swiftshader_third__party_marl_src_thread.cpp | 4 +-
...st__fonts_fontconfig_fontconfig__util__linux.cc | 27 +++++++
...d__party_vulkan-deps_vulkan-loader_src_BUILD.gn | 11 +++
...vulkan-loader_src_loader_vk__loader__platform.h | 21 ++++--
.../files/patch-third__party_webrtc_BUILD.gn | 4 +-
.../patch-third__party_webrtc_rtc__base_BUILD.gn | 4 +-
.../patch-third__party_webrtc_rtc__base_network.cc | 4 +-
...son__schema__compiler_cpp__bundle__generator.py | 10 +--
...ols_json__schema__compiler_feature__compiler.py | 4 +-
...patch-ui_base_clipboard_clipboard__constants.cc | 8 +--
.../patch-ui_base_clipboard_clipboard__constants.h | 4 +-
.../files/patch-ui_base_cursor_cursor__factory.cc | 4 +-
.../patch-ui_base_resource_resource__bundle.cc | 4 +-
.../files/patch-ui_base_ui__base__features.cc | 6 +-
www/chromium/files/patch-ui_color_color__id.h | 11 +++
.../files/patch-ui_color_native__color__mixers.cc | 17 +++++
.../files/patch-ui_compositor_compositor.cc | 4 +-
.../files/patch-ui_compositor_compositor.h | 4 +-
www/chromium/files/patch-ui_events_event.cc | 6 +-
www/chromium/files/patch-ui_gfx_BUILD.gn | 4 +-
.../files/patch-ui_gfx_font__fallback__linux.cc | 4 +-
.../files/patch-ui_gfx_gpu__memory__buffer.h | 4 +-
www/chromium/files/patch-ui_gl_gl__context.cc | 4 +-
www/chromium/files/patch-ui_gl_gl__features.cc | 8 +--
.../files/patch-ui_gl_gl__implementation.cc | 11 +++
www/chromium/files/patch-ui_gl_init_gl__factory.cc | 11 ---
.../files/patch-ui_native__theme_native__theme.h | 4 +-
..._wayland_gpu_vulkan__implementation__wayland.cc | 14 ++++
...one_platform_x11_vulkan__implementation__x11.cc | 14 ++++
...rm__window_platform__window__init__properties.h | 14 ++--
.../patch-ui_views_controls_textfield_textfield.cc | 10 +--
.../patch-ui_views_controls_textfield_textfield.h | 4 +-
.../files/patch-ui_views_linux__ui_linux__ui.cc | 11 +++
.../files/patch-ui_views_linux__ui_linux__ui.h | 20 ++++++
www/chromium/files/patch-ui_views_widget_widget.cc | 8 +--
www/chromium/files/patch-v8_BUILD.gn | 10 +--
www/chromium/files/patch-v8_src_api_api.cc | 6 +-
.../patch-v8_src_base_platform_platform-posix.cc | 10 +--
...src_wasm_baseline_ia32_liftoff-assembler-ia32.h | 24 +++----
...-weblayer_browser_browser__main__parts__impl.cc | 16 ++---
...layer_browser_content__browser__client__impl.cc | 18 ++---
...blayer_browser_content__browser__client__impl.h | 10 +--
...er_browser_system__network__context__manager.cc | 8 +--
.../files/patch-weblayer_common_weblayer__paths.cc | 12 ++--
www/chromium/pkg-plist | 3 +-
328 files changed, 2126 insertions(+), 1539 deletions(-)
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 736010d5416d..34b4f0f659c3 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,7 +1,7 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
PORTNAME= chromium
-PORTVERSION= 99.0.4844.84
+PORTVERSION= 100.0.4896.60
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:fonts
@@ -154,6 +154,7 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_VARS= GN_ARGS+=use_cups=true
CUPS_VARS_OFF= GN_ARGS+=use_cups=false
+DEBUG_BUILD_DEPENDS= esbuild:devel/esbuild
DEBUG_VARS= BUILDTYPE=Debug \
GN_ARGS+=is_debug=true \
GN_ARGS+=is_component_build=false \
@@ -203,7 +204,7 @@ TEST_ALL_TARGET= ${TEST_TARGETS}
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif
-.if ${COMPILER_VERSION} < 130 && ${PORT_OPTIONS:MLTO}
+.if ${COMPILER_VERSION} < 130
LLVM_DEFAULT= 13
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests
index aea948673823..a635e949f167 100644
--- a/www/chromium/Makefile.tests
+++ b/www/chromium/Makefile.tests
@@ -4,9 +4,13 @@ TEST_TARGETS= base_unittests \
components_unittests \
content_unittests \
crypto_unittests \
+ gl_tests \
+ gpu_unittests \
headless_unittests \
media_unittests \
mojo_unittests \
net_unittests \
printing_unittests \
- url_unittests
+ skia_unittests \
+ url_unittests \
+ wm_unittests
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index e70f0b8e14f9..a192e0735092 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1648281454
-SHA256 (chromium-99.0.4844.84.tar.xz) = 20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515
-SIZE (chromium-99.0.4844.84.tar.xz) = 1326587000
-SHA256 (chromium-99.0.4844.84-testdata.tar.xz) = 682715d5058c6289cdfcc3795ef65b7d757f3f9b4773a8ebcf22a869b6aa3940
-SIZE (chromium-99.0.4844.84-testdata.tar.xz) = 259949040
+TIMESTAMP = 1648585637
+SHA256 (chromium-100.0.4896.60.tar.xz) = 0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc
+SIZE (chromium-100.0.4896.60.tar.xz) = 1357922968
+SHA256 (chromium-100.0.4896.60-testdata.tar.xz) = d242f678bb37976baad0f246f6d5025c29c14efbf74efb2c2e4140b5f08b884c
+SIZE (chromium-100.0.4896.60-testdata.tar.xz) = 260020208
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 e6324afdb6fc..30303505c930 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2022-02-28 16:54:41 UTC
+--- BUILD.gn.orig 2022-03-25 21:59:56 UTC
+++ BUILD.gn
-@@ -52,7 +52,7 @@ declare_args() {
+@@ -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)
-@@ -454,7 +454,7 @@ group("gn_all") {
+@@ -452,7 +452,7 @@ group("gn_all") {
]
}
@@ -34,7 +34,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
-@@ -686,7 +695,7 @@ group("gn_all") {
+@@ -685,7 +694,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)" ]
}
-@@ -1137,7 +1146,7 @@ if (!is_ios) {
+@@ -1147,7 +1156,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)" ]
}
-@@ -1146,7 +1155,7 @@ if (!is_ios) {
+@@ -1156,7 +1165,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)" ]
}
-@@ -1521,7 +1530,7 @@ group("chromium_builder_perf") {
+@@ -1531,7 +1540,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
index aae659dabc3b..b3983d74627a 100644
--- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig 2022-02-07 13:39:41 UTC
+--- ash/display/mirror_window_controller.cc.orig 2022-03-25 21:59:56 UTC
+++ ash/display/mirror_window_controller.cc
-@@ -297,7 +297,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
return info.id() == iter->first;
}) == display_info_list.end()) {
CloseAndDeleteHost(iter->second, true);
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 72069cf118ab..1ae290e3f1c0 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-02-28 16:54:41 UTC
+--- base/BUILD.gn.orig 2022-03-25 21:59:56 UTC
+++ base/BUILD.gn
-@@ -993,7 +993,7 @@ mixed_component("base") {
+@@ -999,7 +999,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
-@@ -1004,6 +1004,12 @@ mixed_component("base") {
+@@ -1010,6 +1010,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@@ -22,7 +22,7 @@
}
if (is_win) {
-@@ -1462,11 +1468,23 @@ mixed_component("base") {
+@@ -1478,11 +1484,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",
-@@ -1490,7 +1508,7 @@ mixed_component("base") {
+@@ -1506,7 +1524,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -56,7 +56,7 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1550,7 +1568,7 @@ mixed_component("base") {
+@@ -1563,7 +1581,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
@@ -65,7 +65,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2222,6 +2240,42 @@ mixed_component("base") {
+@@ -2243,6 +2261,42 @@ mixed_component("base") {
}
}
@@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
-@@ -3465,7 +3519,7 @@ test("base_unittests") {
+@@ -3495,7 +3549,7 @@ test("base_unittests") {
}
}
@@ -117,7 +117,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3513,7 +3567,7 @@ test("base_unittests") {
+@@ -3543,7 +3597,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
@@ -126,7 +126,7 @@
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3525,7 +3579,7 @@ test("base_unittests") {
+@@ -3555,7 +3609,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
@@ -135,7 +135,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3689,7 +3743,7 @@ test("base_unittests") {
+@@ -3724,7 +3778,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
index 700bf383a007..483bda5e796f 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-02-28 16:54:41 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-03-25 21:59:56 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -346,8 +346,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -352,8 +352,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
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 011bdf1a8e7b..454110a15f26 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,4 +1,4 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-02-28 16:54:41 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-03-25 21:59:56 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -9,3 +9,12 @@
#define PA_HAS_LINUX_KERNEL
#endif
+@@ -179,7 +179,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.
+-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #define PA_HAS_ATFORK_HANDLER
+ #endif
+
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 138e9832363f..c7c476112b95 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-02-28 16:54:41 UTC
+--- base/allocator/partition_allocator/partition_page.h.orig 2022-03-25 21:59:56 UTC
+++ base/allocator/partition_allocator/partition_page.h
-@@ -129,7 +129,8 @@ struct __attribute__((packed)) SlotSpanMetadata {
+@@ -128,7 +128,8 @@ struct __attribute__((packed)) SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
@@ -10,7 +10,7 @@
// System page size is not a constant on Apple OSes, but is either 4 or 16kiB
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
// PartitionPageSize() is 4 times the OS page size.
-@@ -143,7 +144,9 @@ struct __attribute__((packed)) SlotSpanMetadata {
+@@ -142,7 +143,9 @@ struct __attribute__((packed)) 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.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h
index a53eb22b38b2..dbd1382fed99 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/partition_root.h.orig 2022-02-28 16:54:41 UTC
+--- base/allocator/partition_allocator/partition_root.h.orig 2022-03-25 21:59:56 UTC
+++ base/allocator/partition_allocator/partition_root.h
-@@ -1019,7 +1019,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH
+@@ -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(address));
+ PA_CHECK(IsManagedByPartitionAlloc(object_addr));
#endif
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_state__bitmap.h b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_state__bitmap.h
deleted file mode 100644
index b1d0d8621c7a..000000000000
--- a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_state__bitmap.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- base/allocator/partition_allocator/starscan/state_bitmap.h.orig 2022-02-21 11:33:24.834416000 +0100
-+++ base/allocator/partition_allocator/starscan/state_bitmap.h
-@@ -393,7 +393,7 @@ template <size_t PageSize, size_t PageAlignment, size_
- template <typename Filter,
- typename CallbackForwarder,
- typename Callback,
-- bool Clear>
-+ bool ClearBits>
- inline void
- StateBitmap<PageSize, PageAlignment, AllocationAlignment>::IterateImpl(
- size_t epoch,
-@@ -423,7 +423,7 @@ StateBitmap<PageSize, PageAlignment, AllocationAlignme
-
- callback_forwarder(callback, object_address, bits);
-
-- if (Clear) {
-+ if (ClearBits) {
- // Clear the current bits.
- AsAtomicCell(cell_index)
- .fetch_and(clear_value_mask, std::memory_order_relaxed);
diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h
deleted file mode 100644
index 5424b9804aa7..000000000000
--- a/www/chromium/files/patch-base_compiler__specific.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/compiler_specific.h.orig 2022-02-28 16:54:41 UTC
-+++ base/compiler_specific.h
-@@ -359,7 +359,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
- #endif // defined(__clang_analyzer__)
-
- // Use nomerge attribute to disable optimization of merging multiple same calls.
--#if defined(__clang__) && __has_attribute(nomerge)
-+#if defined(__clang__) && __has_attribute(nomerge) && !defined(OS_FREEBSD)
- #define NOMERGE [[clang::nomerge]]
- #else
- #define NOMERGE
diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
index 5ddbea4f56ac..f53bb3e100d4 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,6 +1,6 @@
---- base/debug/stack_trace_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/debug/stack_trace_posix.cc.orig 2022-03-25 21:59:56 UTC
+++ base/debug/stack_trace_posix.cc
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
#include <AvailabilityMacros.h>
#endif
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index a20644fcc0a1..00d7bf404371 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-02-28 16:54:41 UTC
+--- base/process/process_metrics.cc.orig 2022-03-25 21:59:56 UTC
+++ base/process/process_metrics.cc
@@ -18,7 +18,7 @@ namespace base {
namespace {
@@ -27,6 +27,15 @@
Value meminfo = memory_info_.ToValue();
Value vmstat = vmstat_info_.ToValue();
meminfo.MergeDictionary(&vmstat);
+@@ -100,7 +100,7 @@ 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();
@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
#endif
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 3e8eb45662f0..052477866871 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 2021-10-01 01:36:37 UTC
+--- base/process/process_metrics_freebsd.cc.orig 2022-03-25 21:59:56 UTC
+++ base/process/process_metrics_freebsd.cc
@@ -3,21 +3,41 @@
// found in the LICENSE file.
@@ -44,7 +44,22 @@
// static
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
-@@ -37,7 +57,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
+@@ -27,17 +47,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+
+ double ProcessMetrics::GetPlatformIndependentCPUUsage() {
+ 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);
+
++ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
++
+ if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0)
+- return 0;
++ return 0.0;
+
+- return (info.ki_pctcpu / FSCALE) * 100.0;
++ return static_cast<double>((info.ki_pctcpu * 100.0) / FSCALE);
}
TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
@@ -53,7 +68,7 @@
return TimeDelta();
}
-@@ -68,4 +88,221 @@ size_t GetSystemCommitCharge() {
+@@ -68,4 +89,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 1cc46d52fa55..97102c7e4f92 100644
--- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics_openbsd.cc.orig 2022-02-07 13:39:41 UTC
+--- base/process/process_metrics_openbsd.cc.orig 2022-03-25 21:59:56 UTC
+++ base/process/process_metrics_openbsd.cc
-@@ -4,14 +4,30 @@
+@@ -4,17 +4,36 @@
#include "base/process/process_metrics.h"
@@ -31,27 +31,40 @@
namespace base {
-@@ -25,48 +41,13 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
++ProcessMetrics::ProcessMetrics(ProcessHandle process)
++ : process_(process) {}
++
+ // static
+ std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
+ ProcessHandle process) {
+@@ -25,49 +44,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
return false;
}
-static int GetProcessCPU(pid_t pid) {
-- struct kinfo_proc info;
++double ProcessMetrics::GetPlatformIndependentCPUUsage() {
+ 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);
+
- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0)
- return -1;
--
++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
++ sizeof(struct kinfo_proc), 1 };
+
- mib[5] = (length / sizeof(struct kinfo_proc));
--
++ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
++ return 0.0;
+
- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0)
- return 0;
-
- return info.p_pctcpu;
--}
--
++ return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE);
+ }
+
-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
- TimeTicks time = TimeTicks::Now();
-
@@ -74,14 +87,23 @@
return TimeDelta();
}
- ProcessMetrics::ProcessMetrics(ProcessHandle process)
+-ProcessMetrics::ProcessMetrics(ProcessHandle process)
- : process_(process),
- last_cpu_(0) {}
-+ : process_(process) {}
-
+-
size_t GetSystemCommitCharge() {
int mib[] = { CTL_VM, VM_METER };
-@@ -85,6 +66,129 @@ size_t GetSystemCommitCharge() {
+ int pagesize;
+@@ -75,7 +69,7 @@ size_t GetSystemCommitCharge() {
+ unsigned long mem_total, mem_free, mem_inactive;
+ size_t len = sizeof(vmtotal);
+
+- if (sysctl(mib, base::size(mib), &vmtotal, &len, NULL, 0) < 0)
++ if (sysctl(mib, std::size(mib), &vmtotal, &len, NULL, 0) < 0)
+ return 0;
+
+ mem_total = vmtotal.t_vm;
+@@ -85,6 +79,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__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc
index 8a7b5721a4a7..98e1db005454 100644
--- a/www/chromium/files/patch-base_process_process__posix.cc
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/process/process_posix.cc.orig 2022-03-25 21:59:56 UTC
+++ base/process/process_posix.cc
@@ -23,10 +23,15 @@
#include "build/build_config.h"
@@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
-@@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {}
+@@ -356,7 +361,55 @@ void Process::Exited(int exit_code) const {}
int Process::GetPriority() const {
DCHECK(IsValid());
diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h
index 7afa38819627..7dbf39ebe0ba 100644
--- a/www/chromium/files/patch-base_rand__util.h
+++ b/www/chromium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig 2022-02-28 16:54:41 UTC
+--- base/rand_util.h.orig 2022-03-25 21:59:56 UTC
+++ base/rand_util.h
-@@ -77,7 +77,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -81,7 +81,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}
diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
index 1dceaec008cd..143fb26b294b 100644
--- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_freebsd.cc.orig 2021-04-14 18:40:48 UTC
+--- base/system/sys_info_freebsd.cc.orig 2022-03-25 21:59:56 UTC
+++ base/system/sys_info_freebsd.cc
-@@ -9,30 +9,95 @@
+@@ -9,30 +9,106 @@
#include <sys/sysctl.h>
#include "base/notreached.h"
@@ -9,6 +9,17 @@
namespace base {
++int SysInfo::NumberOfProcessors() {
++ int mib[] = {CTL_HW, HW_NCPU};
++ int ncpu;
++ size_t size = sizeof(ncpu);
++ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) {
++ NOTREACHED();
++ return 1;
++ }
++ return ncpu;
++}
++
int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
- int pages, page_size;
+ int pages, page_size, r = 0;
diff --git a/www/chromium/files/patch-base_system_sys__info__openbsd.cc b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
index 9da562746469..895f93683f73 100644
--- a/www/chromium/files/patch-base_system_sys__info__openbsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_openbsd.cc.orig 2022-02-07 13:39:41 UTC
+--- base/system/sys_info_openbsd.cc.orig 2022-03-25 21:59:56 UTC
+++ base/system/sys_info_openbsd.cc
@@ -12,6 +12,7 @@
@@ -8,7 +8,7 @@
namespace {
-@@ -29,9 +30,14 @@ int64_t AmountOfMemory(int pages_name) {
+@@ -29,9 +30,15 @@ int64_t AmountOfMemory(int pages_name) {
namespace base {
@@ -16,6 +16,7 @@
+int64_t aofpmem = 0;
+int64_t aofapmem = 0;
+int64_t shmmax = 0;
++char cpumodel[256];
+
// static
int SysInfo::NumberOfProcessors() {
@@ -24,7 +25,7 @@
int ncpu;
size_t size = sizeof(ncpu);
if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) {
-@@ -43,38 +49,61 @@ int SysInfo::NumberOfProcessors() {
+@@ -43,38 +50,62 @@ int SysInfo::NumberOfProcessors() {
// static
int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@@ -49,13 +50,14 @@
// static
+std::string SysInfo::CPUModelName() {
+ int mib[] = {CTL_HW, HW_MODEL};
-+ char name[256];
-+ size_t len = base::size(name);
-+ if (sysctl(mib, base::size(mib), name, &len, NULL, 0) < 0) {
-+ NOTREACHED();
-+ return std::string();
++ size_t len = base::size(cpumodel);
++
++ if (cpumodel[0] == '\0') {
++ if (sysctl(mib, base::size(mib), cpumodel, &len, NULL, 0) < 0)
++ return std::string();
+ }
-+ return name;
++
++ return std::string(cpumodel, len - 1);
+}
+
+// static
*** 9456 LINES SKIPPED ***