Date: Wed, 22 Jun 2022 08:15:38 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: d1fc8f8fc633 - 2022Q2 - www/chromium: update to 103.0.5060.53 Message-ID: <202206220815.25M8Fc2w040792@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q2 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1fc8f8fc633309af3129e993bef21ebbe73ce04 commit d1fc8f8fc633309af3129e993bef21ebbe73ce04 Author: Robert Nagy <robert@openbsd.org> AuthorDate: 2022-06-18 05:51:42 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2022-06-22 08:15:26 +0000 www/chromium: update to 103.0.5060.53 Security: https://vuxml.freebsd.org/freebsd/b2a4c5f1-f1fe-11ec-bcd2-3065ec8fd3ec.html (cherry picked from commit 80ffbf089df7cc8d4b4879e23f6816fc7e338f7f) --- www/chromium/Makefile | 4 +- www/chromium/distinfo | 14 +- www/chromium/files/patch-BUILD.gn | 10 +- www/chromium/files/patch-base_BUILD.gn | 22 +- ...tion__allocator_address__space__randomization.h | 4 +- ...tor_partition__alloc__base_rand__util__posix.cc | 13 + ...tition__allocator_partition__alloc__constants.h | 4 +- ...llocator_partition__allocator_partition__page.h | 6 +- ...locator_partition__allocator_partition__root.cc | 4 +- .../files/patch-base_files_dir__reader__linux.h | 39 + .../files/patch-base_files_dir__reader__posix.h | 20 + .../files/patch-base_files_file__util__posix.cc | 4 +- .../files/patch-base_files_file__util__unittest.cc | 6 +- www/chromium/files/patch-base_i18n_icu__util.cc | 6 +- www/chromium/files/patch-base_logging__unittest.cc | 4 +- ...-base_memory_platform__shared__memory__region.h | 6 +- www/chromium/files/patch-base_process_launch.h | 4 +- .../files/patch-base_process_launch__posix.cc | 4 +- .../files/patch-base_process_process__metrics.cc | 12 +- .../files/patch-base_process_process__metrics.h | 28 +- .../files/patch-base_process_process__unittest.cc | 4 +- .../files/patch-base_synchronization_lock__impl.h | 6 +- www/chromium/files/patch-base_system_sys__info.cc | 4 +- www/chromium/files/patch-base_system_sys__info.h | 6 +- .../files/patch-base_system_sys__info__posix.cc | 10 +- .../files/patch-base_system_sys__info__unittest.cc | 4 +- ...patch-base_threading_platform__thread__linux.cc | 22 +- ...tch-base_trace__event_malloc__dump__provider.cc | 6 +- ...atch-base_trace__event_process__memory__dump.cc | 6 +- .../files/patch-build_config_compiler_BUILD.gn | 21 +- www/chromium/files/patch-build_config_rust.gni | 4 +- .../files/patch-build_linux_unbundle_libxml.gn | 10 - www/chromium/files/patch-cc_BUILD.gn | 6 +- .../patch-chrome_app_app__management__strings.grdp | 10 +- .../files/patch-chrome_app_chrome__command__ids.h | 13 +- .../files/patch-chrome_app_chrome__main.cc | 6 +- .../patch-chrome_app_chrome__main__delegate.cc | 18 +- .../files/patch-chrome_app_chromium__strings.grd | 18 +- .../patch-chrome_app_generated__resources.grd | 8 +- .../patch-chrome_app_google__chrome__strings.grd | 18 +- .../patch-chrome_app_theme_theme__resources.grd | 8 +- .../files/patch-chrome_browser_about__flags.cc | 33 +- .../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 | 16 +- .../patch-chrome_browser_chrome__browser__main.cc | 12 +- ...-chrome_browser_chrome__browser__main__linux.cc | 24 +- ...ome_browser_chrome__content__browser__client.cc | 32 +- ...rome_browser_chrome__content__browser__client.h | 4 +- ...rome_browser_component__updater_registration.cc | 20 - ...wser_crash__upload__list_crash__upload__list.cc | 10 +- ...-chrome_browser_dev__ui__browser__resources.grd | 12 +- ...download_chrome__download__manager__delegate.cc | 12 +- ...hrome_browser_download_download__item__model.cc | 6 +- ...atch-chrome_browser_download_download__prefs.cc | 35 +- ...patch-chrome_browser_download_download__prefs.h | 4 +- .../files/patch-chrome_browser_extensions_BUILD.gn | 4 +- ..._private_enterprise__reporting__private__api.cc | 4 +- ...__private_enterprise__reporting__private__api.h | 4 +- ...extensions_api_settings__private_prefs__util.cc | 6 +- ..._browser__context__keyed__service__factories.cc | 8 +- ...e__file__system__access__permission__context.cc | 4 +- ...hrome_browser_first__run_first__run__internal.h | 12 +- .../patch-chrome_browser_flag__descriptions.cc | 21 +- .../patch-chrome_browser_flag__descriptions.h | 19 +- ...chrome__browser__main__extra__parts__metrics.cc | 6 +- ...ser_metrics_chrome__metrics__service__client.cc | 8 +- ...rics_power_process__metrics__recorder__util.cc} | 6 +- ...rome_browser_metrics_power_process__monitor.cc} | 8 +- ...hrome_browser_metrics_power_process__monitor.h} | 6 +- .../patch-chrome_browser_platform__util__linux.cc | 4 +- ...e_browser_plugins_plugins__resource__service.cc | 11 - ...onfiguration__policy__handler__list__factory.cc | 16 +- .../patch-chrome_browser_prefs_browser__prefs.cc | 17 +- ...er_printing_print__backend__service__manager.cc | 8 +- ...hrome__browser__main__extra__parts__profiles.cc | 4 +- .../patch-chrome_browser_profiles_profile__impl.cc | 6 +- ...atch-chrome_browser_profiles_profiles__state.cc | 4 +- ...atch-chrome_browser_resources_settings_route.ts | 4 +- ...browsing_download__protection_file__analyzer.cc | 4 +- ...ser_signin_primary__account__policy__manager.cc | 10 +- .../patch-chrome_browser_themes_theme__helper.cc | 20 + .../patch-chrome_browser_themes_theme__service.cc | 8 +- .../files/patch-chrome_browser_ui_browser.h | 11 + ...rome_browser_ui_browser__command__controller.cc | 37 +- .../patch-chrome_browser_ui_browser__commands.cc | 20 - .../patch-chrome_browser_ui_browser__commands.h | 11 - .../files/patch-chrome_browser_ui_chrome__pages.cc | 4 +- .../files/patch-chrome_browser_ui_chrome__pages.h | 4 +- ...h-chrome_browser_ui_signin__view__controller.cc | 4 +- ...chrome_browser_ui_startup_bad__flags__prompt.cc | 4 +- ...browser_ui_startup_startup__browser__creator.cc | 6 +- .../files/patch-chrome_browser_ui_tab__helpers.cc | 14 +- ...h-chrome_browser_ui_views_accelerator__table.cc | 39 +- ...rome_browser_ui_views_chrome__views__delegate.h | 11 +- ...wser_ui_views_chrome__views__delegate__linux.cc | 20 + ...h-chrome_browser_ui_views_first__run__dialog.cc | 10 +- ..._browser__desktop__window__tree__host__linux.cc | 4 +- ...e_browser__desktop__window__tree__host__linux.h | 11 - ...chrome_browser_ui_views_frame_browser__frame.cc | 8 +- ...-chrome_browser_ui_views_frame_browser__view.cc | 4 +- ..._ui_views_frame_system__menu__model__builder.cc | 10 +- ...chrome_browser_ui_views_hung__renderer__view.cc | 4 +- ...es_signin__view__controller__delegate__views.cc | 6 +- ..._browser_ui_views_tabs_tab__drag__controller.cc | 10 +- ...i_webui_chrome__web__ui__controller__factory.cc | 16 +- ...bui_connectors__internals_zero__trust__utils.cc | 16 +- ..._browser_ui_webui_ntp_app__launcher__handler.cc | 6 +- ...tings_settings__localized__strings__provider.cc | 8 +- ...hrome_browser_ui_window__sizer_window__sizer.cc | 4 +- ...lications_os__integration_web__app__shortcut.cc | 10 +- ...browser_web__applications_web__app__provider.cc | 4 +- ...thn_chrome__authenticator__request__delegate.cc | 4 +- .../files/patch-chrome_common_chrome__features.cc | 18 +- .../files/patch-chrome_common_chrome__features.h | 12 +- .../files/patch-chrome_common_chrome__paths.cc | 16 +- .../files/patch-chrome_common_chrome__paths.h | 4 +- .../files/patch-chrome_common_pref__names.cc | 14 +- .../files/patch-chrome_common_pref__names.h | 12 +- .../files/patch-chrome_common_url__constants.cc | 4 +- .../files/patch-chrome_common_url__constants.h | 4 +- .../patch-chrome_common_webui__url__constants.cc | 10 +- .../patch-chrome_common_webui__url__constants.h | 8 +- ...ls_public_cpp_system__signals__service__host.cc | 20 + ...als_public_cpp_system__signals__service__host.h | 20 + www/chromium/files/patch-chrome_test_BUILD.gn | 4 +- ...raction_interaction__sequence__browser__util.cc | 11 + .../files/patch-chrome_updater_app_app__install.cc | 4 +- .../files/patch-chrome_updater_configurator.cc | 4 +- ...dater_device__management_cloud__policy__util.cc | 47 - 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 | 6 +- ...ast_renderer_cast__content__renderer__client.cc | 4 +- ..._assistant_browser_autofill__assistant__impl.cc | 11 + ..._autofill__assistant_browser_client__context.cc | 11 + ...tch-components_autofill__payments__strings.grdp | 4 +- ...ill_core_common_autofill__payments__features.cc | 4 +- ...bedder__support_user__agent__utils__unittest.cc | 6 +- ...eature__engagement_public_feature__constants.cc | 8 +- ...feature__engagement_public_feature__constants.h | 12 +- ...nts_feature__engagement_public_feature__list.cc | 6 +- ...ents_feature__engagement_public_feature__list.h | 10 +- ...omponents_feed_core_v2_proto__util__unittest.cc | 4 +- .../patch-components_flags__ui_flags__state.cc | 12 +- ...rator_browser_network__session__configurator.cc | 4 +- ...ser_network__session__configurator__unittest.cc | 4 +- ...-components_os__crypt_libsecret__util__linux.cc | 4 +- .../files/patch-components_os__crypt_os__crypt.h | 49 +- ...aint__preview_browser_paint__preview__client.cc | 4 +- ...ssword__manager_core_browser_login__database.cc | 8 +- ...ger_core_browser_sync_password__sync__bridge.cc | 6 +- ...ager_core_common_password__manager__features.cc | 8 +- ...licy_core_common_cloud_cloud__policy__client.cc | 6 +- ...ponents_policy_resources_policy__templates.json | 44 +- ..._ai_sandbox_screen__ai__sandbox__hook__linux.cc | 8 +- .../patch-components_storage__monitor_BUILD.gn | 12 +- ...isplay__embedder_skia__output__surface__impl.cc | 4 +- ..._display__embedder_software__output__surface.cc | 6 +- ...e_display__embedder_software__output__surface.h | 6 +- ...atch-content_app_content__main__runner__impl.cc | 22 +- 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 +- ...wser_child__process__launcher__helper__linux.cc | 14 +- ...ent_browser_download_download__manager__impl.cc | 8 +- ...patch-content_browser_gpu_gpu__process__host.cc | 10 +- ...ontent_browser_media_media__interface__proxy.cc | 6 +- ...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 +- ...derer__host_render__widget__host__view__aura.cc | 8 +- ...h-content_browser_utility__sandbox__delegate.cc | 24 +- ...wser_web__contents_web__contents__view__aura.cc | 4 +- www/chromium/files/patch-content_gpu_gpu__main.cc | 14 +- ...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 +- .../patch-content_renderer_render__thread__impl.cc | 12 +- ...ent_renderer_renderer__blink__platform__impl.cc | 12 +- www/chromium/files/patch-content_shell_BUILD.gn | 4 +- ...nt_shell_browser_shell__browser__main__parts.cc | 33 +- www/chromium/files/patch-content_test_BUILD.gn | 6 +- .../files/patch-content_utility_services.cc | 31 +- .../files/patch-content_utility_utility__main.cc | 17 +- .../patch-content_zygote_zygote__main__linux.cc | 12 +- .../patch-device_bluetooth_cast__bluetooth.gni | 4 +- .../patch-extensions_browser_extension__prefs.cc | 4 +- ...mmand.cc => patch-extensions_common_command.cc} | 8 +- ..._buffer_service_external__vk__image__backing.cc | 4 +- ...ared__image__backing__factory__angle__vulkan.cc | 4 +- ...rvice_shared__image__backing__factory__ozone.cc | 11 + ...mmand__buffer_service_shared__image__factory.cc | 22 +- ...ommand__buffer_service_webgpu__decoder__impl.cc | 4 +- ...ffer_tests_gl__gpu__memory__buffer__unittest.cc | 11 +- .../files/patch-gpu_config_gpu__control__list.cc | 6 +- .../files/patch-gpu_ipc_service_gpu__init.cc | 16 +- ...ss_lib_browser_headless__browser__main__parts.h | 4 +- ..._browser_headless__request__context__manager.cc | 4 +- www/chromium/files/patch-ipc_ipc__channel.h | 4 +- www/chromium/files/patch-media_audio_BUILD.gn | 4 +- .../files/patch-media_audio_audio__features.cc | 4 +- .../files/patch-media_base_audio__latency.cc | 4 +- .../files/patch-media_base_media__switches.cc | 10 +- .../files/patch-media_base_media__switches.h | 6 +- .../files/patch-media_base_supported__types.cc | 6 +- ...capture_video_video__capture__device__client.cc | 4 +- ...gpu_gpu__video__encode__accelerator__factory.cc | 4 +- .../files/patch-media_gpu_vaapi_vaapi__wrapper.cc | 4 +- www/chromium/files/patch-media_media__options.gni | 8 +- ..._stable__video__decoder__types__mojom__traits.h | 4 +- .../files/patch-media_webrtc_audio__processor.cc | 4 +- .../files/patch-media_webrtc_helpers__unittests.cc | 4 +- .../files/patch-media_webrtc_webrtc__features.cc | 11 +- .../patch-mojo_public_tools_bindings_mojom.gni | 4 +- www/chromium/files/patch-net_BUILD.gn | 28 +- ....cc => patch-net_base_sockaddr__util__posix.cc} | 7 +- ...tch-net_base_sockaddr__util__posix__unittest.cc | 12 + .../files/patch-net_cert_cert__verify__proc.cc | 4 +- .../files/patch-net_cert_cert__verify__proc.h | 4 +- .../patch-net_cert_cert__verify__proc__unittest.cc | 4 +- ...net_disk__cache_simple_simple__file__tracker.cc | 4 +- .../files/patch-net_dns_host__resolver__manager.cc | 4 +- .../files/patch-net_socket_tcp__socket__posix.cc | 16 +- .../files/patch-net_socket_udp__socket__posix.cc | 8 +- .../files/patch-net_third__party_quiche_BUILD.gn | 38 +- ...verify__tool_cert__verify__comparision__tool.cc | 6 +- ..._tools_cert__verify__tool_cert__verify__tool.cc | 8 +- ..._url__request_url__request__context__builder.cc | 4 +- ...nting_mojom_printing__context__mojom__traits.cc | 6 +- ...inting_mojom_printing__context__mojom__traits.h | 4 +- .../files/patch-printing_printing__features.cc | 11 - ...h-remoting_codec_webrtc__video__encoder__vpx.cc | 4 +- ...t_it2me_it2me__native__messaging__host__main.cc | 30 +- .../patch-remoting_host_remoting__me2me__host.cc | 56 +- ...hn_remote__webauthn__caller__security__utils.cc | 29 + ...bauthn_remote__webauthn__extension__notifier.cc | 17 +- www/chromium/files/patch-sandbox_policy_BUILD.gn | 6 +- .../files/patch-sandbox_policy_sandbox__type.cc | 47 +- .../files/patch-sandbox_policy_switches.cc | 6 +- www/chromium/files/patch-sandbox_policy_switches.h | 6 +- ...ices_cert__verifier_cert__verifier__creation.cc | 44 +- ...ch-services_device_hid_hid__connection__fido.cc | 5 +- ...services_device_hid_hid__connection__freebsd.cc | 5 +- ...patch-services_device_hid_hid__service__fido.cc | 5 +- ...ch-services_device_hid_hid__service__freebsd.cc | 5 +- ...ces_device_serial_serial__io__handler__posix.cc | 4 +- www/chromium/files/patch-services_network_BUILD.gn | 4 +- ...tracing_public_cpp_perfetto_perfetto__config.cc | 4 +- ...rvices_video__capture_broadcasting__receiver.cc | 21 +- ..._party_abseil-cpp_absl_base_internal_sysinfo.cc | 4 +- .../files/patch-third__party_angle_BUILD.gn | 10 +- ...tch-third__party_angle_src_libANGLE_Display.cpp | 14 +- ...rty_angle_src_libANGLE_renderer_driver__utils.h | 4 +- ...e_src_libANGLE_renderer_vulkan_DisplayVk__api.h | 6 +- .../files/patch-third__party_angle_util_BUILD.gn | 4 +- ...blink_renderer_controller_blink__initializer.cc | 8 +- ...rer_controller_memory__usage__monitor__posix.cc | 4 +- ...blink_renderer_core_exported_web__view__impl.cc | 6 +- ...y_blink_renderer_core_frame_web__frame__test.cc | 14 +- ...erer_core_inspector_inspector__memory__agent.cc | 4 +- ...odules_webaudio_audio__worklet__thread__test.cc | 4 +- ...odules_webgl_webgl__rendering__context__base.cc | 4 +- ...rer_platform_graphics_begin__frame__provider.cc | 4 +- ...derer_platform_runtime__enabled__features.json5 | 22 +- ...arty_dawn_generator_dawn__version__generator.py | 22 - ..._party_dawn_include_dawn_native_VulkanBackend.h | 10 +- ...ch-third__party_dawn_src_dawn_common_Platform.h | 10 +- ...party_dawn_src_dawn_native_vulkan_BackendVk.cpp | 10 +- ..._chromium_config_Chrome_openbsd_ia32_config.asm | 2070 ++++++++++++++++++- ...eg_chromium_config_Chrome_openbsd_ia32_config.h | 2072 +++++++++++++++++++- ...config_Chrome_openbsd_ia32_config__components.h | 2066 ------------------- ...rd__party_ipcz_src_reference__drivers_random.cc | 20 + ...arty_pdfium_core_fxge_linux_fx__linux__impl.cpp | 4 +- ...-third__party_pdfium_fxjs_fx__date__helpers.cpp | 6 +- ...party_perfetto_src_base_test_vm__test__utils.cc | 4 +- ...-third__party_sqlite_src_amalgamation_sqlite3.c | 6 +- ...__party_swiftshader_src_Common_Configurator.cpp | 13 - ...ird__party_swiftshader_src_Common_MutexLock.hpp | 11 - ..._party_swiftshader_src_Common_SharedLibrary.hpp | 11 - ...ird__party_swiftshader_src_Main_SwiftConfig.cpp | 14 - ...party_swiftshader_src_OpenGL_libEGL_Display.cpp | 20 - ...party_swiftshader_src_OpenGL_libEGL_Surface.cpp | 11 - ..._party_swiftshader_src_OpenGL_libEGL_libEGL.cpp | 29 - ..._party_swiftshader_src_OpenGL_libEGL_libEGL.hpp | 11 - ..._swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp | 11 - ...__party_swiftshader_src_System_Configurator.cpp | 12 + .../files/patch-third__party_tflite_features.gni | 9 + .../files/patch-third__party_webrtc_BUILD.gn | 4 +- ...rd__party_webrtc_modules_audio__device_BUILD.gn | 4 +- .../patch-third__party_webrtc_rtc__base_BUILD.gn | 4 +- .../patch-third__party_webrtc_rtc__base_network.cc | 6 +- .../files/patch-third__party_zlib_BUILD.gn | 4 +- www/chromium/files/patch-tools_gn_build_gen.py | 6 +- ...ls_memory_partition__allocator_inspect__utils.h | 11 + www/chromium/files/patch-ui_aura_screen__ozone.h | 4 +- .../files/patch-ui_base_ui__base__features.cc | 6 +- www/chromium/files/patch-ui_color_color__id.h | 4 +- .../files/patch-ui_compositor_compositor.cc | 4 +- .../files/patch-ui_compositor_compositor.h | 4 +- www/chromium/files/patch-ui_display_screen.h | 8 +- .../files/patch-ui_events_event__switches.cc | 8 +- .../files/patch-ui_events_event__switches.h | 6 +- ...ch-ui_gfx_mojom_buffer__types__mojom__traits.cc | 4 +- www/chromium/files/patch-ui_gl_BUILD.gn | 6 +- .../patch-ui_gl_gl__image__glx__native__pixmap.cc | 4 +- .../patch-ui_gtk_printing_print__dialog__gtk.cc | 4 +- ...platform_headless_headless__surface__factory.cc | 4 +- ...ings_translations_app__locale__settings__bn.xtb | 8 +- ...ings_translations_app__locale__settings__ja.xtb | 8 +- ...ings_translations_app__locale__settings__ko.xtb | 8 +- ...ings_translations_app__locale__settings__ml.xtb | 8 +- ...ings_translations_app__locale__settings__th.xtb | 8 +- ...s_translations_app__locale__settings__zh-CN.xtb | 8 +- ...s_translations_app__locale__settings__zh-TW.xtb | 8 +- .../patch-ui_views_examples_widget__example.cc | 4 +- .../files/patch-ui_views_linux__ui_linux__ui.cc | 4 +- .../files/patch-ui_views_linux__ui_linux__ui.h | 6 +- ..._ui__controls__factory__desktop__aura__ozone.cc | 20 - ...ktop__aura_desktop__drag__drop__client__ozone.h | 11 + ..._widget_desktop__aura_desktop__screen__ozone.cc | 8 +- ...__aura_desktop__window__tree__host__platform.cc | 22 +- ...e__host__platform__impl__interactive__uitest.cc | 11 + .../patch-ui_views_widget_native__widget__aura.cc | 29 - www/chromium/files/patch-ui_views_widget_widget.cc | 4 +- www/chromium/files/patch-v8_BUILD.gn | 8 +- www/chromium/files/patch-v8_src_api_api.cc | 8 +- www/chromium/files/patch-v8_src_base_atomicops.h | 13 +- .../patch-v8_src_base_platform_platform-posix.cc | 6 +- ...piler_backend_ia32_instruction-selector-ia32.cc | 6 +- .../files/patch-v8_src_diagnostics_perf-jit.cc | 4 +- .../files/patch-v8_src_diagnostics_perf-jit.h | 4 +- ...-weblayer_browser_browser__main__parts__impl.cc | 4 +- ...layer_browser_content__browser__client__impl.cc | 6 +- 338 files changed, 5758 insertions(+), 3886 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index ef6a49dbe35a..c1d35882ffb0 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,7 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 102.0.5005.115 +PORTVERSION= 103.0.5060.53 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:fonts @@ -197,7 +197,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ - test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz:fonts + test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz:fonts TEST_ALL_TARGET= ${TEST_TARGETS} .include <bsd.port.options.mk> diff --git a/www/chromium/distinfo b/www/chromium/distinfo index d27ac26ad93a..05d2f47cc3dc 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1654845180 -SHA256 (chromium-102.0.5005.115.tar.xz) = 301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6 -SIZE (chromium-102.0.5005.115.tar.xz) = 1461900356 -SHA256 (chromium-102.0.5005.115-testdata.tar.xz) = f979682d8f159cdab5bc0f07ca6342e6e8f7718fedb30dac49bdd8f3f9739a4e -SIZE (chromium-102.0.5005.115-testdata.tar.xz) = 260718224 -SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 -SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650 +TIMESTAMP = 1655470095 +SHA256 (chromium-103.0.5060.53.tar.xz) = 0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101 +SIZE (chromium-103.0.5060.53.tar.xz) = 1470748636 +SHA256 (chromium-103.0.5060.53-testdata.tar.xz) = df1e4c1864c2b338553c19c58418c9c0fe4f9581e86d21ce3d2594594a3ec572 +SIZE (chromium-103.0.5060.53-testdata.tar.xz) = 260732188 +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 98eca15f4c7c..2ff3fd50744c 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2022-05-19 14:06:27 UTC +--- BUILD.gn.orig 2022-06-17 14:20:10 UTC +++ BUILD.gn @@ -54,7 +54,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//services:services_unittests", "//services/service_manager/public/cpp", -@@ -450,7 +449,7 @@ group("gn_all") { +@@ -447,7 +446,7 @@ group("gn_all") { ] } @@ -51,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1159,7 +1167,7 @@ if (!is_ios) { +@@ -1167,7 +1175,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)" ] } -@@ -1168,7 +1176,7 @@ if (!is_ios) { +@@ -1176,7 +1184,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)" ] } -@@ -1565,7 +1573,7 @@ group("chromium_builder_perf") { +@@ -1580,7 +1588,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 7f88a789793f..61aca5553be5 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-05-19 14:06:27 UTC +--- base/BUILD.gn.orig 2022-06-17 14:20:10 UTC +++ base/BUILD.gn -@@ -998,7 +998,7 @@ mixed_component("base") { +@@ -1004,7 +1004,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -1009,6 +1009,12 @@ mixed_component("base") { +@@ -1015,6 +1015,12 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,7 +22,7 @@ } if (is_win) { -@@ -1486,11 +1492,23 @@ mixed_component("base") { +@@ -1496,11 +1502,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", -@@ -1518,7 +1536,7 @@ mixed_component("base") { +@@ -1528,7 +1546,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", -@@ -1574,7 +1592,7 @@ mixed_component("base") { +@@ -1584,7 +1602,7 @@ mixed_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -65,7 +65,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2147,6 +2165,42 @@ mixed_component("base") { +@@ -2158,6 +2176,42 @@ mixed_component("base") { } } @@ -108,7 +108,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3436,7 +3490,7 @@ test("base_unittests") { +@@ -3452,7 +3506,7 @@ test("base_unittests") { } } @@ -117,7 +117,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3484,7 +3538,7 @@ test("base_unittests") { +@@ -3500,7 +3554,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", -@@ -3495,7 +3549,7 @@ test("base_unittests") { +@@ -3511,7 +3565,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -135,7 +135,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3657,7 +3711,7 @@ test("base_unittests") { +@@ -3683,7 +3737,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h index b92553d33536..f16c9802cfb4 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-05-19 14:06:27 UTC +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-06-17 14:20:10 UTC +++ base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,7 +9,7 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -121,7 +121,7 @@ AslrMask(uintptr_t bits) { +@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc new file mode 100644 index 000000000000..024aa1e97b2c --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc @@ -0,0 +1,13 @@ +--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-06-17 14:20:10 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc +@@ -88,6 +88,10 @@ void RandBytes(void* output, size_t output_length) { + return; + } + } ++#elif BUILDFLAG(IS_BSD) ++ if (getentropy(output, output_length) == 0) { ++ return; ++ } + #endif + + // If the OS-specific mechanisms didn't work, fall through to reading from 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 380fe64d6f07..9bb71dd6268f 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-05-19 14:06:27 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-06-17 14:20:10 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h -@@ -80,7 +80,7 @@ PartitionPageShift() { +@@ -84,7 +84,7 @@ PartitionPageShift() { return 18; // 256 KiB } #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ 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 294bfc737221..abf25cf132ff 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-05-19 14:06:27 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-06-17 14:20:10 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -129,13 +129,14 @@ struct __attribute__((packed)) SlotSpanMetadata { +@@ -130,13 +130,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). -@@ -149,7 +150,9 @@ struct __attribute__((packed)) SlotSpanMetadata { +@@ -150,7 +151,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 6461c1678b28..70cba6b75bf8 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-05-19 14:06:27 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2022-06-17 14:20:10 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -29,7 +29,7 @@ #include "wow64apiset.h" @@ -27,7 +27,7 @@ // 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 -@@ -648,7 +648,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions +@@ -651,7 +651,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_dir__reader__linux.h b/www/chromium/files/patch-base_files_dir__reader__linux.h new file mode 100644 index 000000000000..82ff9a17eb2e --- /dev/null +++ b/www/chromium/files/patch-base_files_dir__reader__linux.h @@ -0,0 +1,39 @@ +--- base/files/dir_reader_linux.h.orig 2022-06-18 05:49:12 UTC ++++ base/files/dir_reader_linux.h +@@ -16,10 +16,16 @@ + #include "base/logging.h" + #include "base/posix/eintr_wrapper.h" + ++#include "build/build_config.h" ++ + // See the comments in dir_reader_posix.h about this. + + namespace base { + ++#if BUILDFLAG(IS_BSD) ++#include <dirent.h> ++typedef struct dirent linux_dirent; ++#else + struct linux_dirent { + uint64_t d_ino; + int64_t d_off; +@@ -27,6 +33,7 @@ struct linux_dirent { + unsigned char d_type; + char d_name[0]; + }; ++#endif + + class DirReaderLinux { + public: +@@ -61,7 +68,11 @@ class DirReaderLinux { + if (offset_ != size_) + return true; + ++#if BUILDFLAG(IS_BSD) ++ const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_)); ++#else + const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r == -1) { diff --git a/www/chromium/files/patch-base_files_dir__reader__posix.h b/www/chromium/files/patch-base_files_dir__reader__posix.h new file mode 100644 index 000000000000..2285fb726f8e --- /dev/null +++ b/www/chromium/files/patch-base_files_dir__reader__posix.h @@ -0,0 +1,20 @@ +--- base/files/dir_reader_posix.h.orig 2022-06-17 14:20:10 UTC ++++ base/files/dir_reader_posix.h +@@ -17,7 +17,7 @@ + // seems worse than falling back to enumerating all file descriptors so we will + // probably never implement this on the Mac. + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "base/files/dir_reader_linux.h" + #else + #include "base/files/dir_reader_fallback.h" +@@ -25,7 +25,7 @@ + + namespace base { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + typedef DirReaderLinux DirReaderPosix; + #else + typedef DirReaderFallback DirReaderPosix; 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 058f7033f6a9..d0148196ba56 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-05-19 14:06:27 UTC +--- base/files/file_util_posix.cc.orig 2022-06-17 14:20:10 UTC +++ base/files/file_util_posix.cc -@@ -697,32 +697,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -696,32 +696,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). 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 7a1b5ff376fb..cbc96b4a9d6f 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-04-21 18:48:31 UTC +--- base/files/file_util_unittest.cc.orig 2022-06-17 14:20:10 UTC +++ base/files/file_util_unittest.cc -@@ -3523,7 +3523,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3522,7 +3522,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"; -@@ -4239,7 +4239,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4238,7 +4238,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 9f649aad1cf1..f9fe06225de0 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2022-05-19 14:06:27 UTC +--- base/i18n/icu_util.cc.orig 2022-06-17 14:20:10 UTC +++ base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -54,7 +54,7 @@ #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ @@ -9,7 +9,7 @@ !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -324,7 +324,7 @@ void InitializeIcuTimeZone() { +@@ -326,7 +326,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 875546922a1c..b792452342c0 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,4 +1,4 @@ ---- base/logging_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- base/logging_unittest.cc.orig 2022-06-17 14:20:10 UTC +++ base/logging_unittest.cc @@ -32,7 +32,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -552,14 +552,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -574,14 +574,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index 8bc7dfe4b8ec..852cc726f377 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region.h.orig 2022-05-19 14:06:27 UTC +--- base/memory/platform_shared_memory_region.h.orig 2022-06-17 14:20:10 UTC +++ base/memory/platform_shared_memory_region.h -@@ -14,7 +14,7 @@ +@@ -16,7 +16,7 @@ #include <stdint.h> @@ -9,7 +9,7 @@ namespace content { class SandboxIPCHandler; } -@@ -81,7 +81,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 5ad4c6605f88..2a8f08199824 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2022-05-19 14:06:27 UTC +--- base/process/launch.h.orig 2022-06-17 14:20:10 UTC +++ base/process/launch.h -@@ -199,7 +199,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index 7e4f92b48eb9..137785dd2f2b 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- base/process/launch_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/launch_posix.cc.orig 2022-06-17 14:20:10 UTC +++ base/process/launch_posix.cc -@@ -64,6 +64,9 @@ +@@ -63,6 +63,9 @@ #error "macOS should use launch_mac.cc" #endif diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 504425708f12..612be1c5ded0 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics.cc.orig 2022-05-19 14:06:27 UTC +--- base/process/process_metrics.cc.orig 2022-06-17 14:20:10 UTC +++ base/process/process_metrics.cc -@@ -18,7 +18,7 @@ namespace base { +@@ -17,7 +17,7 @@ namespace base { namespace { #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ int CalculateEventsPerSecond(uint64_t event_count, uint64_t* last_event_count, base::TimeTicks* last_calculated) { -@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -18,7 +18,7 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const { +@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { Value res(Value::Type::DICTIONARY); res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); @@ -27,7 +27,7 @@ Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); -@@ -100,7 +100,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } @@ -36,7 +36,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage() { TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); TimeTicks time = TimeTicks::Now(); -@@ -151,7 +151,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { +@@ -150,7 +150,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 c6d856e7598b..79286ab92b7d 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2022-05-19 14:06:27 UTC +--- base/process/process_metrics.h.orig 2022-06-17 14:20:10 UTC +++ base/process/process_metrics.h -@@ -36,7 +36,7 @@ +@@ -35,7 +35,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ #include <string> #include <utility> #include <vector> -@@ -52,7 +52,7 @@ class Value; +@@ -51,7 +51,7 @@ class Value; // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -18,7 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -107,7 +107,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -106,7 +106,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -154,7 +154,7 @@ class BASE_EXPORT ProcessMetrics { #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -237,7 +237,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -258,7 +258,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -63,7 +63,7 @@ CPU::CoreType GetCoreType(int core_index); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -294,7 +294,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -293,7 +293,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -72,7 +72,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 +@@ -336,7 +336,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 +81,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 { +@@ -371,7 +371,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -90,7 +90,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 { +@@ -386,7 +386,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -99,7 +99,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -423,7 +423,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -108,7 +108,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. *** 15105 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206220815.25M8Fc2w040792>