Date: Tue, 19 Oct 2021 19:45:06 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: 173f0a271042 - 2021Q4 - www/chromium: update to 94.0.4606.81 Message-ID: <202110191945.19JJj6rI042685@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=173f0a2710429616a04a51dd99a95bd51c4ec62e commit 173f0a2710429616a04a51dd99a95bd51c4ec62e Author: Matthias Wolf <freebsd@rheinwolf.de> AuthorDate: 2021-10-19 19:33:45 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2021-10-19 19:44:18 +0000 www/chromium: update to 94.0.4606.81 MFH: 2021Q4 Security: https://vuxml.freebsd.org/freebsd/a7732806-0b2a-11ec-836b-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/47b571f2-157b-11ec-ae98-704d7b472482.html Security: https://vuxml.freebsd.org/freebsd/3551e106-1b17-11ec-a8a7-704d7b472482.html Security: https://vuxml.freebsd.org/freebsd/b6c875f1-1d76-11ec-ae80-704d7b472482.html Security: https://vuxml.freebsd.org/freebsd/777edbbe-2230-11ec-8869-704d7b472482.html Security: https://vuxml.freebsd.org/freebsd/7d3d94d3-2810-11ec-9c51-3065ec8fd3ec.html (cherry picked from commit 336f302a55ad11465a4255ae250715b962639010) --- www/chromium/Makefile | 18 +-- www/chromium/distinfo | 10 +- www/chromium/files/device_info_fetcher_freebsd.cc | 2 - .../extra-patch-build_config_compiler_pgo_pgo.gni | 2 +- ...__allocator_page__allocator__internals__posix.h | 2 +- www/chromium/files/patch-BUILD.gn | 40 ++++-- www/chromium/files/patch-base_BUILD.gn | 16 +-- .../files/patch-base_allocator_allocator.gni | 11 -- ...tch-base_allocator_allocator__shim__unittest.cc | 4 +- ...tion__allocator_address__space__randomization.h | 11 ++ ...ocator_partition__allocator_partition__alloc.cc | 8 +- ...partition__allocator_partition__alloc__config.h | 4 +- ...tition__allocator_partition__alloc__unittest.cc | 6 +- ...locator_partition__allocator_partition__root.cc | 36 +++--- ...locator_partition__allocator_spinning__mutex.cc | 8 +- ...rtition__allocator_starscan_pcscan__internal.cc | 4 +- ...or_partition__allocator_starscan_stack_stack.cc | 6 +- ...base_containers_checked__iterators__unittest.cc | 11 ++ www/chromium/files/patch-base_cpu.cc | 4 +- .../files/patch-base_debug_debugger__posix.cc | 6 +- .../files/patch-base_debug_stack__trace.cc | 8 +- www/chromium/files/patch-base_debug_stack__trace.h | 11 +- .../files/patch-base_debug_stack__trace__posix.cc | 32 ++++- .../files/patch-base_files_file__path__unittest.cc | 4 +- ...tch-base_files_file__path__watcher__unittest.cc | 12 +- www/chromium/files/patch-base_files_file__util.cc | 4 +- www/chromium/files/patch-base_files_file__util.h | 10 +- .../files/patch-base_files_file__util__posix.cc | 32 +++-- .../files/patch-base_files_file__util__unittest.cc | 10 +- www/chromium/files/patch-base_linux__util.cc | 8 +- ...patch-base_message__loop_message__pump__glib.cc | 6 +- .../files/patch-base_posix_unix__domain__socket.cc | 8 +- .../files/patch-base_process_launch__posix.cc | 28 ++++- www/chromium/files/patch-base_process_memory.cc | 14 +-- .../patch-base_process_process__handle__freebsd.cc | 17 +-- ...atch-base_process_process__iterator__freebsd.cc | 26 ++-- .../files/patch-base_process_process__metrics.cc | 20 +-- .../files/patch-base_process_process__metrics.h | 26 ++-- ...patch-base_process_process__metrics__freebsd.cc | 105 +++++++++------- .../files/patch-base_process_process__unittest.cc | 8 +- .../patch-base_process_process__util__unittest.cc | 4 +- .../files/patch-base_profiler_register__context.h | 4 +- ...profiler_stack__sampling__profiler__unittest.cc | 4 +- .../patch-base_profiler_thread__delegate__posix.cc | 10 +- ...ing__heap__profiler_sampling__heap__profiler.cc | 6 +- ...e_strings_sys__string__conversions__unittest.cc | 6 +- www/chromium/files/patch-base_system_sys__info.cc | 4 +- www/chromium/files/patch-base_system_sys__info.h | 6 +- www/chromium/files/patch-base_test_BUILD.gn | 10 +- .../patch-base_test_launcher_test__launcher.cc | 8 +- www/chromium/files/patch-base_test_test__suite.cc | 10 +- .../files/patch-base_threading_platform__thread.h | 4 +- ...patch-base_threading_platform__thread__linux.cc | 42 ++++++- ...patch-base_threading_platform__thread__posix.cc | 8 +- ...ch-base_threading_platform__thread__unittest.cc | 4 +- ...e_threading_scoped__blocking__call__unittest.cc | 6 +- www/chromium/files/patch-base_time_time.cc | 4 +- .../files/patch-base_time_time__unittest.cc | 18 --- ...tch-base_trace__event_malloc__dump__provider.cc | 10 +- ...atch-base_trace__event_process__memory__dump.cc | 4 +- www/chromium/files/patch-build_config_c++_c++.gni | 11 ++ .../files/patch-build_config_compiler_BUILD.gn | 93 +++++++------- .../files/patch-build_config_compiler_compiler.gni | 4 +- .../files/patch-build_config_linux_BUILD.gn | 4 +- www/chromium/files/patch-build_config_ozone.gni | 12 +- .../files/patch-build_toolchain_gcc__toolchain.gni | 6 +- www/chromium/files/patch-cc_BUILD.gn | 6 +- ...patch-cc_layers_scrollbar__layer__impl__base.cc | 4 +- .../files/patch-cc_test_layer__tree__test.cc | 4 +- www/chromium/files/patch-chrome_BUILD.gn | 38 ++++-- www/chromium/files/patch-chrome_app_BUILD.gn | 6 +- .../files/patch-chrome_app_chrome__main.cc | 21 ++-- .../patch-chrome_app_chrome__main__delegate.cc | 52 +++++--- .../files/patch-chrome_app_chromium__strings.grd | 4 +- .../patch-chrome_app_generated__resources.grd | 18 +-- .../patch-chrome_app_google__chrome__strings.grd | 4 +- .../files/patch-chrome_app_profiles__strings.grdp | 4 +- .../files/patch-chrome_app_settings__strings.grdp | 6 +- ...chrome_app_shutdown__signal__handlers__posix.cc | 21 ---- www/chromium/files/patch-chrome_browser_BUILD.gn | 19 ++- .../files/patch-chrome_browser_about__flags.cc | 137 ++++++++++----------- ...__galleries_media__galleries__watch__apitest.cc | 4 +- ...er_apps_platform__apps_platform__app__launch.cc | 36 ++++++ ...ser_apps_platform__apps_platform__app__launch.h | 11 ++ ...browser_background_background__mode__manager.cc | 4 +- .../patch-chrome_browser_browser__resources.grd | 11 -- ...ta_chrome__browsing__data__remover__delegate.cc | 4 +- ..._browser_chrome__browser__interface__binders.cc | 22 ++-- .../patch-chrome_browser_chrome__browser__main.cc | 14 +-- ...ome_browser_chrome__content__browser__client.cc | 54 ++++---- ...rome_browser_chrome__content__browser__client.h | 4 +- ...wser_crash__upload__list_crash__upload__list.cc | 4 +- ...tity_device__oauth2__token__service__factory.cc | 4 +- ...rome_browser_devtools_devtools__eye__dropper.cc | 4 +- ...download_chrome__download__manager__delegate.cc | 10 +- ...h-chrome_browser_download_download__commands.cc | 18 +-- ...ch-chrome_browser_download_download__commands.h | 6 +- ...hrome_browser_download_download__item__model.cc | 6 +- ...atch-chrome_browser_download_download__prefs.cc | 16 +-- ...wser_download_download__shelf__context__menu.cc | 11 -- ...onnectors_device__trust_attestation__service.cc | 70 ----------- ...connectors_device__trust_attestation__service.h | 14 --- ...nectors_device__trust_device__trust__service.cc | 31 ----- ...nnectors_device__trust_device__trust__service.h | 14 --- ...evice__trust_device__trust__service__factory.cc | 14 +++ .../files/patch-chrome_browser_extensions_BUILD.gn | 6 +- ..._private_enterprise__reporting__private__api.cc | 20 +++ ...__private_enterprise__reporting__private__api.h | 20 +++ ...api_erp_chrome_desktop_report_request_helper.cc | 2 +- ...n__action_browser__action__interactive__test.cc | 4 +- ...s_api_runtime_chrome__runtime__api__delegate.cc | 4 +- ...extensions_api_settings__private_prefs__util.cc | 6 +- ...gging__private_webrtc__logging__private__api.cc | 6 +- ..._browser_extensions_external__provider__impl.cc | 6 +- ...e__file__system__access__permission__context.cc | 4 +- ...owser_first__run_first__run__internal__posix.cc | 6 +- .../patch-chrome_browser_flag__descriptions.cc | 37 ++---- .../patch-chrome_browser_flag__descriptions.h | 39 ++---- ...chrome_browser_headless_headless__mode__util.cc | 26 ++++ ...h-chrome_browser_intranet__redirect__detector.h | 6 +- ...er_media_webrtc_webrtc__event__log__uploader.cc | 6 +- ...e_browser_media_webrtc_webrtc__log__uploader.cc | 8 +- ...chrome__browser__main__extra__parts__metrics.cc | 16 ++- ...ser_metrics_chrome__metrics__service__client.cc | 19 ++- ...er_metrics_process__memory__metrics__emitter.cc | 6 +- ...rowser_net_system__network__context__manager.cc | 8 +- ..._new__tab__page_modules_drive_drive__service.cc | 11 ++ ...cations_notification__display__service__impl.cc | 16 +-- ...ns_notification__platform__bridge__delegator.cc | 6 +- ...d__manager_chrome__password__manager__client.cc | 4 +- ...d__manager_password__reuse__manager__factory.cc | 11 ++ ...r_password__manager_password__store__factory.cc | 11 -- ...atch-chrome_browser_pdf_pdf__extension__test.cc | 16 +-- ..._manager_policies_high__pmf__discard__policy.cc | 20 +++ ...rowser_performance__monitor_process__monitor.cc | 4 +- ...browser_performance__monitor_process__monitor.h | 4 +- .../patch-chrome_browser_platform__util__linux.cc | 4 +- ...wser_policy_browser__signin__policy__handler.cc | 14 +-- ...wser__cloud__management__controller__desktop.cc | 6 +- ...onfiguration__policy__handler__list__factory.cc | 41 +++--- ...y_device__management__service__configuration.cc | 4 +- .../patch-chrome_browser_prefs_browser__prefs.cc | 10 +- ...er_prefs_pref__service__incognito__allowlist.cc | 4 +- ...h-chrome_browser_printing_print__job__worker.cc | 15 +-- ...hrome__browser__main__extra__parts__profiles.cc | 4 +- .../files/patch-chrome_browser_profiles_profile.cc | 11 -- ..._browser_profiles_profile__attributes__entry.cc | 11 -- ...atch-chrome_browser_profiles_profiles__state.cc | 4 +- ...r__context__menu_render__view__context__menu.cc | 31 ++++- ...er__context__menu_render__view__context__menu.h | 20 +++ ...appearance__page_appearance__browser__proxy.ts} | 16 +-- ...settings_appearance__page_appearance__page.html | 4 +- ...s_settings_appearance__page_appearance__page.js | 33 ----- ...s_settings_appearance__page_appearance__page.ts | 51 ++++++++ ...atch-chrome_browser_resources_settings_route.js | 4 +- ...h-chrome_browser_search_drive_drive__service.cc | 11 -- ...b__to__self_receiving__ui__handler__registry.cc | 12 +- ...o__self_send__tab__to__self__client__service.cc | 13 +- .../patch-chrome_browser_service__sandbox__type.h | 10 +- ...tch-chrome_browser_sessions_session__restore.cc | 11 -- ...me_browser_shutdown__signal__handlers__posix.cc | 15 +++ .../patch-chrome_browser_signin_signin__util.cc | 4 +- ...tch-chrome_browser_sync_chrome__sync__client.cc | 6 +- ...-chrome_browser_sync_sync__service__factory.cc} | 12 +- ...me_browser_task__manager_sampling_task__group.h | 10 +- ...ome_browser_tracing_crash__service__uploader.cc | 8 +- .../files/patch-chrome_browser_ui_BUILD.gn | 21 ++-- ...rome_browser_ui_browser__command__controller.cc | 4 +- .../patch-chrome_browser_ui_browser__dialogs.h | 38 ++++-- ...patch-chrome_browser_ui_browser__view__prefs.cc | 4 +- ...h-chrome_browser_ui_signin__view__controller.cc | 11 ++ ...browser_ui_signin__view__controller__delegate.h | 11 ++ ...nin_dice__web__signin__interceptor__delegate.cc | 11 ++ ...chrome_browser_ui_startup_bad__flags__prompt.cc | 4 +- ...browser_ui_startup_startup__browser__creator.cc | 54 ++++---- ...r_ui_startup_startup__browser__creator__impl.cc | 11 -- .../files/patch-chrome_browser_ui_tab__helpers.cc | 10 +- ...ui_task__manager_task__manager__table__model.cc | 10 +- ...chrome_browser_ui_test_test__browser__dialog.cc | 4 +- ...tch-chrome_browser_ui_test_test__browser__ui.cc | 17 ++- ...atch-chrome_browser_ui_test_test__browser__ui.h | 20 +++ ...pps_chrome__native__app__window__views__aura.cc | 28 ++--- ...ui_views_bookmarks_bookmark__bar__view__test.cc | 2 +- ...s_chrome__browser__main__extra__parts__views.cc | 10 +- ...owser_ui_views_download_download__item__view.cc | 6 +- ...ser_ui_views_eye__dropper_eye__dropper__view.cc | 8 +- ..._views_eye__dropper_eye__dropper__view__aura.cc | 4 +- ..._browser__desktop__window__tree__host__linux.cc | 11 ++ ...e_browser__desktop__window__tree__host__linux.h | 11 ++ ...chrome_browser_ui_views_frame_browser__frame.cc | 14 +-- ...er__non__client__frame__view__factory__views.cc | 28 ++--- ...-chrome_browser_ui_views_frame_browser__view.cc | 4 +- ..._ui_views_frame_opaque__browser__frame__view.cc | 8 +- ...ue__browser__frame__view__platform__specific.cc | 11 -- ..._ui_views_frame_system__menu__model__builder.cc | 12 +- ...ui_views_frame_system__menu__model__delegate.cc | 8 +- ..._ui_views_profiles_profile__menu__view__base.cc | 4 +- ...es_signin__view__controller__delegate__views.cc | 20 +++ ...les_signin__view__controller__delegate__views.h | 11 ++ .../patch-chrome_browser_ui_views_tabs_tab.cc | 2 +- ..._browser_ui_views_tabs_tab__drag__controller.cc | 8 +- ...r_ui_views_tabs_tab__hover__card__controller.cc | 11 ++ .../patch-chrome_browser_ui_webui_about__ui.cc | 6 +- ...i_webui_chrome__web__ui__controller__factory.cc | 18 +-- ..._browser_ui_webui_ntp_app__launcher__handler.cc | 4 +- ...tings_settings__localized__strings__provider.cc | 24 +++- ...hrome_browser_ui_webui_settings_settings__ui.cc | 20 +++ ...ponents_web__app__file__handler__registration.h | 10 +- ...__applications_components_web__app__shortcut.cc | 4 +- ...b__applications_components_web__app__shortcut.h | 11 ++ ...er_web__applications_extension__status__utils.h | 11 ++ ...s_extensions_bookmark__app__finalizer__utils.cc | 11 -- ...ications_extensions_extension__status__utils.cc | 11 ++ ...ions_externally__managed__app__install__task.cc | 4 +- ...er_web__applications_web__app__install__task.cc | 4 +- ...browser_web__applications_web__app__provider.cc | 4 +- ...e_browser_web__applications_web__app__utils.cc} | 12 +- www/chromium/files/patch-chrome_common_BUILD.gn | 20 ++- .../files/patch-chrome_common_channel__info.h | 4 +- .../files/patch-chrome_common_chrome__features.cc | 61 +++++---- .../files/patch-chrome_common_chrome__features.h | 36 +++--- .../files/patch-chrome_common_chrome__paths.cc | 21 ++-- .../files/patch-chrome_common_chrome__switches.cc | 6 +- .../files/patch-chrome_common_chrome__switches.h | 6 +- .../patch-chrome_common_extensions_command.cc | 8 +- .../files/patch-chrome_common_features.gni | 8 +- .../files/patch-chrome_common_pref__names.cc | 35 ++++-- .../files/patch-chrome_common_pref__names.h | 26 ++-- .../patch-chrome_common_webui__url__constants.cc | 16 +-- .../patch-chrome_common_webui__url__constants.h | 14 +-- ...ome_renderer_chrome__render__frame__observer.cc | 11 ++ ...derer_pepper_pepper__flash__font__file__host.cc | 8 +- ...services_speech_audio__source__fetcher__impl.cc | 4 +- ...chrome_services_speech_soda_soda__test__paths.h | 4 +- www/chromium/files/patch-chrome_test_BUILD.gn | 24 ++-- ...-chrome_test_base_in__process__browser__test.cc | 8 +- .../patch-chrome_test_base_test__browser__window.h | 8 +- ...dater_device__management_cloud__policy__util.cc | 50 ++++++++ .../files/patch-chrome_utility_services.cc | 8 +- ...hromecast_browser_cast__browser__main__parts.cc | 20 +-- ...chromecast_browser_cast__browser__main__parts.h | 4 +- ...ecast_browser_cast__content__browser__client.cc | 10 +- ...content__browser__client__receiver__bindings.cc | 4 +- ...ast_renderer_cast__content__renderer__client.cc | 4 +- www/chromium/files/patch-components_BUILD.gn | 28 ++--- ...utofill_core_browser_personal__data__manager.cc | 6 +- ...ill_core_common_autofill__payments__features.cc | 4 +- ...mponents_autofill_core_common_autofill__util.cc | 4 +- ...components_cast__channel_cast__message__util.cc | 4 +- ...ngs_core_browser_website__settings__registry.cc | 12 +- .../files/patch-components_crash_core_app_BUILD.gn | 4 +- ..._feature__engagement_public_event__constants.cc | 18 +-- ...s_feature__engagement_public_event__constants.h | 23 +--- ...eature__engagement_public_feature__constants.cc | 29 +++-- ...feature__engagement_public_feature__constants.h | 19 ++- ...nts_feature__engagement_public_feature__list.cc | 6 +- ...ents_feature__engagement_public_feature__list.h | 20 +-- .../patch-components_feed_core_v2_proto__util.cc | 6 +- .../patch-components_flags__ui_flags__state.cc | 4 +- ...tch-components_gcm__driver_gcm__client__impl.cc | 4 +- .../files/patch-components_metrics_BUILD.gn | 4 +- .../files/patch-components_metrics_metrics__log.cc | 4 +- ...patch-components_neterror_resources_neterror.js | 4 +- ...rator_browser_network__session__configurator.cc | 4 +- ...aint__preview_browser_paint__preview__client.cc | 4 +- ...tch-components_performance__manager_features.cc | 12 +- ...icy_core_browser_policy__pref__mapping__test.cc | 10 +- ...licy_core_common_cloud_cloud__policy__client.cc | 4 +- ...policy_core_common_cloud_cloud__policy__util.cc | 24 ++-- .../patch-components_policy_core_common_schema.cc | 4 +- ...ponents_policy_resources_policy__templates.json | 20 +-- ...onents_policy_tools_generate__policy__source.py | 10 +- ...mponents_safe__browsing_core_common_features.cc | 20 +++ ...ing_core_realtime_url__lookup__service__base.cc | 11 -- ...owsing_core_resources_gen__file__type__proto.py | 19 --- ...onents_security__interstitials_content_utils.cc | 4 +- ...metric__utils_browser_startup__metric__utils.cc | 6 +- ...ents_translate_core_browser_translate__prefs.cc | 11 ++ ..._formatter_spoof__checks_idn__spoof__checker.cc | 4 +- .../files/patch-components_viz_common_features.cc | 12 +- ...tch-components_viz_host_host__display__client.h | 4 +- ...e__sinks_root__compositor__frame__sink__impl.cc | 4 +- .../files/patch-content_app_content__main.cc | 8 +- ...atch-content_app_content__main__runner__impl.cc | 18 +-- www/chromium/files/patch-content_browser_BUILD.gn | 4 +- .../patch-content_browser_browser__main__loop.cc | 8 +- ...wser_devtools_protocol_system__info__handler.cc | 16 ++- ...browser_font__access_font__enumeration__cache.h | 4 +- .../patch-content_browser_gpu_compositor__util.cc | 4 +- ...rowser_gpu_gpu__data__manager__impl__private.cc | 11 ++ ...patch-content_browser_gpu_gpu__process__host.cc | 6 +- ...rowser_renderer__host_delegated__frame__host.cc | 4 +- ...owser_renderer__host_render__message__filter.cc | 8 +- ...rowser_renderer__host_render__message__filter.h | 4 +- ...r_renderer__host_render__process__host__impl.cc | 16 +-- ...wser_renderer__host_render__view__host__impl.cc | 4 +- ...derer__host_render__widget__host__view__aura.cc | 14 +-- ...t_render__widget__host__view__event__handler.cc | 4 +- ...eduler_responsiveness_native__event__observer.h | 12 +- ...patch-content_browser_utility__process__host.cc | 6 +- ...wser_web__contents_web__contents__view__aura.cc | 8 +- ...owser_zygote__host_zygote__host__impl__linux.cc | 42 ++++++- ...rowser_zygote__host_zygote__host__impl__linux.h | 14 ++- www/chromium/files/patch-content_common_BUILD.gn | 13 +- ...ntent_common_common__sandbox__support__linux.cc | 10 -- .../files/patch-content_common_user__agent.cc | 4 +- www/chromium/files/patch-content_gpu_BUILD.gn | 8 +- .../patch-content_gpu_gpu__sandbox__hook__linux.cc | 19 ++- ...ch-content_public_app_content__main__delegate.h | 6 +- ...t_public_common_common__param__traits__macros.h | 4 +- ...atch-content_public_common_content__features.cc | 18 +-- ...patch-content_public_common_content__features.h | 14 +-- ...atch-content_public_common_content__switches.cc | 4 +- ...patch-content_public_common_content__switches.h | 4 +- ...atch-content_public_test_browser__test__base.cc | 4 +- ...h-content_public_test_content__browser__test.cc | 8 +- ...patch-content_renderer_render__process__impl.cc | 18 +-- .../patch-content_renderer_render__thread__impl.cc | 12 +- ...ent_renderer_renderer__blink__platform__impl.cc | 12 +- ...tent_renderer_renderer__blink__platform__impl.h | 6 +- www/chromium/files/patch-content_shell_BUILD.gn | 22 ++-- ...atch-content_shell_app_shell__main__delegate.cc | 10 +- ...nt_shell_browser_shell__browser__main__parts.cc | 12 +- ...=> patch-content_shell_browser_shell__paths.cc} | 16 +-- www/chromium/files/patch-content_test_BUILD.gn | 8 +- .../files/patch-content_zygote_zygote__linux.cc | 4 +- www/chromium/files/patch-device_bluetooth_BUILD.gn | 10 +- www/chromium/files/patch-device_fido_features.cc | 11 +- .../patch-device_gamepad_gamepad__provider.cc | 4 +- ...sions_browser_api_messaging_message__service.cc | 8 +- .../files/patch-extensions_common_api_runtime.json | 4 +- .../patch-extensions_common_feature__switch.cc | 16 --- ...ensions_renderer_bindings_api__binding__util.cc | 4 +- ...h-extensions_shell_app_shell__main__delegate.cc | 6 +- ...__buffer_common_gpu__memory__buffer__support.cc | 6 +- ..._buffer_service_external__vk__image__backing.cc | 14 +-- ...mmand__buffer_service_shared__image__factory.cc | 8 +- ...ommand__buffer_service_webgpu__decoder__impl.cc | 12 +- .../files/patch-gpu_config_gpu__control__list.cc | 6 +- www/chromium/files/patch-gpu_config_gpu__util.cc | 11 ++ .../files/patch-gpu_ipc_service_gpu__init.cc | 28 ++--- .../patch-gpu_ipc_service_gpu__watchdog__thread.cc | 12 +- .../files/patch-gpu_vulkan_generate__bindings.py | 8 +- .../patch-gpu_vulkan_vulkan__function__pointers.cc | 14 +-- .../patch-gpu_vulkan_vulkan__function__pointers.h | 20 +-- .../files/patch-gpu_vulkan_vulkan__image.cc | 4 +- .../files/patch-gpu_vulkan_vulkan__image.h | 10 +- www/chromium/files/patch-harfbuzz-3.0.0 | 98 --------------- www/chromium/files/patch-headless_BUILD.gn | 34 +++-- ...b_browser_headless__content__browser__client.cc | 4 +- ...ss_lib_browser_headless__web__contents__impl.cc | 4 +- ...adless_lib_headless__content__main__delegate.cc | 8 +- .../patch-headless_public_headless__browser.cc | 11 ++ www/chromium/files/patch-ipc_ipc__channel.h | 4 +- www/chromium/files/patch-ipc_ipc__channel__mojo.cc | 4 +- .../files/patch-ipc_ipc__message__utils.cc | 4 +- www/chromium/files/patch-media_BUILD.gn | 4 +- .../files/patch-media_base_media__switches.cc | 14 +-- .../files/patch-media_base_media__switches.h | 4 +- .../files/patch-media_base_video__frame.cc | 20 +-- www/chromium/files/patch-media_base_video__frame.h | 10 +- ...ideo_create__video__capture__device__factory.cc | 4 +- ...ure_video_video__capture__buffer__pool__impl.cc | 4 +- ...gpu_gpu__video__encode__accelerator__factory.cc | 4 +- www/chromium/files/patch-media_media__options.gni | 4 +- ...media_mojo_services_gpu__mojo__media__client.cc | 20 --- .../patch-media_video_fake__gpu__memory__buffer.cc | 6 +- ...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 +- ...ch-mojo_public_js_mojo__bindings__resources.grd | 4 +- www/chromium/files/patch-net_BUILD.gn | 14 +-- .../patch-net_base_address__tracker__linux.cc | 20 +-- ...h-net_base_address__tracker__linux__unittest.cc | 6 +- .../files/patch-net_cert_cert__verify__proc.cc | 4 +- .../patch-net_nqe_network__quality__estimator.cc | 11 -- ...et_nqe_network__quality__estimator__unittest.cc | 4 +- ...xy__resolution_proxy__config__service__linux.cc | 6 +- .../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 | 6 +- www/chromium/files/patch-pdf_font__table__linux.cc | 10 ++ .../files/patch-pdf_out__of__process__instance.cc | 20 +++ .../files/patch-pdf_pdfium_pdfium__engine.cc | 44 +------ .../files/patch-printing_print__settings.cc | 4 +- .../files/patch-printing_print__settings.h | 8 +- .../patch-printing_print__settings__conversion.cc | 6 +- .../files/patch-remoting_host_heartbeat__sender.cc | 4 +- .../files/patch-remoting_host_host__main.cc | 14 +-- .../files/patch-remoting_host_host__settings.cc | 4 +- ...t_it2me_it2me__native__messaging__host__main.cc | 14 +-- ...ch-remoting_host_me2me__desktop__environment.cc | 15 +-- .../files/patch-remoting_host_mojo__ipc__server.cc | 32 ----- ...atch-remoting_host_remote__open__url__client.cc | 20 +++ .../patch-remoting_host_remoting__me2me__host.cc | 23 ++-- .../patch-remoting_host_scoped__url__forwarder.cc | 19 --- .../patch-remoting_host_setup_start__host__main.cc | 8 +- www/chromium/files/patch-remoting_host_switches.cc | 8 +- www/chromium/files/patch-remoting_host_switches.h | 6 +- ...h-remoting_host_url__forwarder__configurator.cc | 19 +++ .../patch-remoting_resources_remoting__strings.grd | 12 +- ...tch-sandbox_linux_services_libc__interceptor.cc | 4 +- www/chromium/files/patch-sandbox_policy_BUILD.gn | 8 +- www/chromium/files/patch-services_audio_BUILD.gn | 4 +- ...ices_cert__verifier_cert__verifier__creation.cc | 29 +++-- ...services_device_hid_hid__connection__freebsd.cc | 9 +- ...-services_device_hid_hid__connection__freebsd.h | 7 +- ...ch-services_device_hid_hid__service__freebsd.cc | 12 +- ...tch-services_device_hid_hid__service__freebsd.h | 5 +- www/chromium/files/patch-services_network_BUILD.gn | 6 +- .../patch-services_network_network__context.cc | 8 +- .../patch-services_network_network__service.cc | 6 +- .../patch-services_network_network__service.h | 4 +- ...tracing_public_cpp_perfetto_perfetto__config.cc | 4 +- ...p_stack__sampling_tracing__sampler__profiler.cc | 4 +- ...rvices_video__capture_broadcasting__receiver.cc | 6 +- .../files/patch-third__party_angle_BUILD.gn | 21 +++- .../patch-third__party_angle_src_common_debug.h | 4 +- ...angle_src_gpu__info__util_SystemInfo__linux.cpp | 7 +- ...tch-third__party_angle_src_libANGLE_Display.cpp | 12 +- ...y_angle_src_libANGLE_renderer_driver__utils.cpp | 10 +- ...rty_angle_src_libANGLE_renderer_driver__utils.h | 4 +- ...e_src_libANGLE_renderer_vulkan_DisplayVk__api.h | 6 +- ...h-third__party_blink_public_platform_platform.h | 4 +- ...rer_bindings_scripts_bind__gen_style__format.py | 4 +- ...blink_renderer_controller_blink__initializer.cc | 6 +- ...link_renderer_core_editing_editing__behavior.cc | 4 +- ...blink_renderer_core_exported_web__view__impl.cc | 6 +- ...y_blink_renderer_core_frame_web__frame__test.cc | 8 +- ...nderer_core_html_forms_internal__popup__menu.cc | 4 +- ...arty_blink_renderer_core_layout_layout__view.cc | 8 +- ...party_blink_renderer_core_paint_paint__layer.cc | 4 +- ..._mediastream_processed__local__audio__source.cc | 4 +- ...peerconnection_webrtc__audio__renderer__test.cc | 4 +- ...odules_webgl_webgl__rendering__context__base.cc | 4 +- ...modules_webgl_webgl__webcodecs__video__frame.cc | 4 +- ...ty_blink_renderer_platform_fonts_font__cache.cc | 6 +- ...rty_blink_renderer_platform_fonts_font__cache.h | 11 +- ...nk_renderer_platform_fonts_font__description.cc | 8 +- ...er_platform_fonts_font__unique__name__lookup.cc | 6 +- ...nderer_platform_fonts_skia_font__cache__skia.cc | 8 +- ...er_platform_graphics_video__frame__submitter.cc | 8 +- ...arty_blink_renderer_platform_wtf_stack__util.cc | 4 +- ...ty_crc32c_src_src_crc32c__arm64__linux__check.h | 57 --------- .../patch-third__party_ffmpeg_libavutil_mem.c | 8 +- ..._googletest_include_gtest_internal_gtest-port.h | 6 +- ...ird__party_pdfium_core_fxge_cfx__fontmapper.cpp | 4 +- ...arty_pdfium_core_fxge_linux_fx__linux__impl.cpp | 4 +- ...d__party_perfetto_src_base_subprocess__posix.cc | 4 +- .../patch-third__party_perfetto_src_base_utils.cc | 26 ++-- ...src_trace__processor_trace__processor__shell.cc | 6 +- ...d__party_perfetto_src_traced_service_service.cc | 4 +- ...etto_src_tracing_core_tracing__service__impl.cc | 6 +- ...rty_perfetto_src_tracing_ipc_default__socket.cc | 15 ++- ...skia_src_ports_SkFontHost__FreeType__common.cpp | 50 -------- ...third__party_skia_src_ports_SkOSFile__stdio.cpp | 4 +- .../files/patch-third__party_swiftshader_BUILD.gn | 29 ----- ...10.0_configs_linux_include_llvm_Config_config.h | 37 +++--- ...ubzero_build_Linux_include_llvm_Config_config.h | 22 +++- ...h-third__party_vulkan-deps_glslang_src_BUILD.gn | 4 +- ...y_vulkan-deps_vulkan-loader_src_loader_loader.c | 8 +- ..._vulkan__memory__allocator_src_vk__mem__alloc.h | 11 -- .../files/patch-third__party_webrtc_BUILD.gn | 4 +- ...ideo__coding_codecs_h264_h264__decoder__impl.cc | 27 ++-- www/chromium/files/patch-tools_gn_build_gen.py | 12 +- .../patch-tools_gn_src_base_files_file__posix.cc | 4 +- .../files/patch-tools_gn_src_gn_exec__process.cc | 4 +- ...ls_gn_src_gn_function__write__file__unittest.cc | 6 +- www/chromium/files/patch-tools_gn_src_gn_version.h | 4 +- .../files/patch-tools_gn_src_util_sys__info.cc | 4 +- ...ols_json__schema__compiler_feature__compiler.py | 12 +- .../patch-tools_json__schema__compiler_model.py | 11 +- ...ch-tools_perf_chrome__telemetry__build_BUILD.gn | 4 +- ...op_os__exchange__data__provider__non__backed.cc | 4 +- .../patch-ui_base_resource_resource__bundle.cc | 10 +- .../patch-ui_base_test_skia__gold__pixel__diff.cc | 4 +- .../files/patch-ui_base_ui__base__features.cc | 24 +--- .../files/patch-ui_base_ui__base__features.h | 16 --- .../files/patch-ui_base_webui_web__ui__util.cc | 4 +- .../files/patch-ui_compositor_compositor.cc | 4 +- .../files/patch-ui_compositor_compositor.h | 4 +- www/chromium/files/patch-ui_gfx_BUILD.gn | 4 +- ...fx_mojom_native__handle__types__mojom__traits.h | 10 +- www/chromium/files/patch-ui_gfx_render__text.cc | 11 +- www/chromium/files/patch-ui_gfx_x_gen__xproto.py | 19 +++ .../files/patch-ui_gfx_x_generated__protos_dri3.cc | 11 ++ .../files/patch-ui_gfx_x_generated__protos_shm.cc | 11 ++ www/chromium/files/patch-ui_gl_BUILD.gn | 4 +- .../files/patch-ui_gl_generate__bindings.py | 4 +- www/chromium/files/patch-ui_gl_gl__features.cc | 8 +- .../patch-ui_gl_gl__image__glx__native__pixmap.cc | 11 ++ www/chromium/files/patch-ui_gl_init_gl__factory.cc | 11 ++ .../patch-ui_gl_test_gl__surface__test__support.cc | 20 +++ .../patch-ui_native__theme_native__theme__base.cc | 4 +- ...rm__window_platform__window__init__properties.h | 10 +- .../patch-ui_views_controls_textfield_textfield.cc | 12 +- .../files/patch-ui_views_focus_focus__manager.cc | 6 +- .../files/patch-ui_views_style_platform__style.cc | 6 +- .../patch-ui_views_test_widget__test__aura.cc | 38 ++++++ .../files/patch-ui_views_views__delegate.cc | 4 +- ...__aura_desktop__window__tree__host__platform.cc | 4 +- .../patch-ui_views_widget_native__widget__aura.cc | 6 +- www/chromium/files/patch-ui_views_widget_widget.cc | 6 +- .../patch-ui_views_window_custom__frame__view.cc | 4 +- .../patch-ui_views_window_dialog__delegate.cc | 4 +- .../patch-ui_views_window_frame__background.cc | 8 +- www/chromium/files/patch-v8_BUILD.gn | 6 +- www/chromium/files/patch-v8_include_v8config.h | 4 +- www/chromium/files/patch-v8_src_api_api.cc | 6 +- www/chromium/files/patch-v8_src_base_cpu.cc | 6 +- .../patch-v8_src_base_platform_platform-posix.cc | 6 +- www/chromium/files/patch-v8_src_d8_d8.cc | 12 +- www/chromium/files/patch-weblayer_BUILD.gn | 4 +- ...h-weblayer_app_content__main__delegate__impl.cc | 4 +- ...layer_browser_content__browser__client__impl.cc | 10 +- 516 files changed, 3292 insertions(+), 2897 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 07aeca66b690..1f9921d2e06b 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 92.0.4515.159 -PORTREVISION= 2 +PORTVERSION= 94.0.4606.81 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts @@ -14,7 +13,6 @@ COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi -BROKEN_i386= ../../base/files/file_util_posix.cc:1258:29: error: no matching function for call to 'sendfile' (ssize_t vs off_t) ONLY_FOR_ARCHS= aarch64 amd64 i386 BUILD_DEPENDS= bash:shells/bash \ @@ -72,10 +70,9 @@ USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg l CPE_VENDOR= google CPE_PRODUCT= chrome -DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h \ - third_party/vulkan_memory_allocator/src/vk_mem_alloc.h +DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h USE_GL= gbm gl -USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt +USE_GNOME= atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt INSTALLS_ICONS= yes USE_LDCONFIG= ${DATADIR} USE_PERL5= build @@ -102,7 +99,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ - fieldtrial_testing_like_official_build=true \ is_clang=true \ optimize_webui=false \ toolkit_views=true \ @@ -114,7 +110,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_gnome_keyring=false \ use_lld=true \ use_sysroot=false \ - use_system_freetype=true \ + use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ @@ -270,7 +266,11 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} + flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} + # Chromium uses an unreleased version of FFmpeg, so configure it + ${CP} -R \ + ${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/linux/ \ + ${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/freebsd do-configure: # GN generator bootstrapping and generating ninja files diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 2138bdc60c5c..1dd9e9755ba1 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1629197071 -SHA256 (chromium-92.0.4515.159.tar.xz) = d97d337d0d70e959a75f1f510f5d78d2b57b5bf24573b7ade9fff9f26a7cfd11 -SIZE (chromium-92.0.4515.159.tar.xz) = 958060524 -SHA256 (chromium-92.0.4515.159-testdata.tar.xz) = 5787a7e7a6567dcf04bc3d2c3b5ed01a8d215b6d47ef37bd1844444938f41ffa -SIZE (chromium-92.0.4515.159-testdata.tar.xz) = 256835676 +TIMESTAMP = 1633682206 +SHA256 (chromium-94.0.4606.81.tar.xz) = 7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598 +SIZE (chromium-94.0.4606.81.tar.xz) = 1039841108 +SHA256 (chromium-94.0.4606.81-testdata.tar.xz) = 6cddfe2fe7a36c79770c165d08f3ef9d778f78ed5e0c0e98b3eaa2e54884df03 +SIZE (chromium-94.0.4606.81-testdata.tar.xz) = 257006276 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/device_info_fetcher_freebsd.cc b/www/chromium/files/device_info_fetcher_freebsd.cc index 021bc035966b..dcd5af716e46 100644 --- a/www/chromium/files/device_info_fetcher_freebsd.cc +++ b/www/chromium/files/device_info_fetcher_freebsd.cc @@ -26,8 +26,6 @@ #include "base/system/sys_info.h" #include "net/base/network_interfaces.h" -using SettingValue = enterprise_signals::DeviceInfo::SettingValue; - namespace enterprise_signals { namespace { diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni index ede4422aa141..c149f4f7bb49 100644 --- a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni +++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni @@ -1,4 +1,4 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2021-08-17 00:15:54 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-10-08 06:25:34 UTC +++ build/config/compiler/pgo/pgo.gni @@ -16,7 +16,7 @@ declare_args() { # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once diff --git a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h index b9cbe4cc1c83..a416c5026ea5 100644 --- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-08-17 00:18:54 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-10-08 06:29:18 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 8528f242ee69..d283d4564188 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-07-19 18:45:04 UTC +--- BUILD.gn.orig 2021-09-24 04:25:55 UTC +++ BUILD.gn -@@ -443,7 +443,7 @@ group("gn_all") { +@@ -449,7 +449,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -488,8 +488,6 @@ group("gn_all") { +@@ -494,8 +494,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,16 @@ "//testing:empty_main", ] -@@ -544,10 +542,6 @@ group("gn_all") { +@@ -506,7 +504,7 @@ group("gn_all") { + ] + } + +- if (is_chrome_branded && is_official_build) { ++ if (is_chrome_branded && is_official_build && !is_bsd) { + # TODO(dpranke): add the linux_dump_symbols flag? + deps += [ "//chrome:linux_symbols" ] + } +@@ -550,10 +548,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +38,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -606,10 +600,6 @@ group("gn_all") { +@@ -612,10 +606,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +49,7 @@ ] if (!is_android) { -@@ -687,7 +677,7 @@ group("gn_all") { +@@ -693,7 +683,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +58,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -702,7 +692,7 @@ group("gn_all") { +@@ -708,7 +698,7 @@ group("gn_all") { } } @@ -58,7 +67,7 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -819,7 +809,6 @@ group("gn_all") { +@@ -825,7 +815,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -66,7 +75,7 @@ ] if (is_android) { deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1118,7 +1107,7 @@ if (!is_ios) { +@@ -1131,7 +1120,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -75,7 +84,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1127,7 +1116,7 @@ if (!is_ios) { +@@ -1140,7 +1129,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -84,7 +93,16 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1371,9 +1360,6 @@ group("chromium_builder_perf") { +@@ -1374,7 +1363,7 @@ group("chromium_builder_perf") { + data_deps += [ "//chrome/test:performance_browser_tests" ] + } + if (is_linux || is_chromeos_lacros) { +- if (is_official_build) { ++ if (is_official_build && !is_bsd) { + # In GN builds, this is controlled by the 'linux_dump_symbols' + # flag, which defaults to 1 for official builds. For now, + # we skip the separate flag and just key off of is_official_build. +@@ -1386,9 +1375,6 @@ 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 071f2b46a17e..97725237b20e 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 2021-07-19 18:45:05 UTC +--- base/BUILD.gn.orig 2021-09-24 04:25:55 UTC +++ base/BUILD.gn -@@ -972,7 +972,7 @@ component("base") { +@@ -935,7 +935,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -983,6 +983,11 @@ component("base") { +@@ -946,6 +946,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -21,7 +21,7 @@ } if (is_win) { -@@ -1394,7 +1399,7 @@ component("base") { +@@ -1367,7 +1372,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -30,7 +30,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1447,7 +1452,7 @@ component("base") { +@@ -1420,7 +1425,7 @@ component("base") { "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", ] } @@ -39,7 +39,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } if (is_win) { -@@ -2119,6 +2124,34 @@ component("base") { +@@ -2099,6 +2104,34 @@ component("base") { } } @@ -74,7 +74,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3339,7 +3372,7 @@ test("base_unittests") { +@@ -3292,7 +3325,7 @@ test("base_unittests") { } } @@ -83,7 +83,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3382,7 +3415,7 @@ test("base_unittests") { +@@ -3339,7 +3372,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] diff --git a/www/chromium/files/patch-base_allocator_allocator.gni b/www/chromium/files/patch-base_allocator_allocator.gni deleted file mode 100644 index a8a21f360289..000000000000 --- a/www/chromium/files/patch-base_allocator_allocator.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/allocator.gni.orig 2021-07-19 18:45:05 UTC -+++ base/allocator/allocator.gni -@@ -60,7 +60,7 @@ declare_args() { - # not, and redesign or remove the flag accordingly. We may want to assert a - # possible conflict between |use_allocator = "partition"| and - # |use_partition_alloc = true| rather than prioritizing use_partition_alloc. -- use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. -+ use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. - } - - if (!use_partition_alloc && use_allocator == "partition") { diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc index f859681f9b6b..b7a8e8f3c8a8 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { @@ -36,7 +36,7 @@ #if !defined(OS_WIN) free(posix_memalign_ptr); -@@ -614,7 +614,7 @@ static size_t GetUsableSize(void* ptr) { +@@ -615,7 +615,7 @@ static size_t GetUsableSize(void* ptr) { static size_t GetUsableSize(void* ptr) { return malloc_size(ptr); } 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 new file mode 100644 index 000000000000..c15f7b02a90a --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2021-10-07 16:50:24 UTC ++++ base/allocator/partition_allocator/address_space_randomization.h +@@ -36,7 +36,7 @@ AslrMask(uintptr_t bits) { + + #if defined(ARCH_CPU_64_BITS) + +- #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) ++ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD) + + // We shouldn't allocate system pages at all for sanitizer builds. However, + // we do, and if random hint addresses interfere with address ranges diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc index 8776e5e8e230..cd2ad5a2b820 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/partition_alloc.cc -@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me +@@ -57,7 +57,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me "maximum direct mapped allocation"); // Check that some of our zanier calculations worked out as expected. @@ -10,6 +10,6 @@ +#else static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); +#endif - static_assert(kMaxBucketed == 983040, "generic max bucketed"); + static_assert(kMaxBucketed == 917504, "generic max bucketed"); STATIC_ASSERT_OR_PA_CHECK( - MaxSystemPagesPerSlotSpan() < (1 << 8), + MaxSystemPagesPerRegularSlotSpan() <= 16, 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 76d20b689187..b65ad60524a2 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 2021-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -46,9 +46,13 @@ static_assert(sizeof(void*) != 8, ""); +@@ -61,9 +61,13 @@ static_assert(sizeof(void*) != 8, ""); #define PA_HAS_LINUX_KERNEL #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc index f9667782d087..f3baa9a491d9 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1651,7 +1651,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { +@@ -1755,7 +1755,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { // cause flake. #if !defined(OS_WIN) && \ (!defined(ARCH_CPU_64_BITS) || \ @@ -9,7 +9,7 @@ // The following four tests wrap a called function in an expect death statement // to perform their test, because they are non-hermetic. Specifically they are -@@ -1702,7 +1702,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe +@@ -1806,7 +1806,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe } #endif // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) && 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 f0e47dbc54d7..edb63a43d3f1 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,47 +1,47 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2021-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2021-09-14 01:51:47 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ #include "wow64apiset.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <pthread.h> #endif -@@ -39,7 +39,7 @@ namespace { +@@ -41,7 +41,7 @@ namespace base { - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) + namespace { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by // design. -@@ -92,7 +92,7 @@ void AfterForkInChild() { +@@ -94,7 +94,7 @@ void AfterForkInChild() { internal::ThreadCacheRegistry::Instance() .ForcePurgeAllThreadAfterForkUnsafe(); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) *** 14516 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110191945.19JJj6rI042685>