From 06a5d2111549478c2f0e505de2e21fee4186dee1 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Sat, 5 Dec 2020 12:29:57 +0000 Subject: www/chromium: Synchronize with HEAD MFH: r552588 r553068 r553141 r554786 r554895 r555115 r556709 r556720 r556921 www/chromium: drop pkg-message which was only useful for FreeBSD <= 11.2 Phabricator: D26646 www/chromium: Update to version 85.0.4183.121 Submitted by: cem, rene Obtained from: some patches from OpenBSD port www/chromium: Use SNDIO instead of ALSA for audio by default There are stuttering sound issues when using ALSA, so switch to something that works. PR: 250370 www/chromium: attempt to fix build on aarch64 PR: 246982 Reported by: Bob Prohaska Approved by: portmgr (tier-2 blanket) www/chromium: improve cpu features detection on aarch64 Approved by: portmgr (tier-2 blanket) www/chromium: Make online detection always positive Summary: navigator.onLine is currently broken in www/chromium. This change introduce a workaround that always return positive for online detection. Sponsored by: The FreeBSD Foundation Submitted by: Ka Ho Ng Differential Revision: https://reviews.freebsd.org/D26490 www/chromium: Update to version 87.0.4280.66 Submitted by: Matthias Wolf, cem, rene Obtained from: Some patches from OpenBSD port (robert@openbsd.org) Unbreak INDEX www/chromium: Update to 87.0.4280.88 https://chromereleases.googleblog.com/2020/12/stable-channel-update-for-desktop.html Changes: https://chromium.googlesource.com/chromium/src/+log/87.0.4280.67..87.0.4280.88?pretty=fuller&n=10000 Approved by: jrm Differential Revision: https://reviews.freebsd.org/D27452 --- www/chromium/Makefile | 22 +- www/chromium/distinfo | 14 +- .../extra-patch-build_config_compiler_pgo_pgo.gni | 11 + www/chromium/files/extra-patch-clang | 11 - ...__allocator_page__allocator__internals__posix.h | 6 +- www/chromium/files/patch-BUILD.gn | 43 +- ...atch-apps_app__restore__service__browsertest.cc | 6 +- ...patch-apps_ui_views_app__window__frame__view.cc | 4 +- ...patch-ash_display_mirror__window__controller.cc | 2 +- www/chromium/files/patch-base_BUILD.gn | 85 +- .../files/patch-base_allocator_allocator__shim.cc | 11 - ...llocator__shim__default__dispatch__to__glibc.cc | 2 +- ...ator_allocator__shim__override__libc__symbols.h | 2 +- ...tch-base_allocator_allocator__shim__unittest.cc | 44 +- ...__allocator_page__allocator__internals__posix.h | 8 +- ...ocator_partition__allocator_partition__alloc.cc | 12 + ...tition__allocator_partition__alloc__unittest.cc | 19 +- www/chromium/files/patch-base_base__switches.cc | 14 +- www/chromium/files/patch-base_base__switches.h | 16 +- www/chromium/files/patch-base_cpu.cc | 44 +- www/chromium/files/patch-base_cpu.h | 20 + .../files/patch-base_debug_debugger__posix.cc | 2 +- www/chromium/files/patch-base_debug_elf__reader.cc | 12 +- .../files/patch-base_debug_proc__maps__linux.cc | 6 +- .../files/patch-base_debug_stack__trace.cc | 8 +- www/chromium/files/patch-base_debug_stack__trace.h | 2 +- .../files/patch-base_debug_stack__trace__posix.cc | 6 +- .../patch-base_debug_stack__trace__unittest.cc | 10 +- .../files/patch-base_files_file__path__unittest.cc | 6 +- .../files/patch-base_files_file__path__watcher.cc | 15 - .../patch-base_files_file__path__watcher__kqueue.h | 2 +- .../patch-base_files_file__path__watcher__stub.cc | 2 +- ...tch-base_files_file__path__watcher__unittest.cc | 54 +- www/chromium/files/patch-base_files_file__util.h | 25 +- .../files/patch-base_files_file__util__posix.cc | 57 +- .../files/patch-base_files_file__util__unittest.cc | 32 +- .../files/patch-base_files_scoped__file.cc | 8 +- www/chromium/files/patch-base_i18n_icu__util.cc | 16 +- www/chromium/files/patch-base_linux__util.cc | 30 +- .../files/patch-base_location__unittest.cc | 2 +- www/chromium/files/patch-base_logging__unittest.cc | 19 +- .../files/patch-base_memory_discardable__memory.cc | 34 +- ...tch-base_memory_discardable__memory__internal.h | 10 +- ...emory_madv__free__discardable__memory__posix.cc | 8 +- ...-base_memory_platform__shared__memory__region.h | 18 +- ...mory_platform__shared__memory__region__posix.cc | 18 +- ...base_memory_shared__memory__region__unittest.cc | 2 +- ...patch-base_message__loop_message__pump__glib.cc | 28 + .../files/patch-base_native__library__posix.cc | 2 +- .../files/patch-base_native__library__unittest.cc | 4 +- .../patch-base_numerics_safe__math__shared__impl.h | 4 +- .../files/patch-base_path__service__unittest.cc | 8 +- .../files/patch-base_posix_can__lower__nice__to.cc | 2 +- .../files/patch-base_posix_unix__domain__socket.cc | 16 +- ...ch-base_posix_unix__domain__socket__unittest.cc | 2 +- .../files/patch-base_process_internal__linux.cc | 18 +- .../files/patch-base_process_internal__linux.h | 12 +- www/chromium/files/patch-base_process_kill.h | 12 +- .../files/patch-base_process_kill__posix.cc | 16 +- www/chromium/files/patch-base_process_launch.cc | 6 +- www/chromium/files/patch-base_process_launch.h | 21 +- .../files/patch-base_process_launch__posix.cc | 31 +- www/chromium/files/patch-base_process_memory.cc | 10 +- www/chromium/files/patch-base_process_memory.h | 8 +- .../files/patch-base_process_memory__unittest.cc | 66 +- .../files/patch-base_process_process__handle.cc | 8 +- .../files/patch-base_process_process__handle.h | 6 +- .../patch-base_process_process__handle__freebsd.cc | 2 +- ...atch-base_process_process__iterator__freebsd.cc | 2 +- .../files/patch-base_process_process__linux.cc | 39 +- .../files/patch-base_process_process__metrics.cc | 32 +- .../files/patch-base_process_process__metrics.h | 146 ++- ...patch-base_process_process__metrics__freebsd.cc | 11 +- .../patch-base_process_process__metrics__posix.cc | 4 +- .../files/patch-base_process_process__unittest.cc | 8 +- .../patch-base_process_process__util__unittest.cc | 10 +- .../files/patch-base_profiler_register__context.h | 10 +- ...e_profiler_sampling__profiler__thread__token.cc | 6 +- ...se_profiler_sampling__profiler__thread__token.h | 10 +- .../patch-base_profiler_stack__copier__signal.cc | 8 +- ...ofiler_stack__sampling__profiler__test__util.cc | 4 +- ...profiler_stack__sampling__profiler__unittest.cc | 4 +- .../patch-base_profiler_thread__delegate__posix.cc | 16 +- ...ing__heap__profiler_sampling__heap__profiler.cc | 12 +- .../files/patch-base_security__unittest.cc | 27 +- www/chromium/files/patch-base_stl__util.h | 47 - ...e_strings_sys__string__conversions__unittest.cc | 19 + .../files/patch-base_synchronization_lock__impl.h | 11 +- www/chromium/files/patch-base_syslog__logging.cc | 16 +- www/chromium/files/patch-base_system_sys__info.cc | 10 +- www/chromium/files/patch-base_system_sys__info.h | 12 +- .../files/patch-base_system_sys__info__freebsd.cc | 13 +- .../files/patch-base_system_sys__info__posix.cc | 4 +- .../files/patch-base_system_sys__info__unittest.cc | 46 + ...k_thread__pool_environment__config__unittest.cc | 4 +- www/chromium/files/patch-base_test_BUILD.gn | 4 +- .../patch-base_test_launcher_test__launcher.cc | 19 +- .../patch-base_test_test__file__util__posix.cc | 10 +- www/chromium/files/patch-base_test_test__suite.cc | 26 +- .../patch-base_third__party_libevent_BUILD.gn | 8 +- .../files/patch-base_threading_platform__thread.h | 12 +- ...e_threading_platform__thread__internal__posix.h | 18 + ...patch-base_threading_platform__thread__linux.cc | 8 +- ...patch-base_threading_platform__thread__posix.cc | 63 +- ...ch-base_threading_platform__thread__unittest.cc | 20 +- ...e_threading_scoped__blocking__call__unittest.cc | 11 +- ...-base_threading_thread__task__runner__handle.cc | 2 +- .../files/patch-base_time_time__unittest.cc | 18 + ...tch-base_trace__event_malloc__dump__provider.cc | 4 +- ...atch-base_trace__event_process__memory__dump.cc | 8 +- ...patch-base_trace__event_process__memory__dump.h | 2 +- ...pressure_system__memory__pressure__evaluator.cc | 20 + www/chromium/files/patch-build_config_BUILD.gn | 12 +- .../files/patch-build_config_BUILDCONFIG.gn | 16 +- .../files/patch-build_config_compiler_BUILD.gn | 54 +- .../files/patch-build_config_compiler_compiler.gni | 4 +- www/chromium/files/patch-build_config_features.gni | 8 +- .../files/patch-build_config_freetype_freetype.gni | 2 +- .../files/patch-build_config_linux_BUILD.gn | 2 +- .../files/patch-build_config_linux_pkg-config.py | 2 +- www/chromium/files/patch-build_config_sysroot.gni | 2 +- .../files/patch-build_detect__host__arch.py | 2 +- www/chromium/files/patch-build_gn__run__binary.py | 2 +- www/chromium/files/patch-build_linux_chrome.map | 2 +- .../files/patch-build_linux_libpci_BUILD.gn | 2 +- .../files/patch-build_linux_unbundle_libusb.gn | 2 +- ...atch-build_linux_unbundle_replace__gn__files.py | 2 +- .../files/patch-build_toolchain_gcc__toolchain.gni | 8 +- ...patch-build_toolchain_get__concurrent__links.py | 4 +- .../files/patch-build_toolchain_linux_BUILD.gn | 2 +- www/chromium/files/patch-cc_BUILD.gn | 8 +- ...patch-cc_layers_scrollbar__layer__impl__base.cc | 2 +- .../files/patch-cc_test_layer__tree__test.cc | 10 +- www/chromium/files/patch-cc_test_pixel__test.cc | 6 +- .../files/patch-cc_trees_frame__rate__estimator.cc | 2 +- .../files/patch-cc_trees_property__tree.cc | 4 +- www/chromium/files/patch-chrome_BUILD.gn | 13 + www/chromium/files/patch-chrome_app_BUILD.gn | 4 +- .../files/patch-chrome_app_chrome__command__ids.h | 6 +- .../files/patch-chrome_app_chrome__main.cc | 15 +- .../patch-chrome_app_chrome__main__delegate.cc | 140 +-- .../files/patch-chrome_app_chromium__strings.grd | 8 +- .../patch-chrome_app_generated__resources.grd | 8 +- .../patch-chrome_app_google__chrome__strings.grd | 8 +- .../files/patch-chrome_app_settings__strings.grdp | 8 +- ...chrome_app_shutdown__signal__handlers__posix.cc | 2 +- ...hrome_app_theme_chrome__unscaled__resources.grd | 2 +- .../patch-chrome_app_theme_theme__resources.grd | 2 +- www/chromium/files/patch-chrome_browser_BUILD.gn | 17 +- .../files/patch-chrome_browser_about__flags.cc | 221 ++-- ...h-chrome_browser_after__startup__task__utils.cc | 20 +- ...pi_music__manager__private_device__id__linux.cc | 6 +- ...ete_chrome__autocomplete__scheme__classifier.cc | 10 +- ...browser_background_background__mode__manager.cc | 8 +- ...owser_background_background__mode__optimizer.cc | 10 +- .../patch-chrome_browser_browser__resources.grd | 14 +- ..._browser_chrome__browser__interface__binders.cc | 16 +- .../patch-chrome_browser_chrome__browser__main.cc | 57 +- ...-chrome_browser_chrome__browser__main__linux.cc | 8 +- ...-chrome_browser_chrome__browser__main__posix.cc | 13 +- ...ome_browser_chrome__content__browser__client.cc | 67 +- ...rome_browser_chrome__content__browser__client.h | 12 +- ...wser_crash__upload__list_crash__upload__list.cc | 2 +- ...__upload__list_crash__upload__list__crashpad.cc | 2 +- ...custom__handlers_protocol__handler__registry.cc | 6 +- .../files/patch-chrome_browser_defaults.cc | 2 +- ...-chrome_browser_dev__ui__browser__resources.grd | 12 +- ...tity_device__oauth2__token__service__factory.cc | 10 +- ...rome_browser_devtools_devtools__eye__dropper.cc | 8 +- ...hrome_browser_diagnostics_diagnostics__writer.h | 2 +- ...download_chrome__download__manager__delegate.cc | 16 +- ...h-chrome_browser_download_download__commands.cc | 28 +- ...ch-chrome_browser_download_download__commands.h | 8 +- ...hrome_browser_download_download__item__model.cc | 18 +- ...atch-chrome_browser_download_download__prefs.cc | 56 +- ...patch-chrome_browser_download_download__prefs.h | 20 +- ...atch-chrome_browser_download_download__query.cc | 2 +- ...wser_download_download__shelf__context__menu.cc | 8 +- .../files/patch-chrome_browser_extensions_BUILD.gn | 4 +- ...owser_extensions_activity__log_activity__log.cc | 2 +- ...se__reporting__private_device__info__fetcher.cc | 12 +- ...orting__private_device__info__fetcher__linux.cc | 45 +- ...api_erp_chrome_desktop_report_request_helper.cc | 20 +- ...n__action_browser__action__interactive__test.cc | 8 +- ...writer__private_removable__storage__provider.cc | 2 +- ...ser_extensions_api_input__ime_input__ime__api.h | 11 - ...s_api_runtime_chrome__runtime__api__delegate.cc | 4 +- ...extensions_api_settings__private_prefs__util.cc | 16 +- ...gging__private_webrtc__logging__private__api.cc | 6 +- ..._browser__context__keyed__service__factories.cc | 11 +- ..._browser_extensions_external__provider__impl.cc | 12 +- ...-chrome_browser_first__run_first__run__dialog.h | 6 +- ...hrome_browser_first__run_first__run__internal.h | 12 +- ...owser_first__run_first__run__internal__posix.cc | 2 +- .../patch-chrome_browser_flag__descriptions.cc | 81 +- .../patch-chrome_browser_flag__descriptions.h | 81 +- ...h-chrome_browser_intranet__redirect__detector.h | 11 + ..._galleries_fileapi_mtp__device__map__service.cc | 2 +- ...dia__galleries_media__file__system__registry.cc | 4 +- ...er_discovery_discovery__network__list__posix.cc | 20 +- ...covery_discovery__network__list__wifi__linux.cc | 2 +- ...splay_wired__display__media__route__provider.cc | 4 +- ...er_media_webrtc_webrtc__event__log__uploader.cc | 14 +- ...e_browser_media_webrtc_webrtc__log__uploader.cc | 4 +- ...ser_media_webrtc_webrtc__logging__controller.cc | 14 +- ...wser_media_webrtc_webrtc__logging__controller.h | 14 +- .../files/patch-chrome_browser_memory__details.cc | 18 +- .../patch-chrome_browser_memory__details__linux.cc | 4 +- ...chrome__browser__main__extra__parts__metrics.cc | 6 +- ...ser_metrics_chrome__metrics__service__client.cc | 12 +- ...er_metrics_process__memory__metrics__emitter.cc | 14 +- ...e__native__file__system__permission__context.cc | 14 +- ...rowser_net_system__network__context__manager.cc | 42 +- ...cations_notification__display__service__impl.cc | 33 +- ...d__manager_chrome__password__manager__client.cc | 4 +- ...r_password__manager_password__store__factory.cc | 8 +- ...atch-chrome_browser_pdf_pdf__extension__test.cc | 16 +- ...rformance__monitor_process__metrics__history.cc | 32 +- ...erformance__monitor_process__metrics__history.h | 8 +- ...ome_browser_plugins_plugin__info__host__impl.cc | 6 +- ...e_browser_plugins_plugins__resource__service.cc | 4 +- ...wser_policy_browser__signin__policy__handler.cc | 6 +- ...wser__cloud__management__controller__desktop.cc | 23 + ...onfiguration__policy__handler__list__factory.cc | 22 +- ...y_device__management__service__configuration.cc | 20 + .../patch-chrome_browser_prefs_browser__prefs.cc | 10 +- ...er_prefs_pref__service__incognito__allowlist.cc | 11 + ...er_prefs_pref__service__incognito__whitelist.cc | 11 - ...h-chrome_browser_printing_print__job__worker.cc | 20 + ...tch-chrome_browser_process__singleton__posix.cc | 16 +- ...hrome__browser__main__extra__parts__profiles.cc | 6 +- ..._browser_profiles_profile__attributes__entry.cc | 10 +- ...r__context__menu_render__view__context__menu.cc | 26 +- ...h-chrome_browser_renderer__preferences__util.cc | 14 +- ..._appearance__page_appearance__browser__proxy.js | 2 +- ...settings_appearance__page_appearance__page.html | 2 +- ...s_settings_appearance__page_appearance__page.js | 2 +- ..._incident__reporting_incident__handler__util.cc | 2 +- ...dent__reporting_incident__reporting__service.cc | 10 +- ...rch_search__suggest_search__suggest__service.cc | 2 +- ...b__to__self_receiving__ui__handler__registry.cc | 16 +- ...o__self_send__tab__to__self__client__service.cc | 8 +- ...ser_sharing_shared__clipboard_feature__flags.cc | 8 +- ...wser_sharing_shared__clipboard_feature__flags.h | 10 +- ...rowser_sharing_sharing__device__registration.cc | 17 +- ...ser_sharing_sharing__handler__registry__impl.cc | 26 +- ...atch-chrome_browser_sharing_sharing__service.cc | 20 - ...-chrome_browser_sharing_webrtc_webrtc__flags.cc | 17 - ...h-chrome_browser_sharing_webrtc_webrtc__flags.h | 19 - .../patch-chrome_browser_signin_signin__util.cc | 8 +- ...tch-chrome_browser_sync_chrome__sync__client.cc | 18 +- ...tegration_single__client__wallet__sync__test.cc | 11 - ...e_browser_task__manager_sampling_task__group.cc | 56 +- ...me_browser_task__manager_sampling_task__group.h | 30 +- ..._task__manager_sampling_task__group__sampler.cc | 42 +- ...r_task__manager_sampling_task__group__sampler.h | 44 +- ...r_task__manager_sampling_task__manager__impl.cc | 12 +- ...browser_task__manager_task__manager__observer.h | 10 +- ...hrome_browser_themes_theme__service__factory.cc | 2 +- ...ome_browser_tracing_crash__service__uploader.cc | 4 +- .../files/patch-chrome_browser_ui_BUILD.gn | 6 +- ...rome_browser_ui_browser__command__controller.cc | 12 +- ...patch-chrome_browser_ui_browser__view__prefs.cc | 26 +- ..._exclusive__access_exclusive__access__bubble.cc | 6 +- ...ui_input__method_input__method__engine__base.cc | 11 - .../files/patch-chrome_browser_ui_sad__tab.cc | 8 +- ...chrome_browser_ui_startup_bad__flags__prompt.cc | 2 +- ...browser_ui_startup_startup__browser__creator.cc | 30 +- .../files/patch-chrome_browser_ui_tab__helpers.cc | 20 +- ...wser_ui_task__manager_task__manager__columns.cc | 10 +- ...ui_task__manager_task__manager__table__model.cc | 26 +- ...chrome_browser_ui_test_test__browser__dialog.cc | 2 +- ...tch-chrome_browser_ui_test_test__browser__ui.cc | 27 +- ...h-chrome_browser_ui_views_accelerator__table.cc | 18 +- ...ui_views_bookmarks_bookmark__bar__view__test.cc | 8 +- ...s_chrome__browser__main__extra__parts__views.cc | 14 +- ...rome_browser_ui_views_chrome__views__delegate.h | 2 +- ...owser_ui_views_download_download__item__view.cc | 25 +- ...h-chrome_browser_ui_views_first__run__dialog.cc | 9 +- ...chrome_browser_ui_views_frame_browser__frame.cc | 4 +- ...er__non__client__frame__view__factory__views.cc | 4 +- ...-chrome_browser_ui_views_frame_browser__view.cc | 13 +- ..._ui_views_frame_opaque__browser__frame__view.cc | 28 +- ...ue__browser__frame__view__platform__specific.cc | 6 +- ..._ui_views_frame_system__menu__model__builder.cc | 8 +- ...ui_views_frame_system__menu__model__delegate.cc | 2 +- ...chrome_browser_ui_views_hung__renderer__view.cc | 8 +- ...hrome_browser_ui_views_tabs_new__tab__button.cc | 16 +- .../patch-chrome_browser_ui_views_tabs_tab.cc | 8 +- ..._browser_ui_views_tabs_tab__drag__controller.cc | 12 +- ...ws_web__apps_pwa__confirmation__bubble__view.cc | 11 + .../patch-chrome_browser_ui_webui_about__ui.cc | 14 +- ...i_webui_chrome__web__ui__controller__factory.cc | 43 +- ...rowser_ui_webui_settings_appearance__handler.cc | 2 +- ...browser_ui_webui_settings_appearance__handler.h | 2 +- ...tings_settings__localized__strings__provider.cc | 4 +- ...ponents_web__app__file__handler__registration.h | 6 +- ...__applications_components_web__app__shortcut.cc | 8 +- ...s_extensions_bookmark__app__finalizer__utils.cc | 2 +- www/chromium/files/patch-chrome_common_BUILD.gn | 29 +- .../files/patch-chrome_common_channel__info.h | 2 +- .../patch-chrome_common_channel__info__posix.cc | 2 +- .../files/patch-chrome_common_chrome__features.cc | 31 +- .../files/patch-chrome_common_chrome__features.h | 27 +- .../files/patch-chrome_common_chrome__paths.cc | 80 +- .../files/patch-chrome_common_chrome__paths.h | 33 +- .../patch-chrome_common_chrome__paths__internal.h | 6 +- .../files/patch-chrome_common_chrome__switches.cc | 10 +- .../files/patch-chrome_common_chrome__switches.h | 10 +- ...h-chrome_common_extensions_api_api__sources.gni | 11 - .../patch-chrome_common_extensions_command.cc | 2 +- .../files/patch-chrome_common_features.gni | 8 +- ...ch-chrome_common_media_cdm__host__file__path.cc | 11 - .../files/patch-chrome_common_pref__names.cc | 26 +- .../files/patch-chrome_common_pref__names.h | 28 +- .../patch-chrome_common_webui__url__constants.cc | 40 +- .../patch-chrome_common_webui__url__constants.h | 25 +- ...e_renderer_chrome__content__renderer__client.cc | 8 +- ...derer_pepper_pepper__flash__font__file__host.cc | 14 +- ...nderer_pepper_pepper__flash__font__file__host.h | 10 +- ...ch-chrome_service_cloud__print_print__system.cc | 6 +- www/chromium/files/patch-chrome_test_BUILD.gn | 6 +- ...atch-chrome_test_base_chrome__test__launcher.cc | 21 +- ...-chrome_test_base_in__process__browser__test.cc | 25 +- ...hrome_test_base_interactive__ui__tests__main.cc | 17 +- .../patch-chrome_test_base_test__browser__window.h | 6 +- ...ch-chrome_test_base_testing__browser__process.h | 4 +- ...ch-chrome_test_chromedriver_chrome__launcher.cc | 4 +- ...rome_test_chromedriver_chrome_chrome__finder.cc | 16 +- ...e_test_chromedriver_key__converter__unittest.cc | 18 +- ...est_chromedriver_server_chromedriver__server.cc | 8 +- ...hromecast_browser_cast__browser__main__parts.cc | 65 +- ...ecast_browser_cast__content__browser__client.cc | 35 +- .../patch-chromecast_browser_metrics_BUILD.gn | 11 - ...chromecast_browser_tts_tts__controller__impl.cc | 14 - ...rnal__mojo_public_cpp_external__mojo__broker.cc | 12 +- ...omecast_media_base_default__monotonic__clock.cc | 14 +- ...ast_renderer_cast__content__renderer__client.cc | 8 +- www/chromium/files/patch-components_BUILD.gn | 12 +- ...t_renderer_password__form__conversion__utils.cc | 4 +- ..._autofill_core_browser_autofill__experiments.cc | 11 - ...ll_core_browser_autofill__external__delegate.cc | 8 +- ...utofill_core_browser_personal__data__manager.cc | 26 +- ...ill_core_common_autofill__payments__features.cc | 6 +- ...mponents_autofill_core_common_autofill__util.cc | 10 +- ...ngs_core_browser_website__settings__registry.cc | 4 +- ...omponents_cookie__config_cookie__store__util.cc | 20 +- ...patch-components_crash_content_browser_BUILD.gn | 10 +- .../files/patch-components_crash_core_app_BUILD.gn | 11 + .../patch-components_crash_core_common_BUILD.gn | 27 +- ...service_discardable__shared__memory__manager.cc | 10 +- ...mponents_download_internal_common_base__file.cc | 14 +- ..._feature__engagement_public_event__constants.cc | 33 +- ...s_feature__engagement_public_event__constants.h | 31 +- ...e__engagement_public_feature__configurations.cc | 20 + ...eature__engagement_public_feature__constants.cc | 24 +- ...feature__engagement_public_feature__constants.h | 22 +- ...nts_feature__engagement_public_feature__list.cc | 24 +- ...ents_feature__engagement_public_feature__list.h | 48 +- ...omponents_feed_core_proto_v2_wire_version.proto | 13 + ...h-components_feed_core_proto_wire_version.proto | 13 + .../patch-components_feed_core_v2_proto__util.cc | 24 + .../patch-components_feedback_anonymizer__tool.cc | 14 - .../patch-components_flags__ui_flags__state.cc | 6 +- .../patch-components_gcm__driver_gcm__client.h | 2 +- ...tch-components_gcm__driver_gcm__client__impl.cc | 2 +- .../files/patch-components_gwp__asan_BUILD.gn | 10 + ...ed__service_core_dependency__graph__unittest.cc | 2 +- .../files/patch-components_metrics_BUILD.gn | 4 +- ...ents_metrics_drive__metrics__provider__linux.cc | 2 +- .../files/patch-components_metrics_metrics__log.cc | 4 +- ...trics_system__memory__stats__recorder__linux.cc | 18 - ...patch-components_neterror_resources_neterror.js | 4 +- ...rator_browser_network__session__configurator.cc | 4 +- ...atch-components_new__or__sad__tab__strings.grdp | 2 +- .../files/patch-components_os__crypt_os__crypt.h | 8 +- ...tch-components_os__crypt_os__crypt__unittest.cc | 2 +- ...ponents_plugins_renderer_plugin__placeholder.cc | 2 +- ...icy_core_browser_policy__pref__mapping__test.cc | 2 +- ...policy_core_common_cloud_cloud__policy__util.cc | 59 +- .../patch-components_policy_core_common_schema.cc | 2 +- ...ponents_policy_resources_policy__templates.json | 27 +- ...onents_policy_tools_generate__policy__source.py | 2 +- ...-components_previews_core_previews__features.cc | 14 +- ...owsing_core_resources_gen__file__type__proto.py | 2 +- ...ials_content_captive__portal__blocking__page.cc | 6 +- ...onents_security__interstitials_content_utils.cc | 27 +- ...paint__preview__compositor__collection__impl.cc | 14 +- ..._paint__preview__compositor__collection__impl.h | 10 +- .../patch-components_storage__monitor_BUILD.gn | 4 +- ...torage__monitor_removable__device__constants.cc | 6 +- ...storage__monitor_removable__device__constants.h | 6 +- ...s_storage__monitor_storage__monitor__freebsd.cc | 2 +- ...ts_storage__monitor_storage__monitor__freebsd.h | 2 +- ...sync__device__info_local__device__info__util.cc | 4 +- ...evice__info_local__device__info__util__linux.cc | 2 +- ...ponents_update__client_update__query__params.cc | 2 +- ..._formatter_spoof__checks_idn__spoof__checker.cc | 8 +- ...-components_url__matcher_regex__set__matcher.cc | 2 +- ...omponents_url__matcher_url__matcher__factory.cc | 2 +- .../files/patch-components_viz_common_features.cc | 10 +- ...nents_viz_common_gpu_dawn__context__provider.cc | 8 +- ...ch-components_viz_host_host__display__client.cc | 2 +- ...tch-components_viz_host_host__display__client.h | 2 +- ...display__embedder_skia__output__device__dawn.cc | 11 - ..._display__embedder_software__output__surface.cc | 6 +- ...e_display__embedder_software__output__surface.h | 6 +- ...e__sinks_root__compositor__frame__sink__impl.cc | 6 +- ...me__sinks_root__compositor__frame__sink__impl.h | 4 +- ...ch-components_viz_test_fake__output__surface.cc | 4 +- ...tch-components_viz_test_fake__output__surface.h | 4 +- ...tch-components_viz_test_mock__display__client.h | 2 +- ...omponents_webcrypto_algorithms_test__helpers.cc | 2 +- .../files/patch-content_app_content__main.cc | 11 + ...atch-content_app_content__main__runner__impl.cc | 74 +- www/chromium/files/patch-content_browser_BUILD.gn | 22 +- .../patch-content_browser_browser__main__loop.cc | 44 +- ...wser_child__process__launcher__helper__linux.cc | 49 +- ..._compositor_viz__process__transport__factory.cc | 4 +- ...wser_devtools_protocol_system__info__handler.cc | 10 +- ...browser_font__access_font__enumeration__cache.h | 11 + .../patch-content_browser_gpu_compositor__util.cc | 16 + ...patch-content_browser_gpu_gpu__process__host.cc | 19 +- ...er_memory_swap__metrics__driver__impl__linux.cc | 2 +- ...content_browser_ppapi__plugin__process__host.cc | 10 +- ...i__plugin__process__host__receiver__bindings.cc | 10 +- ...rowser_renderer__host_delegated__frame__host.cc | 11 + ...__host_input_input__device__change__observer.cc | 20 +- ...renderer__host_pepper_pepper__file__io__host.cc | 14 +- ...owser_renderer__host_render__message__filter.cc | 16 +- ...rowser_renderer__host_render__message__filter.h | 10 +- ...r_renderer__host_render__process__host__impl.cc | 50 +- ...er_renderer__host_render__process__host__impl.h | 15 - ...wser_renderer__host_render__view__host__impl.cc | 8 +- ...derer__host_render__widget__host__view__aura.cc | 8 +- ...t_render__widget__host__view__event__handler.cc | 8 +- ...owser_scheduler_responsiveness_jank__monitor.cc | 11 - ...scheduler_responsiveness_jank__monitor__impl.cc | 11 + ...duler_responsiveness_native__event__observer.cc | 14 +- ...eduler_responsiveness_native__event__observer.h | 24 +- ...ent_browser_scheduler_responsiveness_watcher.cc | 20 - ...patch-content_browser_utility__process__host.cc | 19 +- ...r_utility__process__host__receiver__bindings.cc | 18 +- .../patch-content_browser_v8__snapshot__files.cc | 8 +- ...wser_web__contents_web__contents__view__aura.cc | 11 + ...rowser_webui_shared__resources__data__source.cc | 16 +- ...owser_zygote__host_zygote__host__impl__linux.cc | 40 + ...rowser_zygote__host_zygote__host__impl__linux.h | 13 + www/chromium/files/patch-content_child_BUILD.gn | 16 - .../files/patch-content_child_child__process.cc | 11 + www/chromium/files/patch-content_common_BUILD.gn | 16 +- ...ntent_common_common__sandbox__support__linux.cc | 2 +- ...-content_common_mojo__core__library__support.cc | 11 + .../files/patch-content_common_user__agent.cc | 4 +- www/chromium/files/patch-content_gpu_BUILD.gn | 11 +- www/chromium/files/patch-content_gpu_gpu__main.cc | 60 +- .../patch-content_gpu_gpu__sandbox__hook__linux.cc | 65 +- ...t_ppapi__plugin_ppapi__blink__platform__impl.cc | 16 +- ...nt_ppapi__plugin_ppapi__blink__platform__impl.h | 14 +- ...h-content_public_app_content__main__delegate.cc | 15 +- ...ch-content_public_app_content__main__delegate.h | 14 +- ...blic_browser_zygote__host_zygote__host__linux.h | 16 + .../files/patch-content_public_common_BUILD.gn | 11 - ...ch-content_public_common_child__process__host.h | 8 +- ...t_public_common_common__param__traits__macros.h | 12 +- ...tch-content_public_common_content__constants.cc | 12 +- ...atch-content_public_common_content__constants.h | 12 +- ...atch-content_public_common_content__features.cc | 16 +- ...atch-content_public_common_content__switches.cc | 13 +- ...patch-content_public_common_content__switches.h | 13 +- ...nt_public_common_use__zoom__for__dsf__policy.cc | 6 +- ...patch-content_public_common_zygote_features.gni | 8 + ...atch-content_public_test_browser__test__base.cc | 22 +- ...h-content_public_test_content__browser__test.cc | 8 +- ...tch-content_public_test_mock__render__thread.cc | 8 +- www/chromium/files/patch-content_renderer_BUILD.gn | 18 - ..._renderer_media_audio_audio__device__factory.cc | 11 - ...patch-content_renderer_render__process__impl.cc | 14 +- .../patch-content_renderer_render__thread__impl.cc | 33 +- ...ent_renderer_renderer__blink__platform__impl.cc | 38 +- ...tent_renderer_renderer__blink__platform__impl.h | 24 +- ...er_renderer__main__platform__delegate__linux.cc | 2 +- www/chromium/files/patch-content_shell_BUILD.gn | 49 +- ...atch-content_shell_app_shell__main__delegate.cc | 35 +- ...ontent_shell_browser_shell__browser__context.cc | 16 +- ...nt_shell_browser_shell__browser__main__parts.cc | 10 +- ...rowser_web__test_web__test__browser__context.cc | 11 - ...er_web__test_web__test__browser__main__parts.cc | 11 - ...r_web__test_web__test__browser__main__runner.cc | 11 - ...ontent_shell_renderer_web__test_test__runner.cc | 29 - www/chromium/files/patch-content_test_BUILD.gn | 42 +- .../patch-content_test_content__test__suite.cc | 2 +- www/chromium/files/patch-content_utility_BUILD.gn | 8 +- ...link__platform__with__sandbox__support__impl.cc | 16 +- ...blink__platform__with__sandbox__support__impl.h | 14 +- .../files/patch-content_zygote_zygote__linux.cc | 16 + .../patch-content_zygote_zygote__main__linux.cc | 48 + www/chromium/files/patch-device_bluetooth_BUILD.gn | 13 +- .../patch-device_gamepad_gamepad__provider.cc | 8 +- .../patch-device_gamepad_hid__writer__linux.cc | 2 +- ...i_declarative__webrequest_webrequest__action.cc | 2 +- ...sions_browser_api_messaging_message__service.cc | 29 +- ...ivate_networking__private__delegate__factory.cc | 6 +- ..._browser_api_web__request_form__data__parser.cc | 2 +- ..._browser__context__keyed__service__factories.cc | 10 +- ...tensions_common_api___permission__features.json | 12 +- .../files/patch-extensions_common_api_runtime.json | 2 +- .../patch-extensions_common_feature__switch.cc | 2 +- .../patch-extensions_common_features_feature.cc | 10 +- .../files/patch-extensions_common_image__util.cc | 2 +- .../files/patch-extensions_common_stack__frame.cc | 2 +- ...ensions_renderer_bindings_api__binding__util.cc | 2 +- www/chromium/files/patch-extensions_shell_BUILD.gn | 4 +- ...h-extensions_shell_app_shell__main__delegate.cc | 16 +- ...er_api_runtime_shell__runtime__api__delegate.cc | 2 +- ...shell_browser_shell__extensions__api__client.cc | 2 +- ..._shell_browser_shell__extensions__api__client.h | 4 +- ...h-google__apis_gcm_engine_heartbeat__manager.cc | 2 +- ...__buffer_common_gpu__memory__buffer__support.cc | 12 +- ..._command__buffer_service_external__semaphore.cc | 11 + ..._buffer_service_external__vk__image__backing.cc | 24 +- ...__buffer_service_external__vk__image__backing.h | 11 - ...vice_external__vk__image__gl__representation.cc | 11 - ...gpu_command__buffer_service_program__manager.cc | 2 +- ..._tests_gl__copy__texture__CHROMIUM__unittest.cc | 28 +- ...ch-gpu_command__buffer_tests_gl__test__utils.cc | 14 +- ...tch-gpu_command__buffer_tests_gl__test__utils.h | 6 +- ...patch-gpu_command__buffer_tests_webgpu__test.cc | 16 +- .../files/patch-gpu_config_gpu__control__list.cc | 12 +- .../files/patch-gpu_config_gpu__test__config.cc | 4 +- ...-gpu_ipc_common_gpu__memory__buffer__support.cc | 38 +- ...h-gpu_ipc_common_gpu__memory__buffer__support.h | 14 +- .../files/patch-gpu_ipc_service_gpu__init.cc | 104 +- ...gpu_ipc_service_gpu__memory__buffer__factory.cc | 10 +- .../patch-gpu_ipc_service_gpu__watchdog__thread.cc | 18 +- .../patch-gpu_ipc_service_gpu__watchdog__thread.h | 10 +- .../patch-gpu_vulkan_vulkan__function__pointers.cc | 22 +- .../patch-gpu_vulkan_vulkan__function__pointers.h | 68 +- www/chromium/files/patch-headless_BUILD.gn | 10 +- ...ss_lib_browser_headless__browser__main__parts.h | 11 + ...rowser_headless__browser__main__parts__linux.cc | 11 + ...b_browser_headless__content__browser__client.cc | 26 +- ...ib_browser_headless__content__browser__client.h | 11 - ..._browser_headless__request__context__manager.cc | 8 +- ...adless_lib_headless__content__main__delegate.cc | 24 +- ...eadless_lib_headless__content__main__delegate.h | 11 - .../files/patch-headless_lib_headless__macros.h | 10 +- www/chromium/files/patch-ipc_ipc__channel.h | 8 +- .../files/patch-ipc_ipc__channel__common.cc | 10 +- www/chromium/files/patch-ipc_ipc__channel__mojo.cc | 10 +- .../files/patch-ipc_ipc__message__utils.cc | 10 +- www/chromium/files/patch-ipc_ipc__message__utils.h | 8 +- www/chromium/files/patch-media_BUILD.gn | 4 +- www/chromium/files/patch-media_audio_BUILD.gn | 19 +- .../patch-media_audio_alsa_audio__manager__alsa.cc | 12 +- .../files/patch-media_audio_audio__features.cc | 8 +- .../patch-media_audio_audio__input__device.cc | 14 +- .../files/patch-media_audio_audio__manager.cc | 14 +- .../files/patch-media_audio_audio__manager.h | 6 +- ...h-media_audio_audio__output__proxy__unittest.cc | 11 + .../files/patch-media_base_audio__latency.cc | 8 +- .../files/patch-media_base_media__switches.cc | 12 +- .../files/patch-media_base_scopedfd__helper.h | 18 +- www/chromium/files/patch-media_base_status.cc | 4 +- .../files/patch-media_base_video__frame.cc | 59 +- www/chromium/files/patch-media_base_video__frame.h | 38 +- ...ideo_create__video__capture__device__factory.cc | 2 +- ..._video_fake__video__capture__device__factory.cc | 18 +- ..._video_file__video__capture__device__factory.cc | 18 +- ..._capture_video_linux_v4l2__capture__delegate.cc | 2 +- ...ure_video_video__capture__buffer__pool__impl.cc | 6 +- ...capture_video_video__capture__device__client.cc | 8 +- .../files/patch-media_filters_vp9__parser.h | 2 +- ...tch-media_formats_common_offset__byte__queue.cc | 4 +- ...atch-media_formats_common_offset__byte__queue.h | 2 +- .../patch-media_formats_mp2t_es__parser__adts.cc | 2 +- ...ch-media_formats_mp2t_es__parser__mpeg1audio.cc | 2 +- .../files/patch-media_gpu_buffer__validation.cc | 26 +- www/chromium/files/patch-media_media__options.gni | 2 +- ...ojo_clients_mojo__video__encode__accelerator.cc | 6 +- ...media_mojo_mojom_video__frame__mojom__traits.cc | 20 +- ...media_mojo_services_gpu__mojo__media__client.cc | 14 +- .../patch-media_video_fake__gpu__memory__buffer.cc | 48 +- ...ideo_gpu__memory__buffer__video__frame__pool.cc | 8 +- .../files/patch-mojo_public_c_system_thunks.cc | 45 +- ...ch-mojo_public_js_mojo__bindings__resources.grd | 8 +- www/chromium/files/patch-net_BUILD.gn | 29 +- .../patch-net_base_address__tracker__linux.cc | 63 +- .../files/patch-net_base_address__tracker__linux.h | 2 +- ...h-net_base_address__tracker__linux__unittest.cc | 2 +- .../patch-net_base_network__change__notifier.cc | 24 +- .../patch-net_base_network__interfaces__posix.h | 2 +- .../files/patch-net_cert_cert__verifier.cc | 2 +- .../files/patch-net_cert_cert__verify__proc.cc | 4 +- .../files/patch-net_cert_cert__verify__proc.h | 2 +- .../files/patch-net_cert_test__root__certs.h | 26 + .../patch-net_disk__cache_blockfile_disk__format.h | 2 +- .../files/patch-net_dns_address__sorter__posix.cc | 2 +- ...et_dns_dns__config__service__posix__unittest.cc | 38 +- www/chromium/files/patch-net_dns_dns__reloader.cc | 4 +- www/chromium/files/patch-net_dns_dns__util.cc | 2 +- .../files/patch-net_dns_host__resolver__proc.cc | 6 +- www/chromium/files/patch-net_features.gni | 11 - .../patch-net_http_http__auth__gssapi__posix.cc | 4 +- .../patch-net_http_http__auth__gssapi__posix.h | 2 +- .../patch-net_nqe_network__quality__estimator.cc | 10 +- ...et_nqe_network__quality__estimator__unittest.cc | 4 +- ...ution_configured__proxy__resolution__service.cc | 12 +- ...xy__resolution_proxy__config__service__linux.cc | 2 +- .../files/patch-net_socket_socket__posix.cc | 6 +- .../patch-net_socket_socks5__client__socket.cc | 2 +- .../files/patch-net_socket_tcp__socket__posix.cc | 2 +- .../files/patch-net_socket_udp__socket__posix.cc | 104 +- .../files/patch-net_socket_udp__socket__posix.h | 8 +- ...t_socket_unix__domain__client__socket__posix.cc | 6 +- ..._tools_cert__verify__tool_cert__verify__tool.cc | 10 +- ...ch-net_tools_quic_quic__http__proxy__backend.cc | 6 +- ...ffic__annotation_network__traffic__annotation.h | 6 +- .../files/patch-net_url__request_url__fetcher.cc | 2 +- .../files/patch-net_url__request_url__fetcher.h | 2 +- ...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 | 14 +- .../files/patch-pdf_pdfium_pdfium__engine.cc | 44 +- .../files/patch-ppapi_proxy_file__io__resource.cc | 2 +- .../files/patch-ppapi_proxy_flash__resource.cc | 6 +- .../files/patch-printing_cups__config__helper.py | 2 +- .../files/patch-printing_print__settings.cc | 14 + .../files/patch-printing_print__settings.h | 56 + .../patch-printing_print__settings__conversion.cc | 28 + .../files/patch-printing_printing__features.cc | 18 + .../files/patch-printing_printing__features.h | 15 + .../files/patch-remoting_base_chromoting__event.cc | 6 +- .../patch-remoting_client_display_sys__opengl.h | 6 +- .../patch-remoting_host_desktop__resizer__ozone.cc | 11 + .../patch-remoting_host_evaluate__capability.cc | 8 +- .../files/patch-remoting_host_host__attributes.cc | 6 +- .../files/patch-remoting_host_host__details.cc | 2 +- .../files/patch-remoting_host_host__main.cc | 18 +- ...t_it2me_it2me__native__messaging__host__main.cc | 27 +- ...ch-remoting_host_me2me__desktop__environment.cc | 10 +- .../patch-remoting_host_remoting__me2me__host.cc | 80 +- www/chromium/files/patch-remoting_host_switches.cc | 10 +- www/chromium/files/patch-remoting_host_switches.h | 10 +- .../patch-remoting_resources_remoting__strings.grd | 2 +- .../patch-remoting_test_it2me__standalone__host.cc | 6 +- ...-remoting_test_it2me__standalone__host__main.cc | 28 +- www/chromium/files/patch-sandbox_BUILD.gn | 11 + www/chromium/files/patch-sandbox_features.gni | 6 +- www/chromium/files/patch-sandbox_linux_BUILD.gn | 33 +- ...sandbox_linux_services_init__process__reaper.cc | 2 +- ...tch-sandbox_linux_services_libc__interceptor.cc | 2 +- www/chromium/files/patch-sandbox_policy_BUILD.gn | 11 + .../files/patch-sandbox_policy_switches.cc | 11 + www/chromium/files/patch-sandbox_policy_switches.h | 11 + www/chromium/files/patch-services_audio_BUILD.gn | 10 +- ...ices_device_geolocation_location__arbitrator.cc | 6 +- .../files/patch-services_device_hid_BUILD.gn | 8 +- ...services_device_hid_hid__connection__freebsd.cc | 2 +- ...-services_device_hid_hid__connection__freebsd.h | 2 +- .../patch-services_device_hid_hid__service.cc | 14 +- ...ch-services_device_hid_hid__service__freebsd.cc | 2 +- ...tch-services_device_hid_hid__service__freebsd.h | 2 +- .../files/patch-services_device_serial_BUILD.gn | 12 +- ...ces_device_serial_serial__device__enumerator.cc | 22 +- ...ces_device_serial_serial__io__handler__posix.cc | 14 +- ...me__zone__monitor_time__zone__monitor__linux.cc | 2 +- .../files/patch-services_device_usb_BUILD.gn | 4 +- www/chromium/files/patch-services_network_BUILD.gn | 19 +- .../patch-services_network_network__context.cc | 4 +- ...rvices_network_network__sandbox__hook__linux.cc | 10 +- .../patch-services_network_network__service.cc | 6 +- .../patch-services_network_network__service.h | 6 +- ..._cpp_cert__verifier_cert__verifier__creation.cc | 2 +- ..._instrumentation_queued__request__dispatcher.cc | 14 +- ...ublic_cpp_memory__instrumentation_os__metrics.h | 30 +- ...p_memory__instrumentation_os__metrics__linux.cc | 63 +- .../files/patch-services_service__manager_BUILD.gn | 11 + ...atch-services_service__manager_embedder_main.cc | 11 - ...__manager_embedder_set__process__title__linux.h | 20 - ...manager_public_cpp_service__executable_BUILD.gn | 21 +- ...atch-services_service__manager_sandbox_BUILD.gn | 11 - ...ice__manager_zygote_common_zygote__features.gni | 8 - ...anager_zygote_host_zygote__host__impl__linux.cc | 40 - ...manager_zygote_host_zygote__host__impl__linux.h | 13 - ...s_service__manager_zygote_zygote__host__linux.h | 16 - ...rvices_service__manager_zygote_zygote__linux.cc | 15 - ..._service__manager_zygote_zygote__main__linux.cc | 48 - .../patch-services_tracing_public_cpp_BUILD.gn | 11 - ...ices_tracing_public_cpp_perfetto_trace__time.cc | 11 +- ...p_stack__sampling_tracing__sampler__profiler.cc | 8 +- ...rvices_video__capture_broadcasting__receiver.cc | 12 +- .../patch-skia_ext_SkMemory__new__handler.cpp | 2 +- .../files/patch-third__party_angle_BUILD.gn | 32 +- ...ngle_src_gpu__info__util_SystemInfo__internal.h | 2 +- ...ngle_src_gpu__info__util_SystemInfo__libpci.cpp | 2 +- ...angle_src_gpu__info__util_SystemInfo__linux.cpp | 2 +- ...y_angle_src_gpu__info__util_SystemInfo__x11.cpp | 2 +- ...tch-third__party_angle_src_libANGLE_Display.cpp | 38 +- ...y_angle_src_libANGLE_renderer_driver__utils.cpp | 12 +- ...rty_angle_src_libANGLE_renderer_driver__utils.h | 4 +- ...e_src_libANGLE_renderer_vulkan_DisplayVk__api.h | 2 +- ..._third__party_vulkan-loader_src_loader_loader.c | 4 +- ...vulkan-loader_src_loader_vk__loader__platform.h | 2 +- ...dation-layers_src_layers_vk__loader__platform.h | 2 +- ...ic_common_privacy__budget_identifiable__token.h | 11 + .../patch-third__party_blink_renderer_BUILD.gn | 2 +- ...rer_bindings_scripts_bind__gen_style__format.py | 2 +- ...blink_renderer_controller_blink__initializer.cc | 30 +- ...rer_controller_memory__usage__monitor__posix.cc | 6 +- ...erer_controller_memory__usage__monitor__posix.h | 22 +- ...nk_renderer_core_clipboard_system__clipboard.cc | 15 + ...link_renderer_core_editing_editing__behavior.cc | 6 +- ...link_renderer_core_exported_web__frame__test.cc | 14 +- ...ore_html_canvas_canvas__async__blob__creator.cc | 10 +- ...nderer_core_html_forms_internal__popup__menu.cc | 8 +- ...erer_core_inspector_inspector__memory__agent.cc | 8 +- ...arty_blink_renderer_core_layout_layout__view.cc | 6 +- ...party_blink_renderer_core_paint_paint__layer.cc | 8 +- ..._renderer_core_scroll_scrollbar__theme__aura.cc | 4 +- ...ules_media_audio_web__audio__device__factory.cc | 11 + ..._mediastream_processed__local__audio__source.cc | 6 +- ...peerconnection_webrtc__audio__renderer__test.cc | 12 +- ...odules_webaudio_audio__worklet__thread__test.cc | 22 +- ...h-third__party_blink_renderer_platform_BUILD.gn | 4 +- ...ty_blink_renderer_platform_fonts_font__cache.cc | 10 +- ...rty_blink_renderer_platform_fonts_font__cache.h | 30 +- ...nk_renderer_platform_fonts_font__description.cc | 4 +- ..._blink_renderer_platform_fonts_font__metrics.cc | 24 +- ...er_platform_fonts_font__unique__name__lookup.cc | 10 +- ...latform_fonts_shaping_harfbuzz__shaper__test.cc | 8 +- ...nderer_platform_fonts_skia_font__cache__skia.cc | 20 +- ...tform_graphics_image__frame__generator__test.cc | 10 +- ...er_platform_graphics_video__frame__submitter.cc | 10 +- ..._renderer_platform_wtf_container__annotations.h | 20 +- ...arty_blink_renderer_platform_wtf_stack__util.cc | 4 +- ...nk_renderer_platform_wtf_threading__pthreads.cc | 10 +- .../files/patch-third__party_boringssl_BUILD.gn | 36 - ..._party_boringssl_src_crypto_cpu-aarch64-linux.c | 2 +- ...ch-third__party_boringssl_src_crypto_ex__data.c | 2 +- ...reakpad_src_common_simple__string__dictionary.h | 2 +- ...on_src_google_cacheinvalidation_include_types.h | 11 - ...ashpad_crashpad_build_crashpad__buildconfig.gni | 11 - ...-third__party_crashpad_crashpad_client_BUILD.gn | 4 +- ...hpad_crashpad_client_crashpad__client__posix.cc | 5 +- ...ty_crashpad_crashpad_util_misc_address__types.h | 20 - ..._crashpad_crashpad_util_misc_capture__context.h | 20 - ...d__party_crashpad_crashpad_util_misc_metrics.cc | 11 - ...hird__party_crashpad_crashpad_util_misc_uuid.cc | 11 - ...crashpad_crashpad_util_posix_close__multiple.cc | 61 +- ...rashpad_crashpad_util_posix_drop__privileges.cc | 11 - ...__party_crashpad_crashpad_util_posix_signals.cc | 29 +- ...ashpad_util_posix_symbolic__constants__posix.cc | 20 - ...ty_crc32c_src_src_crc32c__arm64__linux__check.h | 2 +- .../patch-third__party_ffmpeg_libavutil_mem.c | 2 +- ..._googletest_include_gtest_internal_gtest-port.h | 6 +- ...rty_googletest_src_googletest_src_gtest-port.cc | 2 +- ...d__party_googletest_src_googletest_src_gtest.cc | 4 +- .../patch-third__party_harfbuzz-ng_harfbuzz.gni | 2 +- ...tch-third__party_leveldatabase_env__chromium.cc | 4 +- .../files/patch-third__party_libXNVCtrl_NVCtrl.c | 2 +- ...st_cpp_src_phonenumbers_base_memory_singleton.h | 2 +- ...pp_src_phonenumbers_base_synchronization_lock.h | 2 +- ...ist_cpp_src_phonenumbers_base_thread__checker.h | 2 +- .../files/patch-third__party_libpng_pnglibconf.h | 2 +- .../patch-third__party_libyuv_include_libyuv_row.h | 2 +- .../patch-third__party_nasm_config_config-linux.h | 17 +- ...ore__v2_internal_offline__service__controller.h | 23 + www/chromium/files/patch-third__party_node_node.py | 4 +- ...nscreen_src_platform_impl_udp__socket__posix.cc | 29 + ...hird__party_pdfium_core_fxcrt_cfx__datetime.cpp | 8 +- ...tch-third__party_pdfium_core_fxcrt_fx__system.h | 11 - ...ird__party_pdfium_core_fxge_cfx__fontmapper.cpp | 18 + ...third__party_pdfium_core_fxge_fx__ge__linux.cpp | 39 +- ...third__party_pdfium_fxjs_cjs__publicmethods.cpp | 4 +- ...-third__party_pdfium_fxjs_fx__date__helpers.cpp | 6 +- ...ium_xfa_fgas_font_cfx__fontsourceenum__file.cpp | 14 - ..._perfetto_include_perfetto_base_build__config.h | 54 +- ..._perfetto_include_perfetto_base_thread__utils.h | 10 +- ...rd__party_perfetto_include_perfetto_base_time.h | 2 +- ..._perfetto_include_perfetto_ext_base_event__fd.h | 2 +- ...fetto_include_perfetto_ext_base_thread__utils.h | 4 +- ...ch-third__party_perfetto_src_base_subprocess.cc | 6 +- ...party_perfetto_src_base_thread__task__runner.cc | 2 +- ...-third__party_perfetto_src_base_unix__socket.cc | 8 +- ...etto_src_tracing_core_tracing__service__impl.cc | 12 +- ...uf_src_google_protobuf_stubs_platform__macros.h | 2 +- .../patch-third__party_skia_src_core_SkCpu.cpp | 37 +- ...-third__party_skia_src_gpu_GrAutoLocaleSetter.h | 2 +- ...-third__party_skia_src_images_SkJpegEncoder.cpp | 2 +- ...third__party_skia_src_ports_SkOSFile__stdio.cpp | 2 +- .../patch-third__party_skia_src_sksl_SkSLString.h | 2 +- .../files/patch-third__party_sqlite_BUILD.gn | 6 +- .../files/patch-third__party_swiftshader_BUILD.gn | 2 +- ...__party_swiftshader_src_Common_Configurator.cpp | 2 +- ...ird__party_swiftshader_src_Common_MutexLock.hpp | 2 +- ..._party_swiftshader_src_Common_SharedLibrary.hpp | 2 +- ...ird__party_swiftshader_src_Main_SwiftConfig.cpp | 2 +- ...party_swiftshader_src_OpenGL_libEGL_Display.cpp | 2 +- ...party_swiftshader_src_OpenGL_libEGL_Surface.cpp | 2 +- ..._party_swiftshader_src_OpenGL_libEGL_libEGL.cpp | 4 +- ..._party_swiftshader_src_OpenGL_libEGL_libEGL.hpp | 2 +- ...ftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp | 2 +- ..._swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp | 2 +- ...-third__party_swiftshader_src_Reactor_Debug.cpp | 2 +- ...h-third__party_swiftshader_src_System_Debug.cpp | 2 +- ...10.0_configs_linux_include_llvm_Config_config.h | 2 +- ...configs_linux_include_llvm_Config_llvm-config.h | 20 - ...ubzero_build_Linux_include_llvm_Config_config.h | 2 +- ...party_llvm-subzero_lib_Support_Unix_Process.inc | 2 +- .../files/patch-third__party_usrsctp_BUILD.gn | 22 +- .../files/patch-third__party_webrtc_BUILD.gn | 6 +- ...rd__party_webrtc_modules_audio__device_BUILD.gn | 8 +- ..._rtp__rtcp_source_forward__error__correction.cc | 2 +- ...tch-third__party_webrtc_rtc__base_byte__order.h | 2 +- ...rd__party_webrtc_rtc__base_ifaddrs__converter.h | 2 +- ...ch-third__party_webrtc_rtc__base_ip__address.cc | 2 +- ...tch-third__party_webrtc_rtc__base_ip__address.h | 2 +- .../patch-third__party_webrtc_rtc__base_network.cc | 2 +- .../patch-third__party_webrtc_rtc__base_network.h | 6 +- ...ty_webrtc_rtc__base_physical__socket__server.cc | 8 +- ...rty_webrtc_rtc__base_physical__socket__server.h | 2 +- ...rty_webrtc_rtc__base_platform__thread__types.cc | 12 +- ...webrtc_rtc__base_third__party_sigslot_sigslot.h | 2 +- ...h-third__party_webrtc_system__wrappers_BUILD.gn | 6 +- .../files/patch-third__party_zlib_cpu__features.c | 15 +- www/chromium/files/patch-tools_gn_build_gen.py | 12 +- .../patch-tools_gn_src_base_files_file__posix.cc | 2 +- .../patch-tools_gn_src_base_files_file__util.h | 11 - ...ch-tools_gn_src_base_files_file__util__posix.cc | 11 - .../patch-tools_gn_src_base_files_scoped__file.cc | 11 - .../files/patch-tools_gn_src_gn_exec__process.cc | 2 +- ...ls_gn_src_gn_function__write__file__unittest.cc | 11 + www/chromium/files/patch-tools_gn_src_gn_version.h | 15 + .../files/patch-tools_gn_src_util_sys__info.cc | 6 +- ...ols_json__schema__compiler_feature__compiler.py | 6 +- .../patch-tools_json__schema__compiler_model.py | 6 +- ...ch-tools_perf_chrome__telemetry__build_BUILD.gn | 14 +- ...atch-tools_variations_fieldtrial__to__struct.py | 2 +- .../files/patch-ui_aura_test_aura__test__helper.cc | 12 +- .../patch-ui_aura_test_ui__controls__ozone.cc | 11 + ...patch-ui_base_clipboard_clipboard__constants.cc | 16 + .../patch-ui_base_clipboard_clipboard__constants.h | 19 + ...h-ui_base_clipboard_clipboard__data__endpoint.h | 14 + .../patch-ui_base_clipboard_clipboard__ozone.cc | 11 + ...agdrop_os__exchange__data__provider__factory.cc | 39 +- ...-ui_base_ime_init_input__method__initializer.cc | 4 +- .../patch-ui_base_resource_resource__bundle.cc | 16 +- ...h-ui_base_resource_resource__bundle__freebsd.cc | 2 +- .../patch-ui_base_test_skia__gold__pixel__diff.cc | 11 + .../files/patch-ui_base_ui__base__features.cc | 24 +- .../files/patch-ui_base_ui__base__features.h | 15 +- .../files/patch-ui_base_webui_web__ui__util.cc | 23 +- .../files/patch-ui_base_x_x11__shm__image__pool.cc | 22 +- .../files/patch-ui_compositor_compositor.cc | 4 +- .../files/patch-ui_compositor_compositor.h | 4 +- .../patch-ui_compositor_compositor__observer.h | 6 +- ...vents_devices_x11_device__data__manager__x11.cc | 15 +- www/chromium/files/patch-ui_events_event.cc | 11 + .../files/patch-ui_events_event__switches.cc | 6 +- .../files/patch-ui_events_event__switches.h | 6 +- ...ch-ui_events_keycodes_dom_keycode__converter.cc | 8 +- .../patch-ui_events_ozone_keyboard__hook__ozone.cc | 11 + www/chromium/files/patch-ui_gfx_BUILD.gn | 8 +- www/chromium/files/patch-ui_gfx_canvas__skia.cc | 6 +- .../files/patch-ui_gfx_codec_jpeg__codec.cc | 6 +- .../files/patch-ui_gfx_font__fallback__linux.cc | 2 +- www/chromium/files/patch-ui_gfx_font__list.cc | 6 +- .../files/patch-ui_gfx_font__names__testing.cc | 14 +- .../files/patch-ui_gfx_font__render__params.h | 12 +- www/chromium/files/patch-ui_gfx_font__util.cc | 14 +- .../files/patch-ui_gfx_gpu__memory__buffer.cc | 10 +- .../files/patch-ui_gfx_gpu__memory__buffer.h | 14 +- .../patch-ui_gfx_ipc_gfx__param__traits__macros.h | 30 +- ...-ui_gfx_linux_client__native__pixmap__dmabuf.cc | 4 +- ...ch-ui_gfx_mojom_buffer__types__mojom__traits.cc | 10 +- ...x_mojom_native__handle__types__mojom__traits.cc | 30 +- ...fx_mojom_native__handle__types__mojom__traits.h | 18 +- .../files/patch-ui_gfx_native__pixmap__handle.cc | 26 +- .../files/patch-ui_gfx_native__pixmap__handle.h | 18 +- .../files/patch-ui_gfx_native__widget__types.h | 8 +- www/chromium/files/patch-ui_gfx_render__text.cc | 4 +- www/chromium/files/patch-ui_gfx_x_BUILD.gn | 11 - www/chromium/files/patch-ui_gfx_x_gen__xproto.py | 13 - www/chromium/files/patch-ui_gl_BUILD.gn | 4 +- .../files/patch-ui_gl_generate__bindings.py | 4 +- .../patch-ui_gl_gl__bindings__api__autogen__glx.h | 2 +- .../patch-ui_gl_gl__bindings__autogen__glx.cc | 2 +- .../files/patch-ui_gl_gl__bindings__autogen__glx.h | 2 +- www/chromium/files/patch-ui_gl_gl__features.cc | 11 + www/chromium/files/patch-ui_gl_gl__fence.cc | 6 +- .../patch-ui_gl_sync__control__vsync__provider.cc | 22 +- .../patch-ui_gl_sync__control__vsync__provider.h | 18 +- .../files/patch-ui_gtk_print__dialog__gtk.cc | 11 - .../patch-ui_gtk_printing_print__dialog__gtk.cc | 11 + ...i_message__center_views_message__popup__view.cc | 4 +- .../files/patch-ui_native__theme_native__theme.h | 2 +- .../patch-ui_native__theme_native__theme__base.cc | 2 +- www/chromium/files/patch-ui_ozone_ozone.gni | 12 + ...rm__window_platform__window__init__properties.h | 10 +- .../patch-ui_strings_app__locale__settings.grd | 2 +- ..._views_bubble_bubble__dialog__delegate__view.cc | 8 +- .../files/patch-ui_views_controls_label.cc | 6 +- .../patch-ui_views_controls_textfield_textfield.cc | 28 +- .../files/patch-ui_views_corewm_tooltip__aura.cc | 2 +- .../patch-ui_views_examples_widget__example.cc | 8 +- .../files/patch-ui_views_focus_focus__manager.cc | 20 + .../files/patch-ui_views_selection__controller.cc | 2 +- .../files/patch-ui_views_style_platform__style.cc | 12 +- .../files/patch-ui_views_views__delegate.cc | 10 +- .../files/patch-ui_views_views__delegate.h | 10 +- ..._widget_desktop__aura_desktop__screen__ozone.cc | 11 + ...__aura_desktop__window__tree__host__platform.cc | 8 +- .../patch-ui_views_widget_native__widget__aura.cc | 31 +- .../patch-ui_views_window_custom__frame__view.cc | 4 +- .../patch-ui_views_window_dialog__delegate.cc | 10 +- .../patch-ui_views_window_frame__background.cc | 8 +- .../files/patch-ui_webui_resources_js_cr.js | 2 +- .../files/patch-ui_webui_resources_js_icon.js | 11 - www/chromium/files/patch-v8_BUILD.gn | 31 +- www/chromium/files/patch-v8_include_v8config.h | 4 +- www/chromium/files/patch-v8_src_api_api.cc | 4 +- www/chromium/files/patch-v8_src_base_cpu.cc | 6 +- .../patch-v8_src_base_platform_platform-freebsd.cc | 2 +- .../patch-v8_src_base_platform_platform-posix.cc | 6 +- www/chromium/files/patch-weblayer_BUILD.gn | 4 +- ...h-weblayer_app_content__main__delegate__impl.cc | 10 +- ...-weblayer_browser_browser__main__parts__impl.cc | 16 +- ...layer_browser_content__browser__client__impl.cc | 30 +- ...blayer_browser_content__browser__client__impl.h | 12 +- ...er_browser_system__network__context__manager.cc | 14 +- .../files/patch-weblayer_common_weblayer__paths.cc | 10 +- www/chromium/files/pkg-message.in | 13 - www/chromium/files/sndio_input.cc | 2 +- www/chromium/pkg-plist | 1129 ++++++++++++++++++-- 935 files changed, 7597 insertions(+), 6220 deletions(-) create mode 100644 www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni delete mode 100644 www/chromium/files/patch-base_allocator_allocator__shim.cc create mode 100644 www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc create mode 100644 www/chromium/files/patch-base_cpu.h delete mode 100644 www/chromium/files/patch-base_files_file__path__watcher.cc create mode 100644 www/chromium/files/patch-base_message__loop_message__pump__glib.cc delete mode 100644 www/chromium/files/patch-base_stl__util.h create mode 100644 www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc create mode 100644 www/chromium/files/patch-base_system_sys__info__unittest.cc create mode 100644 www/chromium/files/patch-base_threading_platform__thread__internal__posix.h create mode 100644 www/chromium/files/patch-base_time_time__unittest.cc create mode 100644 www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc create mode 100644 www/chromium/files/patch-chrome_BUILD.gn delete mode 100644 www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h create mode 100644 www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h create mode 100644 www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc create mode 100644 www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc create mode 100644 www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc delete mode 100644 www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc create mode 100644 www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc delete mode 100644 www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc delete mode 100644 www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc delete mode 100644 www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h delete mode 100644 www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc delete mode 100644 www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc delete mode 100644 www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni delete mode 100644 www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc delete mode 100644 www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn delete mode 100644 www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc delete mode 100644 www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc create mode 100644 www/chromium/files/patch-components_crash_core_app_BUILD.gn create mode 100644 www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc create mode 100644 www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto create mode 100644 www/chromium/files/patch-components_feed_core_proto_wire_version.proto create mode 100644 www/chromium/files/patch-components_feed_core_v2_proto__util.cc delete mode 100644 www/chromium/files/patch-components_feedback_anonymizer__tool.cc create mode 100644 www/chromium/files/patch-components_gwp__asan_BUILD.gn delete mode 100644 www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc delete mode 100644 www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc create mode 100644 www/chromium/files/patch-content_app_content__main.cc create mode 100644 www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h create mode 100644 www/chromium/files/patch-content_browser_gpu_compositor__util.cc create mode 100644 www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc delete mode 100644 www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h delete mode 100644 www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc create mode 100644 www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc delete mode 100644 www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc create mode 100644 www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc create mode 100644 www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc create mode 100644 www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h delete mode 100644 www/chromium/files/patch-content_child_BUILD.gn create mode 100644 www/chromium/files/patch-content_child_child__process.cc create mode 100644 www/chromium/files/patch-content_common_mojo__core__library__support.cc create mode 100644 www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h delete mode 100644 www/chromium/files/patch-content_public_common_BUILD.gn create mode 100644 www/chromium/files/patch-content_public_common_zygote_features.gni delete mode 100644 www/chromium/files/patch-content_renderer_BUILD.gn delete mode 100644 www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc delete mode 100644 www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc delete mode 100644 www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc delete mode 100644 www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc delete mode 100644 www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc create mode 100644 www/chromium/files/patch-content_zygote_zygote__linux.cc create mode 100644 www/chromium/files/patch-content_zygote_zygote__main__linux.cc create mode 100644 www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc delete mode 100644 www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h delete mode 100644 www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc create mode 100644 www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h create mode 100644 www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc delete mode 100644 www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h delete mode 100644 www/chromium/files/patch-headless_lib_headless__content__main__delegate.h create mode 100644 www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc create mode 100644 www/chromium/files/patch-net_cert_test__root__certs.h delete mode 100644 www/chromium/files/patch-net_features.gni create mode 100644 www/chromium/files/patch-printing_print__settings.cc create mode 100644 www/chromium/files/patch-printing_print__settings.h create mode 100644 www/chromium/files/patch-printing_print__settings__conversion.cc create mode 100644 www/chromium/files/patch-printing_printing__features.cc create mode 100644 www/chromium/files/patch-printing_printing__features.h create mode 100644 www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc create mode 100644 www/chromium/files/patch-sandbox_BUILD.gn create mode 100644 www/chromium/files/patch-sandbox_policy_BUILD.gn create mode 100644 www/chromium/files/patch-sandbox_policy_switches.cc create mode 100644 www/chromium/files/patch-sandbox_policy_switches.h create mode 100644 www/chromium/files/patch-services_service__manager_BUILD.gn delete mode 100644 www/chromium/files/patch-services_service__manager_embedder_main.cc delete mode 100644 www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h delete mode 100644 www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn delete mode 100644 www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni delete mode 100644 www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc delete mode 100644 www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h delete mode 100644 www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h delete mode 100644 www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc delete mode 100644 www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc delete mode 100644 www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn create mode 100644 www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h create mode 100644 www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc create mode 100644 www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc delete mode 100644 www/chromium/files/patch-third__party_boringssl_BUILD.gn delete mode 100644 www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h delete mode 100644 www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni delete mode 100644 www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h delete mode 100644 www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h delete mode 100644 www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc delete mode 100644 www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc delete mode 100644 www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc delete mode 100644 www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc create mode 100644 www/chromium/files/patch-third__party_nearby_src_cpp_core__v2_internal_offline__service__controller.h create mode 100644 www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc delete mode 100644 www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h create mode 100644 www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp delete mode 100644 www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp delete mode 100644 www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h delete mode 100644 www/chromium/files/patch-tools_gn_src_base_files_file__util.h delete mode 100644 www/chromium/files/patch-tools_gn_src_base_files_file__util__posix.cc delete mode 100644 www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc create mode 100644 www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc create mode 100644 www/chromium/files/patch-tools_gn_src_gn_version.h create mode 100644 www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc create mode 100644 www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc create mode 100644 www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h create mode 100644 www/chromium/files/patch-ui_base_clipboard_clipboard__data__endpoint.h create mode 100644 www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc create mode 100644 www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc create mode 100644 www/chromium/files/patch-ui_events_event.cc create mode 100644 www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc delete mode 100644 www/chromium/files/patch-ui_gfx_x_BUILD.gn delete mode 100644 www/chromium/files/patch-ui_gfx_x_gen__xproto.py create mode 100644 www/chromium/files/patch-ui_gl_gl__features.cc delete mode 100644 www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc create mode 100644 www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc create mode 100644 www/chromium/files/patch-ui_ozone_ozone.gni create mode 100644 www/chromium/files/patch-ui_views_focus_focus__manager.cc create mode 100644 www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc delete mode 100644 www/chromium/files/patch-ui_webui_resources_js_icon.js delete mode 100644 www/chromium/files/pkg-message.in diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 9dda00dd9295..d20ead143d91 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 84.0.4147.135 +PORTVERSION= 87.0.4280.88 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ - LOCAL/cpm/chromium/:fonts + LOCAL/rene/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= chromium@FreeBSD.org @@ -59,7 +59,8 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic @@ -137,7 +138,7 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" .if !defined(GN_ONLY) -SUB_FILES= chromium-browser.desktop chrome pkg-message +SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST @@ -146,7 +147,7 @@ DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO -OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER KERBEROS +OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -199,10 +200,14 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ - test_fonts${EXTRACT_SUFX}:fonts + test_fonts-85${EXTRACT_SUFX}:fonts .include +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-build_config_compiler_pgo_pgo.gni +.endif + # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " @@ -236,11 +241,6 @@ post-extract-TEST-on: @${MKDIR} ${WRKSRC}/third_party/test_fonts/test_fonts @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ -post-patch: - @${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \ - -e 's|@@MENUNAME@@|Chromium Web Browser|' \ - ${WRKSRC}/chrome/app/resources/manpage.1.in - post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 6ae16e577f89..09969f01994c 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1597780235 -SHA256 (chromium-84.0.4147.135.tar.xz) = dd41001596d0e17051ddcece3db6c0cdbe92fe23375d56fbcfba624a5f4996d8 -SIZE (chromium-84.0.4147.135.tar.xz) = 815136236 -SHA256 (chromium-84.0.4147.135-testdata.tar.xz) = cef39a11f7df8ff9655b9e70b9d774dc65cf6a15a726c048389eb87613d80ef2 -SIZE (chromium-84.0.4147.135-testdata.tar.xz) = 257190224 -SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 -SIZE (test_fonts.tar.xz) = 200040 +TIMESTAMP = 1606957721 +SHA256 (chromium-87.0.4280.88.tar.xz) = 3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0 +SIZE (chromium-87.0.4280.88.tar.xz) = 856266548 +SHA256 (chromium-87.0.4280.88-testdata.tar.xz) = 35c4676c9cb699aa76335757ec2a71a246102f2e6e6a3536e43c1c4afb04e494 +SIZE (chromium-87.0.4280.88-testdata.tar.xz) = 257423892 +SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 +SIZE (test_fonts-85.tar.xz) = 9511984 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 new file mode 100644 index 000000000000..b963da3a6dbf --- /dev/null +++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni @@ -0,0 +1,11 @@ +--- build/config/compiler/pgo/pgo.gni.orig 2020-11-24 12:45:30 UTC ++++ build/config/compiler/pgo/pgo.gni +@@ -12,7 +12,7 @@ declare_args() { + # 2 : Used during the PGO (optimization) phase. + chrome_pgo_phase = 0 + if (is_official_build && +- (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only))) { ++ (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only && !is_bsd))) { + chrome_pgo_phase = 2 + } + diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index 887a416b5f2d..104bbce09cda 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -27,14 +27,3 @@ if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); ---- media/audio/audio_output_proxy_unittest.cc.orig 2019-03-11 22:00:59 UTC -+++ media/audio/audio_output_proxy_unittest.cc -@@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test { - // |stream| is closed at this point. Start() should reopen it again. - EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) - .Times(2) -- .WillRepeatedly(Return(reinterpret_cast(NULL))); -+ .WillRepeatedly(Return(static_cast(NULL))); - - EXPECT_CALL(callback_, OnError()).Times(2); - 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 0a68f59a615e..9fe3b4985016 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,11 +1,11 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-07-07 22:03:25 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-11-13 06:42:21 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) #include #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 #include diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 0b6c77a3ab72..37720bb5f096 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,15 +1,15 @@ ---- BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- BUILD.gn.orig 2020-11-13 06:36:33 UTC +++ BUILD.gn -@@ -417,7 +417,7 @@ group("gn_all") { +@@ -422,7 +422,7 @@ group("gn_all") { ] } -- if (is_linux || is_android) { -+ if ((is_linux && !is_bsd) || is_android) { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux && !is_bsd) || is_chromeos || is_android) { deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -459,8 +459,6 @@ group("gn_all") { +@@ -463,8 +463,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -515,10 +513,6 @@ group("gn_all") { +@@ -519,10 +517,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -578,10 +572,6 @@ group("gn_all") { +@@ -582,10 +576,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -655,7 +645,7 @@ group("gn_all") { +@@ -663,7 +653,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,16 +49,25 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -788,7 +778,6 @@ group("gn_all") { +@@ -678,7 +668,7 @@ group("gn_all") { + } + } + +- if (is_mac || is_win || is_android || (is_linux && !is_chromeos)) { ++ if (is_mac || is_win || is_android || (is_linux && !is_chromeos && !is_bsd)) { + deps += [ + "//third_party/crashpad/crashpad:crashpad_tests", + "//third_party/crashpad/crashpad/handler:crashpad_handler", +@@ -797,7 +787,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", - "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", ] - if (is_desktop_linux && use_ozone) { - deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -1074,7 +1063,7 @@ if (!is_ios) { - ] + if (is_android) { + deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] +@@ -1090,7 +1079,7 @@ if (!is_ios) { + data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { @@ -66,16 +75,16 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1083,7 +1072,7 @@ if (!is_ios) { +@@ -1099,7 +1088,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if ((is_linux && !is_bsd) || is_chromeos) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1276,9 +1265,6 @@ group("chromium_builder_perf") { +@@ -1296,9 +1285,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc index 44a112bec769..7ae6215349f4 100644 --- a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc +++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc @@ -1,11 +1,11 @@ ---- apps/app_restore_service_browsertest.cc.orig 2020-07-07 21:57:29 UTC +--- apps/app_restore_service_browsertest.cc.orig 2020-11-13 06:36:34 UTC +++ apps/app_restore_service_browsertest.cc @@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc } // Flaky: crbug.com/269613 --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) #define MAYBE_FileAccessIsRestored DISABLED_FileAccessIsRestored #else #define MAYBE_FileAccessIsRestored FileAccessIsRestored diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 8f6bd623a3b3..8a96c5b88c47 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2019-06-04 18:55:14 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2020-11-13 06:36:34 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() +@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index 838875d71ad0..f7124e6daed6 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,4 +1,4 @@ ---- ash/display/mirror_window_controller.cc.orig 2020-05-13 18:39:35 UTC +--- ash/display/mirror_window_controller.cc.orig 2020-11-13 06:36:34 UTC +++ ash/display/mirror_window_controller.cc @@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 15bb859a84f8..0ff1f5c9a661 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 2020-07-07 21:58:11 UTC +--- base/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ base/BUILD.gn -@@ -60,7 +60,7 @@ declare_args() { +@@ -53,7 +53,7 @@ declare_args() { # replacement base::Location::Current(). On by default in non-official builds # for testing purposes. # TODO(https://crbug.com/974061): remove this eventually. @@ -9,20 +9,19 @@ # Unsafe developer build. Has developer-friendly features that may weaken or # disable security measures like sandboxing or ASLR. -@@ -936,7 +936,7 @@ jumbo_component("base") { +@@ -878,7 +878,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] -- if (!is_nacl && !is_mac && !is_ios) { -+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { +- if (!is_nacl && !is_apple) { ++ if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "profiler/stack_copier_signal.cc", - "profiler/stack_copier_signal.h", -@@ -945,6 +945,12 @@ jumbo_component("base") { + "cpu_affinity_posix.cc", + "cpu_affinity_posix.h", +@@ -889,6 +889,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } -+ + if (is_bsd) { + sources += [ + "profiler/stack_sampler_posix.cc", @@ -31,25 +30,34 @@ } if (is_win) { -@@ -1329,7 +1335,7 @@ jumbo_component("base") { - # Needed for if using newer C++ library than sysroot, except if +@@ -1295,7 +1300,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. -- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && -+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && + if (!use_sysroot && +- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) && ++ (is_android || ((is_linux || is_chromeos) && !is_chromecast) && !is_clang) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1355,7 +1361,7 @@ jumbo_component("base") { - "allocator/allocator_shim_override_glibc_weak_symbols.h", - ] - deps += [ "//base/allocator:tcmalloc" ] -- } else if (is_linux && use_allocator == "none") { -+ } else if ((is_linux && !is_bsd) && use_allocator == "none") { - sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] - } else if (is_android && use_allocator == "none") { - sources += [ -@@ -1952,6 +1958,33 @@ jumbo_component("base") { +@@ -1342,7 +1347,7 @@ component("base") { + "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", + ] + } +- if (is_chromeos || is_linux) { ++ if ((is_chromeos || is_linux) && !is_bsd) { + sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] + } + if (is_win) { +@@ -1811,7 +1816,7 @@ component("base") { + ] + } + +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { + sources += [ + "allocator/partition_allocator/spinning_futex_linux.cc", + "allocator/partition_allocator/spinning_futex_linux.h", +@@ -1956,6 +1961,34 @@ component("base") { } } @@ -79,29 +87,26 @@ + "util" # process_metrics_freebsd + ] + } ++ + # iOS if (is_ios) { sources -= [ -@@ -2946,7 +2979,7 @@ test("base_unittests") { - "posix/unix_domain_socket_unittest.cc", - "task/thread_pool/task_tracker_posix_unittest.cc", +@@ -3069,7 +3102,7 @@ test("base_unittests") { ] -- if (!is_nacl && !is_mac && !is_ios) { -+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { - sources += [ "profiler/stack_copier_signal_unittest.cc" ] - } } -@@ -3154,6 +3187,12 @@ test("base_unittests") { - manifest = "//build/config/fuchsia/tests.cmx" +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ "debug/proc_maps_linux_unittest.cc" ] } -+ -+ if (is_bsd) { -+ sources -= [ -+ "debug/proc_maps_linux_unittest.cc", -+ ] -+ } - if (!is_fuchsia && !is_ios) { - sources += [ "files/file_locking_unittest.cc" ] +@@ -3110,7 +3143,7 @@ test("base_unittests") { + "posix/unix_domain_socket_unittest.cc", + "task/thread_pool/task_tracker_posix_unittest.cc", + ] +- if (!is_nacl && !is_apple) { ++ if (!is_nacl && !is_apple && !is_bsd) { + sources += [ + "cpu_affinity_posix_unittest.cc", + "profiler/stack_copier_signal_unittest.cc", diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc deleted file mode 100644 index 208a8d93617a..000000000000 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/allocator_shim.cc.orig 2019-10-21 19:06:18 UTC -+++ base/allocator/allocator_shim.cc -@@ -71,7 +71,7 @@ inline const base::allocator::AllocatorDispatch* GetCh - // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully - // barriered on Linux+Clang, and that causes visible perf regressons. - return reinterpret_cast( --#if defined(OS_LINUX) && defined(__clang__) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__) - *static_cast(&g_chain_head) - #else - base::subtle::NoBarrier_Load(&g_chain_head) diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index c7b4ac21c804..d8774004de47 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-02-03 21:52:37 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-11-13 06:36:34 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -6,18 +6,28 @@ #include "base/compiler_specific.h" diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h index fc9a47bd3daf..212e4561c6c2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2020-11-13 06:36:34 UTC +++ base/allocator/allocator_shim_override_libc_symbols.h @@ -10,7 +10,7 @@ #endif 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 9b1fc5b916e6..21de4b8f7dc2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,45 +1,47 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2020-07-07 21:57:30 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/allocator/allocator_shim_unittest.cc -@@ -355,7 +355,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); +@@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { + #endif // !OS_WIN --#if !defined(OS_WIN) && !defined(OS_MACOSX) -+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_WIN) && !defined(OS_APPLE) ++#if !defined(OS_WIN) && !defined(OS_APPLE) && !defined(OS_BSD) void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast(memalign_ptr) % 128); -@@ -368,7 +368,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); - // pvalloc rounds the size up to the next page. +@@ -383,7 +383,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); --#endif // !OS_WIN && !OS_MACOSX -+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD + #endif // !defined(OS_ANDROID) + +-#endif // !OS_WIN && !OS_APPLE ++#endif // !OS_WIN && !OS_APPLE && !OS_BSD - char* realloc_ptr = static_cast(malloc(10)); - strcpy(realloc_ptr, "foobar"); -@@ -384,13 +384,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { + // See allocator_shim_override_glibc_weak_symbols.h for why we intercept + // internal libc symbols. +@@ -410,7 +410,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); --#if !defined(OS_WIN) && !defined(OS_MACOSX) -+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_WIN) && !defined(OS_APPLE) ++#if !defined(OS_WIN) && !defined(OS_APPLE) && !defined(OS_BSD) free(memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); - free(pvalloc_ptr); +@@ -419,7 +419,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); --#endif // !OS_WIN && !OS_MACOSX -+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD + #endif // !defined(OS_ANDROID) + +-#endif // !OS_WIN && !OS_APPLE ++#endif // !OS_WIN && !OS_APPLE && !OS_BSD #if !defined(OS_WIN) free(posix_memalign_ptr); -@@ -557,7 +557,7 @@ static size_t GetAllocatedSize(void* ptr) { +@@ -595,7 +595,7 @@ static size_t GetAllocatedSize(void* ptr) { static size_t GetAllocatedSize(void* ptr) { return malloc_size(ptr); } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static size_t GetAllocatedSize(void* ptr) { return malloc_usable_size(ptr); } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 07ed8ef2f09e..b9db7cc31cd5 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-13 18:39:35 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-11-13 06:36:34 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -22,7 +22,7 @@ +@@ -24,7 +24,7 @@ #if defined(OS_ANDROID) #include #endif --#if defined(OS_LINUX) -+#if defined(OS_BSD) || defined(OS_LINUX) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #include 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 new file mode 100644 index 000000000000..9b1a187130ab --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -0,0 +1,12 @@ +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2020-11-30 16:06:59 UTC ++++ base/allocator/partition_allocator/partition_alloc.cc +@@ -197,6 +197,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me + // Check that some of our zanier calculations worked out as expected. + #if ENABLE_TAG_FOR_MTE_CHECKED_PTR + static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); ++#elif defined(__i386__) && defined(OS_FREEBSD) ++ // alignof(std::max_align_t) is only 4 on FreeBSD/i386 ++ static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); + #else + static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); + #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 fdfc9604fefd..01c57fe8a78a 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,17 +1,26 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -307,9 +307,13 @@ void FreeFullPage(PartitionRoot* root, PartitionRoot:: +@@ -333,9 +333,13 @@ void FreeFullPage(PartitionRoot; + static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + // defined(OS_AIX) + + private: diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index dd1e1658fd34..56b47676b47f 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/debugger_posix.cc.orig 2020-07-07 21:58:11 UTC +--- base/debug/debugger_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/debugger_posix.cc @@ -98,7 +98,7 @@ bool BeingDebugged() { KERN_PROC, diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index 706190c26d34..b89af4f16bf9 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,6 +1,6 @@ ---- base/debug/elf_reader.cc.orig 2020-07-07 21:57:30 UTC +--- base/debug/elf_reader.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/elf_reader.cc -@@ -36,7 +36,9 @@ using Nhdr = Elf64_Nhdr; +@@ -38,7 +38,9 @@ using Nhdr = Elf64_Nhdr; using Word = Elf64_Word; #endif @@ -8,9 +8,9 @@ constexpr char kGnuNoteName[] = "GNU"; +#endif - // Returns a pointer to the header of the ELF binary mapped into memory, - // or a null pointer if the header is invalid. -@@ -99,6 +101,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + // Returns a pointer to the header of the ELF binary mapped into memory, or a + // null pointer if the header is invalid. Here and below |elf_mapped_base| is a +@@ -75,6 +77,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; while (current_section < section_end) { current_note = reinterpret_cast(current_section); @@ -18,7 +18,7 @@ if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); -@@ -108,6 +111,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -84,6 +87,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc index 69cc11ea867b..71602a3cfa56 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,11 +1,11 @@ ---- base/debug/proc_maps_linux.cc.orig 2020-07-07 21:57:30 UTC +--- base/debug/proc_maps_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/proc_maps_linux.cc @@ -13,7 +13,7 @@ #include "base/strings/string_split.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include #endif diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc index 8d2156f365ff..39376795491e 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.cc +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -1,11 +1,11 @@ ---- base/debug/stack_trace.cc.orig 2019-03-17 21:37:51 UTC +--- base/debug/stack_trace.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace.cc -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include #include "base/process/process_handle.h" #include "base/threading/platform_thread.h" diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index 6b4e63dd1e32..4900241415b6 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.h +++ b/www/chromium/files/patch-base_debug_stack__trace.h @@ -1,4 +1,4 @@ ---- base/debug/stack_trace.h.orig 2019-09-09 21:55:05 UTC +--- base/debug/stack_trace.h.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace.h @@ -19,6 +19,7 @@ #if !defined(OS_NACL) diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index f3b967c844e2..66bf850fd83e 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,11 +1,11 @@ ---- base/debug/stack_trace_posix.cc.orig 2020-03-16 18:39:41 UTC +--- base/debug/stack_trace_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include #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 "base/debug/proc_maps_linux.h" #endif diff --git a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc index 933a8e8ce401..bdbdb57fe408 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc @@ -1,14 +1,14 @@ ---- base/debug/stack_trace_unittest.cc.orig 2020-03-23 14:01:09 UTC +--- base/debug/stack_trace_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace_unittest.cc -@@ -86,6 +86,7 @@ TEST_F(StackTraceTest, OutputToStream) { +@@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) { std::string::npos) << "Unable to resolve symbols."; +#if !defined(OS_BSD) // Expect a demangled symbol. // Note that Windows Release builds omit the function parameters from the - // demangled stack output, otherwise this could be "testing::Test::Run()". -@@ -103,9 +104,10 @@ TEST_F(StackTraceTest, OutputToStream) { + // demangled stack output, otherwise this could be "testing::UnitTest::Run()". +@@ -106,9 +107,10 @@ TEST_F(StackTraceTest, OutputToStream) { EXPECT_TRUE(backtrace_message.find(__func__) != std::string::npos) << "Expected to find " << __func__ << " in backtrace:\n" << backtrace_message; @@ -20,7 +20,7 @@ // Disabled in Official builds, where Link-Time Optimization can result in two // or fewer stack frames being available, causing the test to fail. TEST_F(StackTraceTest, TruncatedTrace) { -@@ -119,7 +121,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { +@@ -122,7 +124,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { truncated.Addresses(&count); EXPECT_EQ(2u, count); } diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index 26521d022831..ca4d131daf7c 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,11 +1,11 @@ ---- base/files/file_path_unittest.cc.orig 2020-03-16 18:39:41 UTC +--- base/files/file_path_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_unittest.cc @@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; --#if !defined(SYSTEM_NATIVE_UTF8) && defined(OS_LINUX) -+#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_BSD)) +-#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) ScopedLocale locale("en_US.UTF-8"); #endif diff --git a/www/chromium/files/patch-base_files_file__path__watcher.cc b/www/chromium/files/patch-base_files_file__path__watcher.cc deleted file mode 100644 index 87abcb7fbda1..000000000000 --- a/www/chromium/files/patch-base_files_file__path__watcher.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- base/files/file_path_watcher.cc.orig 2020-03-16 18:39:41 UTC -+++ base/files/file_path_watcher.cc -@@ -20,10 +20,10 @@ FilePathWatcher::~FilePathWatcher() { - // static - bool FilePathWatcher::RecursiveWatchAvailable() { - #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ -- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+ (defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_ANDROID) || defined(OS_AIX) - return true; - #else -- // FSEvents isn't available on iOS. -+ // FSEvents isn't available on iOS and the kqueue watcher. - return false; - #endif - } diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h index d5712de7a389..949735362ed9 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h +++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ diff --git a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc index fc76cd1b16b3..9905dc61e18e 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_stub.cc.orig 2020-03-16 18:39:41 UTC +--- base/files/file_path_watcher_stub.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_watcher_stub.cc @@ -1,14 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index ba8a788b98a9..a54a03a1849e 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,41 +1,65 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -424,7 +424,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -425,12 +425,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -797,7 +797,7 @@ enum Permission { + ASSERT_TRUE(WaitForEvents()); +-#endif // !OS_APPLE ++#endif // !OS_APPLE && !OS_BSD + + ASSERT_TRUE(base::DeleteFile(file1)); + VLOG(1) << "Waiting for file1 deletion"; +@@ -632,7 +632,7 @@ TEST_F(FilePathWatcherTest, FileAttributesChanged) { + ASSERT_TRUE(WaitForEvents()); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Verify that creating a symlink is caught. + TEST_F(FilePathWatcherTest, CreateLink) { +@@ -790,7 +790,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { + ASSERT_TRUE(WaitForEvents()); + } + +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + enum Permission { + Read, +@@ -798,7 +798,7 @@ enum Permission { Execute }; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_APPLE) ++#if defined(OS_APPLE) || defined(OS_BSD) bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -826,9 +826,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -827,9 +827,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } --#endif // defined(OS_MACOSX) -+#endif // defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_APPLE) ++#endif // defined(OS_APPLE) || defined(OS_BSD) --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_APPLE) ++#if defined(OS_APPLE) || defined(OS_BSD) // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -863,7 +863,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -864,7 +864,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } --#endif // OS_MACOSX -+#endif // OS_MACOSX || OS_BSD +-#endif // OS_APPLE ++#endif // OS_APPLE || OS_BSD } // namespace } // namespace base diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 7b393a0021a0..bf2c4dce52dd 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,11 +1,28 @@ ---- base/files/file_util.h.orig 2020-07-07 21:58:11 UTC +--- base/files/file_util.h.orig 2020-11-13 06:36:34 UTC +++ base/files/file_util.h -@@ -552,7 +552,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat + BASE_EXPORT bool ExecutableExistsInPath(Environment* env, + const FilePath::StringType& executable); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + // Determine if files under a given |path| can be mapped and then mprotect'd + // PROT_EXEC. This depends on the mount options used for |path|, which vary + // among different Linux distributions and possibly local configuration. It also + // depends on details of kernel--ChromeOS uses the noexec option for /dev/shm + // but its kernel allows mprotect with PROT_EXEC anyway. + BASE_EXPORT bool IsPathExecutable(const FilePath& path); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + + #endif // OS_POSIX + +@@ -592,7 +592,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); --#if defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. 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 4342a618c454..7c9c399872b9 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,11 +1,60 @@ ---- base/files/file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +--- base/files/file_util_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_util_posix.cc -@@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -412,7 +412,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { --#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) return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; +@@ -947,8 +947,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si + // space. It can fail because the filesystem doesn't support it. In that case, + // use the manual method below. + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_BSD) ++ if (HANDLE_EINTR(posix_fallocate(file->GetPlatformFile(), offset, size)) != -1) ++#else + if (HANDLE_EINTR(fallocate(file->GetPlatformFile(), 0, offset, size)) != -1) ++#endif + return true; + DPLOG(ERROR) << "fallocate"; + #elif defined(OS_APPLE) +@@ -1172,7 +1176,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, + // posix_fadvise() is only available in the Android NDK in API 21+. Older + // versions may have the required kernel support, but don't have enough usage + // to justify backporting. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && __ANDROID_API__ >= 21) + File file(file_path, File::FLAG_OPEN | File::FLAG_READ); + if (!file.IsValid()) +@@ -1208,7 +1212,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, + return internal::PreReadFileSlow(file_path, max_bytes) + ? PrefetchResult{PrefetchResultCode::kSlowSuccess} + : PrefetchResult{PrefetchResultCode::kSlowFailed}; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || (defined(OS_ANDROID) && ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || (defined(OS_ANDROID) && + // __ANDROID_API__ >= 21) + } + +@@ -1243,7 +1247,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP + + #endif // !defined(OS_NACL_NONSFI) + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + BASE_EXPORT bool IsPathExecutable(const FilePath& path) { + bool result = false; + FilePath tmp_file_path; +@@ -1264,6 +1268,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path + } + return result; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + + } // namespace base 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 8b5814ae79df..5bec8bb9694e 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,20 +1,38 @@ ---- base/files/file_util_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/files/file_util_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_util_unittest.cc -@@ -3465,7 +3465,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -1639,7 +1639,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { + #endif + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // This test will validate that files which would block when read result in a + // failure on a call to ReadFileToStringNonBlocking. To accomplish this we will + // use a named pipe because it appears as a file on disk and we can control how +@@ -1672,7 +1672,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) { + ASSERT_EQ(result.size(), 1u); + EXPECT_EQ(result[0], 'a'); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + TEST_F(FileUtilTest, MoveFileNew) { + // Create a file +@@ -3507,7 +3507,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // defined(OS_WIN) --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_APPLE) ++#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -3483,7 +3483,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste +@@ -3525,7 +3525,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#endif // defined(OS_POSIX) && !defined(OS_APPLE) ++#endif // defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) TEST_F(FileUtilTest, ReadFileToStringWithLargeFile) { std::string data(kLargeFileSize, 'c'); diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc index 84ba47ff6aeb..16f73156a2bc 100644 --- a/www/chromium/files/patch-base_files_scoped__file.cc +++ b/www/chromium/files/patch-base_files_scoped__file.cc @@ -1,11 +1,11 @@ ---- base/files/scoped_file.cc.orig 2019-07-29 18:17:43 UTC +--- base/files/scoped_file.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/scoped_file.cc @@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { // a single open directory would bypass the entire security model. int ret = IGNORE_EINTR(close(fd)); --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(OS_APPLE) || \ + defined(OS_FUCHSIA) || defined(OS_ANDROID) // NB: Some file descriptors can return errors from close() e.g. network // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index bf29624ac4ec..ba15ad8b4ded 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2020-05-13 18:39:35 UTC +--- base/i18n/icu_util.cc.orig 2020-11-13 06:36:34 UTC +++ base/i18n/icu_util.cc -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ + #include "third_party/icu/source/common/unicode/unistr.h" #endif - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ ++#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif - @@ -341,7 +341,7 @@ void InitializeIcuTimeZone() { fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) +-#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST) ++#elif (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 97ea99e3d97b..4bbbf448b605 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,6 +1,14 @@ ---- base/linux_util.cc.orig 2020-05-13 18:39:35 UTC +--- base/linux_util.cc.orig 2020-11-13 06:36:34 UTC +++ base/linux_util.cc -@@ -78,6 +78,9 @@ class DistroNameGetter { +@@ -15,6 +15,7 @@ + + #include + #include ++#include + + #include "base/files/dir_reader_posix.h" + #include "base/files/file_util.h" +@@ -78,6 +79,9 @@ class DistroNameGetter { public: DistroNameGetter() { static const char* const kFilesToCheck[] = {"/etc/os-release", @@ -10,3 +18,21 @@ "/usr/lib/os-release"}; for (const char* file : kFilesToCheck) { if (ReadDistroFromOSReleaseFile(file)) +@@ -134,6 +138,9 @@ void SetLinuxDistro(const std::string& distro) { + } + + bool GetThreadsForProcess(pid_t pid, std::vector* tids) { ++#if defined(OS_BSD) ++ return false; ++#else + // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 + char buf[25]; + strings::SafeSPrintf(buf, "/proc/%d/task", pid); +@@ -153,6 +160,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector + #endif + +@@ -559,7 +559,7 @@ 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; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_MAC) ++#if defined(OS_MAC) || defined(OS_BSD) crash_addr = reinterpret_cast(info->si_addr); - #else // OS_POSIX && !OS_MACOSX + #else // OS_* ucontext_t* context = reinterpret_cast(context_ptr); diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index b50f404a2764..77084937a2c5 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,11 +1,11 @@ ---- base/memory/discardable_memory.cc.orig 2020-02-07 10:23:12 UTC +--- base/memory/discardable_memory.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/discardable_memory.cc @@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_POSIX) --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const base::Feature kDiscardableMemoryBackingTrial{ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -13,15 +13,15 @@ DiscardableMemoryTrialGroup::kEmulatedSharedMemory, &kDiscardableMemoryBackingParamOptions}; --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace features namespace { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = @@ -29,13 +29,13 @@ } NOTREACHED(); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. @@ -43,21 +43,21 @@ DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled()); return features::kDiscardableMemoryBackingParam.Get(); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (DiscardableMemoryBackingFieldTrialIsEnabled()) { return GetBackingForFieldTrial(); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_ANDROID) if (ashmem_device_is_supported()) diff --git a/www/chromium/files/patch-base_memory_discardable__memory__internal.h b/www/chromium/files/patch-base_memory_discardable__memory__internal.h index c8225e74d049..bf535550931b 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory__internal.h +++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h @@ -1,11 +1,11 @@ ---- base/memory/discardable_memory_internal.h.orig 2020-02-07 10:22:39 UTC +--- base/memory/discardable_memory_internal.h.orig 2020-11-13 06:36:34 UTC +++ base/memory/discardable_memory_internal.h @@ -10,7 +10,7 @@ #include "base/metrics/field_trial_params.h" #include "build/build_config.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace base { @@ -13,7 +13,7 @@ } // namespace base --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #endif // BASE_MEMORY_DISCARDABLE_MEMORY_INTERNAL_H_ diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 5368440e775b..82feab1e734f 100644 --- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,11 +1,11 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-16 18:39:41 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -282,7 +282,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -292,7 +292,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); --#ifdef OS_MACOSX -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_APPLE) ++#if defined(OS_APPLE) || defined(OS_BSD) std::vector vec(allocated_pages_); #else std::vector vec(allocated_pages_); 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 477b8029c4a6..abcb85a3f032 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,29 +1,29 @@ ---- base/memory/platform_shared_memory_region.h.orig 2020-02-03 21:52:37 UTC +--- base/memory/platform_shared_memory_region.h.orig 2020-11-13 06:36:34 UTC +++ base/memory/platform_shared_memory_region.h @@ -27,7 +27,7 @@ #include "base/files/scoped_file.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) namespace content { class SandboxIPCHandler; } -@@ -121,7 +121,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -120,7 +120,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; --#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) // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -266,7 +266,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size --#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) , bool executable = false #endif diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 0e287f7202b7..0ad1585fc316 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,11 +1,11 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2020-07-07 21:57:30 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } --#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) // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = @@ -13,8 +13,8 @@ return region.PassPlatformHandle().fd; return ScopedFD(); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( @@ -22,8 +22,8 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size --#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) , bool executable #endif @@ -31,8 +31,8 @@ // flag. FilePath directory; if (!GetShmemTempDir( --#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) executable, #else false /* executable */, diff --git a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc index b2525b4381ee..1a73cb134a5c 100644 --- a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc +++ b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc @@ -1,4 +1,4 @@ ---- base/memory/shared_memory_region_unittest.cc.orig 2020-03-23 16:31:23 UTC +--- base/memory/shared_memory_region_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/shared_memory_region_unittest.cc @@ -188,10 +188,13 @@ TYPED_TEST(SharedMemoryRegionTest, MapAtNotAlignedOffs std::tie(region, rw_mapping) = CreateMappedRegion(kDataSize); diff --git a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc new file mode 100644 index 000000000000..a52248fa1ebc --- /dev/null +++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc @@ -0,0 +1,28 @@ +--- base/message_loop/message_pump_glib.cc.orig 2020-11-20 15:15:51 UTC ++++ base/message_loop/message_pump_glib.cc +@@ -8,6 +8,11 @@ + #include + #include + ++#if defined(OS_BSD) ++#include ++#include ++#endif ++ + #include "base/logging.h" + #include "base/numerics/safe_conversions.h" + #include "base/posix/eintr_wrapper.h" +@@ -48,9 +53,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti + } + + bool RunningOnMainThread() { ++#if defined(OS_BSD) ++ return pthread_main_np(); ++#else + auto pid = getpid(); + auto tid = PlatformThread::CurrentId(); + return pid > 0 && tid > 0 && pid == tid; ++#endif + } + + // A brief refresher on GLib: diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index ba6a16756b10..a01e74227fa9 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,4 +1,4 @@ ---- base/native_library_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/native_library_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/native_library_posix.cc @@ -29,7 +29,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc index f76c5f8fd986..51a1badf2d5b 100644 --- a/www/chromium/files/patch-base_native__library__unittest.cc +++ b/www/chromium/files/patch-base_native__library__unittest.cc @@ -1,6 +1,6 @@ ---- base/native_library_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/native_library_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/native_library_unittest.cc -@@ -120,7 +120,7 @@ TEST(NativeLibraryTest, LoadLibrary) { +@@ -118,7 +118,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // Android dlopen() requires further investigation, as it might vary across // versions with respect to symbol resolution scope. // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 diff --git a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h index c088ad9451d0..c6b968c45687 100644 --- a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h +++ b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h @@ -1,6 +1,6 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2019-09-09 21:55:05 UTC +--- base/numerics/safe_math_shared_impl.h.orig 2020-11-13 06:36:34 UTC +++ base/numerics/safe_math_shared_impl.h -@@ -23,8 +23,7 @@ +@@ -24,8 +24,7 @@ // Where available use builtin math overflow support on Clang and GCC. #elif !defined(__native_client__) && \ ((defined(__clang__) && \ diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc index 1a1b1bef1ebb..de693d8b3e30 100644 --- a/www/chromium/files/patch-base_path__service__unittest.cc +++ b/www/chromium/files/patch-base_path__service__unittest.cc @@ -1,11 +1,11 @@ ---- base/path_service_unittest.cc.orig 2020-07-07 21:57:30 UTC +--- base/path_service_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/path_service_unittest.cc -@@ -37,7 +37,7 @@ bool ReturnsValidPath(int dir_type) { +@@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) { if (dir_type == DIR_CACHE) check_path_exists = false; #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) // On the linux try-bots: a path is returned (e.g. /home/chrome-bot/Desktop), // but it doesn't exist. if (dir_type == DIR_USER_DESKTOP) diff --git a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc index 3b13c89d4813..c18e8b24aff5 100644 --- a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc +++ b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc @@ -1,4 +1,4 @@ ---- base/posix/can_lower_nice_to.cc.orig 2019-03-11 22:00:51 UTC +--- base/posix/can_lower_nice_to.cc.orig 2020-11-13 06:36:34 UTC +++ base/posix/can_lower_nice_to.cc @@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) { if (geteuid() == 0) diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index 8820cb063006..ab63f30e73d6 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket.cc.orig 2019-03-11 22:00:51 UTC +--- base/posix/unix_domain_socket.cc.orig 2020-11-13 06:36:34 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" @@ -7,11 +7,11 @@ +#include #include +#include -+#include ++#include a #if !defined(OS_NACL_NONSFI) #include #endif -@@ -28,6 +31,14 @@ namespace base { +@@ -29,6 +32,14 @@ namespace base { const size_t UnixDomainSocket::kMaxFileDescriptors = 16; @@ -26,16 +26,16 @@ #if !defined(OS_NACL_NONSFI) bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { int raw_socks[2]; -@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, - #if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) +@@ -151,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, + #if !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) // The PNaCl toolchain for Non-SFI binary build and macOS do not support // ucred. macOS supports xucred, but this structure is insufficient. - + CMSG_SPACE(sizeof(struct ucred)) + + CMSG_SPACE(sizeof(struct cmsgcred)) - #endif // OS_NACL_NONSFI or OS_MACOSX + #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) ; char control_buffer[kControlBufferSize]; -@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -181,9 +192,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { @@ -45,5 +45,5 @@ - pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; + pid = getpid(); } - #endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) + #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) } diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc index 0336334a6583..31ec32ebcdd9 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/posix/unix_domain_socket_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/posix/unix_domain_socket_unittest.cc @@ -8,6 +8,9 @@ #include diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc index abfff7cd44ce..78ad2a755e47 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,6 +1,6 @@ ---- base/process/internal_linux.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/internal_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/internal_linux.cc -@@ -29,7 +29,11 @@ namespace internal { +@@ -30,7 +30,11 @@ namespace internal { const char kProcDir[] = "/proc"; @@ -12,7 +12,7 @@ FilePath GetProcPidDir(pid_t pid) { return FilePath(kProcDir).Append(NumberToString(pid)); -@@ -64,6 +68,7 @@ bool ReadProcFile(const FilePath& file, std::string* b +@@ -66,6 +70,7 @@ bool ReadProcFile(const FilePath& file, std::string* b DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); return false; } @@ -20,7 +20,7 @@ return !buffer->empty(); } -@@ -79,6 +84,22 @@ bool ParseProcStats(const std::string& stats_data, +@@ -81,6 +86,22 @@ bool ParseProcStats(const std::string& stats_data, if (stats_data.empty()) return false; @@ -43,7 +43,7 @@ // The stat file is formatted as: // pid (process name) data1 data2 .... dataN // Look for the closing paren by scanning backwards, to avoid being fooled by -@@ -108,6 +129,7 @@ bool ParseProcStats(const std::string& stats_data, +@@ -110,6 +131,7 @@ bool ParseProcStats(const std::string& stats_data, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); for (const auto& i : other_stats) proc_stats->push_back(i); @@ -51,7 +51,7 @@ return true; } -@@ -155,7 +177,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro +@@ -157,7 +179,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro } int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) { @@ -63,7 +63,7 @@ return ReadStatFileAndGetFieldAsInt64(stat_file, field_num); } -@@ -171,6 +197,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, +@@ -173,6 +199,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, } Time GetBootTime() { @@ -73,7 +73,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -184,9 +213,13 @@ Time GetBootTime() { +@@ -186,9 +215,13 @@ Time GetBootTime() { if (!StringToInt(btime_it->second, &btime)) return Time(); return Time::FromTimeT(btime); @@ -87,7 +87,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -210,6 +243,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { +@@ -212,6 +245,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { return TimeDelta(); return ClockTicksToTimeDelta(user + nice); diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index bfa9c8630afd..94e172d31aa3 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,15 +1,15 @@ ---- base/process/internal_linux.h.orig 2020-03-16 18:39:41 UTC +--- base/process/internal_linux.h.orig 2020-11-13 06:36:34 UTC +++ base/process/internal_linux.h -@@ -14,6 +14,8 @@ - - #include "base/files/file_path.h" +@@ -18,6 +18,8 @@ + #include "base/strings/string_number_conversions.h" + #include "base/threading/platform_thread.h" +#include /* pid_t */ + namespace base { class Time; -@@ -50,6 +52,14 @@ bool ParseProcStats(const std::string& stats_data, +@@ -59,6 +61,14 @@ bool ParseProcStats(const std::string& stats_data, // If the ordering ever changes, carefully review functions that use these // values. enum ProcStatsFields { @@ -24,7 +24,7 @@ VM_COMM = 1, // Filename of executable, without parentheses. VM_STATE = 2, // Letter indicating the state of the process. VM_PPID = 3, // PID of the parent. -@@ -62,6 +72,7 @@ enum ProcStatsFields { +@@ -71,6 +81,7 @@ enum ProcStatsFields { VM_STARTTIME = 21, // The time the process started in clock ticks. VM_VSIZE = 22, // Virtual memory size in bytes. VM_RSS = 23, // Resident Set Size in pages. diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h index 2e871559c90e..81a2d28914ee 100644 --- a/www/chromium/files/patch-base_process_kill.h +++ b/www/chromium/files/patch-base_process_kill.h @@ -1,16 +1,16 @@ ---- base/process/kill.h.orig 2019-12-16 21:50:40 UTC +--- base/process/kill.h.orig 2020-11-13 06:36:34 UTC +++ base/process/kill.h -@@ -118,11 +118,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -113,11 +113,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); --#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) // Spawns a thread to wait asynchronously for the child |process| to exit // and then reaps it. BASE_EXPORT void EnsureProcessGetsReaped(Process process); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #endif // defined(OS_POSIX) // Registers |process| to be asynchronously monitored for termination, forcibly diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc index 69e4dbc6c05e..975a055cb51a 100644 --- a/www/chromium/files/patch-base_process_kill__posix.cc +++ b/www/chromium/files/patch-base_process_kill__posix.cc @@ -1,20 +1,20 @@ ---- base/process/kill_posix.cc.orig 2019-06-04 18:55:15 UTC +--- base/process/kill_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/kill_posix.cc -@@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) { +@@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); } --#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) void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); -@@ -179,7 +179,7 @@ void EnsureProcessGetsReaped(Process process) { +@@ -171,7 +171,7 @@ void EnsureProcessGetsReaped(Process process) { PlatformThread::CreateNonJoinable( 0, new BackgroundReaper(std::move(process), TimeDelta())); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #endif // !defined(OS_MACOSX) + #endif // !defined(OS_APPLE) #endif // !defined(OS_NACL_NONSFI) diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index bd174cd496bc..02727ceffbb8 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,11 +1,11 @@ ---- base/process/launch.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/launch.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/launch.cc @@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; LaunchOptions LaunchOptionsForTest() { LaunchOptions options; --#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) // To prevent accidental privilege sharing to an untrusted child, processes // are started with PR_SET_NO_NEW_PRIVS. Do not set that here, since this // new child will be used for testing only. diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 75708ea5561e..67808bf9ee1e 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,11 +1,11 @@ ---- base/process/launch.h.orig 2020-02-03 21:52:37 UTC +--- base/process/launch.h.orig 2020-11-13 06:36:34 UTC +++ base/process/launch.h @@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA --#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) // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will @@ -13,8 +13,17 @@ // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_MACOSX) && !defined(OS_IOS) + #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not +@@ -408,7 +408,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); + // binary. This should not be called in production/released code. + BASE_EXPORT LaunchOptions LaunchOptionsForTest(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) || defined(OS_BSD) + // A wrapper for clone with fork-like behavior, meaning that it returns the + // child's pid in the parent and 0 in the child. |flags|, |ptid|, and |ctid| are + // as in the clone system call (the CLONE_VM flag is not supported). diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index ce6054a8ff79..3fea66d7bfda 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,4 +1,4 @@ ---- base/process/launch_posix.cc.orig 2019-06-04 18:55:15 UTC +--- base/process/launch_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/launch_posix.cc @@ -65,6 +65,7 @@ #error "macOS should use launch_mac.cc" @@ -8,3 +8,32 @@ extern char** environ; namespace base { +@@ -228,6 +229,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap + DirReaderPosix fd_dir(kFDDir); + if (!fd_dir.IsValid()) { + // Fallback case: Try every possible fd. ++ ++#if defined(OS_FREEBSD) ++ // CEM: blast away most of the range with closefrom(). A common use case ++ // of this function only maps STDIN/STDOUT/STDERR and closefrom(3) is much ++ // cheaper than x00,000 close(2) invocations with a high RLIMIT_NOFILE. ++ // ++ // In the other caller, it is still very likely that the fds we care about ++ // are in relatively low number space and we can save hundreds of thousands ++ // of syscalls. ++ int max_valid_fd = -1; ++ for (size_t j = 0; j < saved_mapping.size(); j++) { ++ int fd = saved_mapping[j].dest; ++ if (fd > max_valid_fd) ++ max_valid_fd = fd; ++ } ++ if (max_valid_fd < STDERR_FILENO) ++ max_valid_fd = STDERR_FILENO; ++ ++ closefrom(max_valid_fd + 1); ++ max_fds = static_cast(max_valid_fd) + 1; ++#endif ++ + for (size_t i = 0; i < max_fds; ++i) { + const int fd = static_cast(i); + if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index 050320e9d7dc..5b6243421fee 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,6 +1,6 @@ ---- base/process/memory.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/memory.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/memory.cc -@@ -44,7 +44,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { +@@ -55,7 +55,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { } // namespace internal // Defined in memory_win.cc for Windows. @@ -9,12 +9,12 @@ namespace { -@@ -63,7 +63,7 @@ void TerminateBecauseOutOfMemory(size_t size) { +@@ -74,7 +74,7 @@ void TerminateBecauseOutOfMemory(size_t size) { #endif // !defined(OS_WIN) // Defined in memory_mac.mm for Mac. --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) bool UncheckedCalloc(size_t num_items, size_t size, void** result) { const size_t alloc_size = num_items * size; diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 007e8593b35d..203ced37f125 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,11 +1,11 @@ ---- base/process/memory.h.orig 2019-10-21 19:06:18 UTC +--- base/process/memory.h.orig 2020-11-13 06:36:34 UTC +++ base/process/memory.h @@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) BASE_EXPORT extern size_t g_oom_size; - // The maximum allowed value for the OOM score. diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 82dcfd37c1c7..f219ce1737a7 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,18 +1,66 @@ ---- base/process/memory_unittest.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/memory_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/memory_unittest.cc -@@ -106,7 +106,7 @@ TEST(MemoryTest, AllocatorShimWorking) { - // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan +@@ -38,6 +38,8 @@ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + #include + #include "base/test/malloc_wrapper.h" ++#elif defined(OS_BSD) ++#include "base/test/malloc_wrapper.h" + #endif + + #if defined(OS_WIN) +@@ -105,9 +107,9 @@ TEST(MemoryTest, AllocatorShimWorking) { + #endif + } + +-// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan ++// BSD does not support these tests. Don't test these on ASan/TSan/MSan // configurations: only test the real allocator. - // Windows only supports these tests with the allocator shim in place. -#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ +#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -589,5 +589,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { - EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); - EXPECT_TRUE(value_ == nullptr); +@@ -299,7 +301,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { + #endif // defined(OS_WIN) + #endif // !defined(OS_MAC) && !defined(OS_ANDROID) + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + TEST_F(OutOfMemoryDeathTest, Valloc) { + ASSERT_OOM_DEATH({ +@@ -345,7 +347,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { + value_ = MallocWrapper(test_size_); + }); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Android doesn't implement posix_memalign(). + #if defined(OS_POSIX) && !defined(OS_ANDROID) +@@ -496,7 +498,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep + #endif // OS_WIN + + #if defined(ARCH_CPU_32_BITS) && \ +- (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) + + void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t), + void (*free_fn)(void*)) { +@@ -554,7 +556,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) + [](size_t size) { return static_cast(new char[size]); }, + [](void* ptr) { delete[] static_cast(ptr); }); } --#endif // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && -+#endif // !defined(OS_BSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && +-#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || ++#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS)) + + // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these +@@ -616,5 +618,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { + + #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) + +-#endif // !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && ++#endif // !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 13812613f73f..6b50c9ec1e52 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,11 +1,11 @@ ---- base/process/process_handle.cc.orig 2019-10-21 19:06:18 UTC +--- base/process/process_handle.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_handle.cc -@@ -28,7 +28,7 @@ UniqueProcId GetUniqueIdForProcess() { +@@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { : UniqueProcId(GetCurrentProcId()); } --#if defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { DCHECK(pid_outside_of_namespace != kNullProcessId); diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index 502beff310e6..e323278cceb9 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -1,11 +1,11 @@ ---- base/process/process_handle.h.orig 2019-10-21 19:06:18 UTC +--- base/process/process_handle.h.orig 2020-11-13 06:36:34 UTC +++ base/process/process_handle.h @@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); --#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) // When a process is started in a different PID namespace from the browser // process, this function must be called with the process's PID in the browser's // PID namespace in order to initialize its unique ID. Not thread safe. diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index 13a07c3075fd..911926ae9833 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_freebsd.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle_freebsd.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_handle_freebsd.cc @@ -16,10 +16,13 @@ namespace base { diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index a89546ccb49d..6978712eb3bc 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_iterator_freebsd.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include diff --git a/www/chromium/files/patch-base_process_process__linux.cc b/www/chromium/files/patch-base_process_process__linux.cc index 3d7fab63a87b..1d8cfc75e2a1 100644 --- a/www/chromium/files/patch-base_process_process__linux.cc +++ b/www/chromium/files/patch-base_process_process__linux.cc @@ -1,16 +1,33 @@ ---- base/process/process_linux.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/process_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_linux.cc -@@ -80,6 +80,9 @@ Time Process::CreationTime() const { - internal::VM_STARTTIME) - : internal::ReadProcStatsAndGetFieldAsInt64( - Pid(), internal::VM_STARTTIME); +@@ -24,7 +24,9 @@ namespace base { + + namespace { + ++#if !defined(OS_BSD) + const int kForegroundPriority = 0; ++#endif + + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + // We are more aggressive in our lowering of background process priority +@@ -69,7 +71,7 @@ struct CGroups { + return groups; + } + }; +-#else ++#elif !defined(OS_BSD) + const int kBackgroundPriority = 5; + #endif // defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + +@@ -96,13 +98,18 @@ Time Process::CreationTime() const { + if (!start_ticks) + return Time(); + +#if defined(OS_BSD) + return Time::FromTimeT(start_ticks); +#else - if (!start_ticks) - return Time(); TimeDelta start_offset = internal::ClockTicksToTimeDelta(start_ticks); -@@ -87,8 +90,10 @@ Time Process::CreationTime() const { + Time boot_time = internal::GetBootTime(); if (boot_time.is_null()) return Time(); return Time(boot_time + start_offset); @@ -20,12 +37,12 @@ +#if !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { - #if defined(OS_CHROMEOS) -@@ -140,6 +145,7 @@ bool Process::SetProcessBackgrounded(bool background) + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) +@@ -154,6 +161,7 @@ bool Process::SetProcessBackgrounded(bool background) DPCHECK(result == 0); return result == 0; } +#endif // !defined(OS_BSD) - #if defined(OS_CHROMEOS) + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) bool IsProcessBackgroundedCGroup(const StringPiece& cgroup_contents) { diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 489d846f2778..7712b3ca8733 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,38 +1,38 @@ ---- base/process/process_metrics.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/process_metrics.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics.cc -@@ -58,7 +58,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -49,7 +49,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -76,7 +76,7 @@ std::unique_ptr SystemMetrics::ToValue() const +@@ -68,7 +68,7 @@ std::unique_ptr SystemMetrics::ToValue() const std::unique_ptr res(new DictionaryValue()); res->SetIntKey("committed_memory", static_cast(committed_memory_)); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) std::unique_ptr meminfo = memory_info_.ToValue(); std::unique_ptr vmstat = vmstat_info_.ToValue(); meminfo->MergeDictionary(vmstat.get()); -@@ -127,7 +127,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -119,7 +119,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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) || \ + defined(OS_AIX) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { - return CalculateEventsPerSecond(absolute_idle_wakeups, -@@ -139,7 +139,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -132,7 +132,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } --#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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) || + // defined(OS_AIX) - #if defined(OS_MACOSX) - int ProcessMetrics::CalculatePackageIdleWakeupsPerSecond( + #if defined(OS_APPLE) diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 420d563e5b29..bfd237e3f277 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,131 +1,163 @@ ---- base/process/process_metrics.h.orig 2019-10-21 19:06:18 UTC +--- base/process/process_metrics.h.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics.h -@@ -41,7 +41,7 @@ namespace base { +@@ -47,7 +47,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -51,7 +51,7 @@ struct PageFaultCounts { +@@ -57,7 +57,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -98,7 +98,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr CreateCurrentProcessMetrics(); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // 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; -@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -124,7 +124,7 @@ class BASE_EXPORT ProcessMetrics { + // will result in a time delta of 2 seconds/per 1 wall-clock second. + TimeDelta GetCumulativeCPUUsage(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) + // Emits the cumulative CPU usage for all currently active threads since they + // were started into the output parameter (replacing its current contents). +@@ -159,7 +159,7 @@ class BASE_EXPORT ProcessMetrics { + bool ParseProcTimeInState(const std::string& content, + PlatformThreadId tid, + TimeInStatePerThread& time_in_state_per_thread); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || + // defined(OS_AIX) + + // Returns the number of average idle cpu wakeups per second since the last +@@ -216,14 +216,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; // Minor and major page fault count as reported by /proc/[pid]/stat. // Returns true for success. bool GetPageFaultCounts(PageFaultCounts* counts) const; --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -235,7 +235,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); - #endif // !defined(OS_MACOSX) || defined(OS_IOS) + #endif // !defined(OS_MAC) --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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) || \ + defined(OS_AIX) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif - #if defined(OS_MACOSX) -@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -246,10 +246,10 @@ class BASE_EXPORT ProcessMetrics { + uint64_t absolute_package_idle_wakeups); + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) + CPU::CoreType GetCoreType(int core_index); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || + // defined(OS_AIX) + + #if defined(OS_WIN) +@@ -271,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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) || \ + defined(OS_AIX) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; - uint64_t last_absolute_idle_wakeups_; -@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -323,7 +323,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \ + defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on - // Windows, Mac, Linux, Android and Chrome OS. -@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -358,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) // 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 -@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -373,7 +373,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \ - defined(OS_FUCHSIA) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) || defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -383,7 +383,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || - // defined(OS_FUCHSIA) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || + // defined(OS_AIX) defined(OS_FUCHSIA) - #if defined(OS_CHROMEOS) -@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) +@@ -406,11 +406,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) +-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) defined(OS_ANDROID) || defined(OS_AIX) || + // defined(OS_FUCHSIA) --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. - // Exposed for testing. -@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -485,7 +485,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || + // defined(OS_AIX) - #if defined(OS_CHROMEOS) - // Data from files in directory /sys/block/zram0 about ZRAM usage. -@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics { + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) +@@ -597,7 +597,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) SystemMemoryInfoKB memory_info_; VmStatInfo vmstat_info_; SystemDiskInfo disk_info_; diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 1dc5323f3252..524b56b16e85 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,14 +1,17 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +--- base/process/process_metrics_freebsd.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics_freebsd.cc -@@ -5,6 +5,7 @@ +@@ -3,8 +3,10 @@ + // found in the LICENSE file. + #include "base/process/process_metrics.h" ++#include "base/notreached.h" #include +#include #include #include #include -@@ -14,11 +15,29 @@ +@@ -14,11 +16,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" @@ -40,7 +43,7 @@ // static std::unique_ptr ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +89,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index 04d68b92dcf2..46408ab62d44 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,8 +1,8 @@ ---- base/process/process_metrics_posix.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/process_metrics_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ - #if defined(OS_MACOSX) + #if defined(OS_APPLE) #include +#elif defined(OS_FREEBSD) +#include diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc index 3e5aac5b4da7..4054f8582e62 100644 --- a/www/chromium/files/patch-base_process_process__unittest.cc +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -1,11 +1,11 @@ ---- base/process/process_unittest.cc.orig 2019-03-18 19:16:37 UTC +--- base/process/process_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_unittest.cc -@@ -148,7 +148,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -153,7 +153,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = --#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) // On Linux, process creation time is relative to boot time which has a // 1-second resolution. Tolerate 1 second for the imprecise boot time and // 100 ms for the imprecise clock. diff --git a/www/chromium/files/patch-base_process_process__util__unittest.cc b/www/chromium/files/patch-base_process_process__util__unittest.cc index e6378dd51b22..37f708f1d1f3 100644 --- a/www/chromium/files/patch-base_process_process__util__unittest.cc +++ b/www/chromium/files/patch-base_process_process__util__unittest.cc @@ -1,16 +1,16 @@ ---- base/process/process_util_unittest.cc.orig 2020-03-23 15:26:12 UTC +--- base/process/process_util_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_util_unittest.cc @@ -1307,11 +1307,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); #endif // defined(OS_WIN) --#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) options.clone_flags = clone_flags; #else CHECK_EQ(0, clone_flags); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) EXPECT_TRUE(LaunchProcess(cmdline, options).IsValid()); write_pipe.Close(); diff --git a/www/chromium/files/patch-base_profiler_register__context.h b/www/chromium/files/patch-base_profiler_register__context.h index ea2c126353b4..79ee85b05e84 100644 --- a/www/chromium/files/patch-base_profiler_register__context.h +++ b/www/chromium/files/patch-base_profiler_register__context.h @@ -1,15 +1,15 @@ ---- base/profiler/register_context.h.orig 2020-03-16 18:39:41 UTC +--- base/profiler/register_context.h.orig 2020-11-13 06:36:34 UTC +++ base/profiler/register_context.h @@ -17,7 +17,7 @@ #include - #elif defined(OS_MACOSX) + #elif defined(OS_APPLE) #include --#elif defined(OS_ANDROID) || defined(OS_LINUX) -+#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #endif -@@ -165,6 +165,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc +@@ -190,6 +190,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc } #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc index 96db1204abdd..ec7f92d52984 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,11 +1,11 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2020-02-07 10:24:19 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -7,7 +7,7 @@ namespace base { SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return {PlatformThread::CurrentId(), pthread_self()}; #else return {PlatformThread::CurrentId()}; diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h index 589e083be74d..c36c1078ab26 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,11 +1,11 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2020-02-07 10:24:33 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2020-11-13 06:36:34 UTC +++ base/profiler/sampling_profiler_thread_token.h @@ -9,7 +9,7 @@ #include "base/threading/platform_thread.h" #include "build/build_config.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #endif @@ -13,8 +13,8 @@ // functions used to obtain the stack base address. struct SamplingProfilerThreadToken { PlatformThreadId id; --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) pthread_t pthread_id; #endif }; diff --git a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc index fcbc9bacbce2..47eefaa173d1 100644 --- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc +++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_copier_signal.cc.orig 2020-05-13 18:40:16 UTC +--- base/profiler/stack_copier_signal.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ @@ -15,7 +15,7 @@ #include #include #include -@@ -33,8 +40,13 @@ class AsyncSafeWaitableEvent { +@@ -34,8 +41,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = @@ -29,7 +29,7 @@ if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -44,8 +56,12 @@ class AsyncSafeWaitableEvent { +@@ -45,8 +57,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -215,11 +231,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -216,11 +232,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index 5547d3a09a32..29ebf0d0b33e 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-07-13 13:09:53 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -23,7 +23,7 @@ +@@ -32,7 +32,7 @@ // Fortunately, it provides _alloca, which functions identically. #include #define alloca _alloca diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 19b34c4fe031..5f14491af9cc 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include #include #include diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc index 74d564e70740..849d40187045 100644 --- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,16 +1,16 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2020-05-13 18:39:35 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -9,6 +9,9 @@ +@@ -12,6 +12,9 @@ + #include "base/profiler/thread_delegate_posix.h" #include "base/stl_util.h" - #include "build/build_config.h" +#if defined(OS_FREEBSD) +#include +#endif - namespace base { - -@@ -17,7 +20,12 @@ namespace { + #if defined(OS_ANDROID) + #include "base/files/file_util.h" +@@ -43,7 +46,12 @@ base::Optional GetAndroidMainThreadStackBas uintptr_t GetThreadStackBaseAddressImpl( SamplingProfilerThreadToken thread_token) { pthread_attr_t attr; @@ -23,7 +23,7 @@ // See crbug.com/617730 for limitations of this approach on Linux. void* address; size_t size; -@@ -93,16 +101,33 @@ std::vector ThreadDelegatePosix::GetRegist +@@ -130,16 +138,33 @@ std::vector ThreadDelegatePosix::GetRegist return { // Return the set of callee-save registers per the i386 System V ABI // section 2.2.3, plus the stack pointer. @@ -57,7 +57,7 @@ reinterpret_cast(&thread_context->gregs[REG_RBP]), reinterpret_cast(&thread_context->gregs[REG_RBX]), reinterpret_cast(&thread_context->gregs[REG_R12]), -@@ -110,6 +135,7 @@ std::vector ThreadDelegatePosix::GetRegist +@@ -147,6 +172,7 @@ std::vector ThreadDelegatePosix::GetRegist reinterpret_cast(&thread_context->gregs[REG_R14]), reinterpret_cast(&thread_context->gregs[REG_R15]), reinterpret_cast(&thread_context->gregs[REG_RSP]), diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc index 44e3b0aae8ef..63a4e3b68dd8 100644 --- a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -1,6 +1,6 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-09-09 21:55:05 UTC +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2020-11-13 06:36:34 UTC +++ base/sampling_heap_profiler/sampling_heap_profiler.cc -@@ -29,6 +29,10 @@ +@@ -30,6 +30,10 @@ #include #endif @@ -10,9 +10,9 @@ + #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ defined(OFFICIAL_BUILD) - #include "base/trace_event/cfi_backtrace_android.h" -@@ -64,6 +68,10 @@ const char* GetAndLeakThreadName() { - #elif defined(OS_MACOSX) + #include "base/trace_event/cfi_backtrace_android.h" // no-presubmit-check +@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { + #elif defined(OS_APPLE) int err = pthread_getname_np(pthread_self(), name, kBufferLen); if (err == 0 && *name != '\0') + return strdup(name); @@ -20,5 +20,5 @@ + pthread_get_name_np(pthread_self(), name, kBufferLen); + if (*name != '\0') return strdup(name); - #endif // defined(OS_LINUX) || defined(OS_ANDROID) + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index 7db1096b3d49..132ea807512e 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,11 +1,28 @@ ---- base/security_unittest.cc.orig 2020-07-07 21:57:30 UTC +--- base/security_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/security_unittest.cc -@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu - // FAILS_ is too clunky. +@@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_NACL) + #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +- defined(OS_APPLE) ++ defined(OS_APPLE) || defined(OS_BSD) // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't // fail the test, but report. printf("Platform has overflow: %s\n", +@@ -123,7 +123,7 @@ TEST(SecurityTest, MAYBE_NewOverflow) { + #endif // !defined(OS_WIN) || !defined(ARCH_CPU_64_BITS) + } + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(__x86_64__) + // Check if ptr1 and ptr2 are separated by less than size chars. + bool ArePointersToSameArea(void* ptr1, void* ptr2, size_t size) { + ptrdiff_t ptr_diff = reinterpret_cast(std::max(ptr1, ptr2)) - +@@ -177,6 +177,6 @@ TEST(SecurityTest, MALLOC_OVERFLOW_TEST(RandomMemoryAl + EXPECT_FALSE(impossible_random_address); + } + +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(__x86_64__) + + } // namespace diff --git a/www/chromium/files/patch-base_stl__util.h b/www/chromium/files/patch-base_stl__util.h deleted file mode 100644 index b203dbd723ef..000000000000 --- a/www/chromium/files/patch-base_stl__util.h +++ /dev/null @@ -1,47 +0,0 @@ ---- base/stl_util.h.orig 2020-05-18 14:07:28 UTC -+++ base/stl_util.h -@@ -561,14 +561,6 @@ size_t EraseIf(std::vector& container, P - return removed; - } - --template --size_t Erase(std::forward_list& container, const Value& value) { -- // Unlike std::forward_list::remove, this function template accepts -- // heterogeneous types and does not force a conversion to the container's -- // value type before invoking the == operator. -- return EraseIf(container, [&](const T& cur) { return cur == value; }); --} -- - template - size_t EraseIf(std::forward_list& container, Predicate pred) { - // Note: std::forward_list does not have a size() API, thus we need to use the -@@ -580,10 +572,10 @@ size_t EraseIf(std::forward_list& contai - } - - template --size_t Erase(std::list& container, const Value& value) { -- // Unlike std::list::remove, this function template accepts heterogeneous -- // types and does not force a conversion to the container's value type before -- // invoking the == operator. -+size_t Erase(std::forward_list& container, const Value& value) { -+ // Unlike std::forward_list::remove, this function template accepts -+ // heterogeneous types and does not force a conversion to the container's -+ // value type before invoking the == operator. - return EraseIf(container, [&](const T& cur) { return cur == value; }); - } - -@@ -592,6 +584,14 @@ size_t EraseIf(std::list& container, Pre - size_t old_size = container.size(); - container.remove_if(pred); - return old_size - container.size(); -+} -+ -+template -+size_t Erase(std::list& container, const Value& value) { -+ // Unlike std::list::remove, this function template accepts heterogeneous -+ // types and does not force a conversion to the container's value type before -+ // invoking the == operator. -+ return EraseIf(container, [&](const T& cur) { return cur == value; }); - } - - template diff --git a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc new file mode 100644 index 000000000000..c05afd11e6c2 --- /dev/null +++ b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc @@ -0,0 +1,19 @@ +--- base/strings/sys_string_conversions_unittest.cc.orig 2020-11-16 14:00:26 UTC ++++ base/strings/sys_string_conversions_unittest.cc +@@ -76,7 +76,7 @@ TEST(SysStrings, SysUTF8ToWide) { + } + + // Tests depend on setting a specific Linux locale. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + TEST(SysStrings, SysWideToNativeMB) { + #if !defined(SYSTEM_NATIVE_UTF8) + ScopedLocale locale("en_US.UTF-8"); +@@ -191,6 +191,6 @@ TEST(SysStrings, SysNativeMBAndWide) { + EXPECT_EQ(wide, trip); + } + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + } // namespace base diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index 0b0f9b3ce953..ba9ba2a6221b 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,12 +1,15 @@ ---- base/synchronization/lock_impl.h.orig 2020-07-07 21:58:11 UTC +--- base/synchronization/lock_impl.h.orig 2020-11-13 06:36:34 UTC +++ base/synchronization/lock_impl.h -@@ -69,10 +69,13 @@ void LockImpl::Unlock() { - ::ReleaseSRWLockExclusive(reinterpret_cast(&native_handle_)); +@@ -105,6 +105,8 @@ void LockImpl::Unlock() { } + #elif defined(OS_POSIX) || defined(OS_FUCHSIA) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wthread-safety-analysis" - void LockImpl::Unlock() { + + bool LockImpl::Try() { + int rv = pthread_mutex_trylock(&native_handle_); +@@ -116,6 +118,7 @@ void LockImpl::Unlock() { int rv = pthread_mutex_unlock(&native_handle_); DCHECK_EQ(rv, 0) << ". " << strerror(rv); } diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc index d719219ca50b..6df3281f7cf2 100644 --- a/www/chromium/files/patch-base_syslog__logging.cc +++ b/www/chromium/files/patch-base_syslog__logging.cc @@ -1,20 +1,20 @@ ---- base/syslog_logging.cc.orig 2019-10-21 19:06:18 UTC +--- base/syslog_logging.cc.orig 2020-11-13 06:36:34 UTC +++ base/syslog_logging.cc -@@ -14,7 +14,7 @@ - #include "base/debug/stack_trace.h" +@@ -13,7 +13,7 @@ #include "base/strings/string_util.h" + #include "base/win/scoped_handle.h" #include "base/win/win_util.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include -@@ -113,7 +113,7 @@ EventLogMessage::~EventLogMessage() { +@@ -134,7 +134,7 @@ EventLogMessage::~EventLogMessage() { if (user_sid != nullptr) ::LocalFree(user_sid); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kEventSource[] = "chrome"; openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER); // We can't use the defined names for the logging severity from syslog.h diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index acf115c95c91..f5ba828fa6e0 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info.cc.orig 2020-06-25 12:19:57 UTC +--- base/system/sys_info.cc.orig 2020-11-13 06:36:34 UTC +++ base/system/sys_info.cc -@@ -102,7 +102,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback #include "base/notreached.h" ++#include "base/process/process_metrics.h" +#include "base/strings/string_util.h" namespace base { @@ -53,6 +54,14 @@ +} + // static ++int64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { ++ int64_t res_kb = info.available != 0 ++ ? info.available - info.active_file ++ : info.free + info.reclaimable + info.inactive_file; ++ return res_kb * 1024; ++} ++ ++// static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 5b79b03dce8a..87f69159c3cd 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2019-09-09 21:55:05 UTC +--- base/system/sys_info_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/system/sys_info_posix.cc -@@ -220,6 +220,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -223,6 +223,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc new file mode 100644 index 000000000000..d77d55ffd491 --- /dev/null +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -0,0 +1,46 @@ +--- base/system/sys_info_unittest.cc.orig 2020-11-16 14:01:04 UTC ++++ base/system/sys_info_unittest.cc +@@ -50,13 +50,13 @@ TEST_F(SysInfoTest, AmountOfMem) { + EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #define MAYBE_AmountOfAvailablePhysicalMemory \ + DISABLED_AmountOfAvailablePhysicalMemory + #else + #define MAYBE_AmountOfAvailablePhysicalMemory AmountOfAvailablePhysicalMemory +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) { + // Note: info is in _K_bytes. + SystemMemoryInfoKB info; +@@ -87,7 +87,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem + EXPECT_GT(amount, static_cast(info.free) * 1024); + EXPECT_LT(amount / 1024, info.total); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSDD) + + #if defined(OS_FUCHSIA) + // TODO(crbug.com/851734): Implementation depends on statvfs, which is not +@@ -117,7 +117,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfTotalDiskSpace) { + EXPECT_GT(SysInfo::AmountOfTotalDiskSpace(tmp_path), 0) << tmp_path.value(); + } + +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) + TEST_F(SysInfoTest, OperatingSystemVersionNumbers) { + int32_t os_major_version = -1; +@@ -178,7 +178,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { + EXPECT_TRUE(IsStringUTF8(hardware_info->model)); + bool empty_result_expected = + #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + false; + #else + true; diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 92b120193ada..2b31585fd9f1 100644 --- a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,8 +1,8 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2019-07-29 13:26:54 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/task/thread_pool/environment_config_unittest.cc @@ -14,7 +14,7 @@ namespace internal { TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) + #if defined(OS_WIN) || defined(OS_APPLE) EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); -#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ +#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index c2b8e3134a48..b19569faecac 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2020-07-13 15:42:25 UTC +--- base/test/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ base/test/BUILD.gn -@@ -408,7 +408,11 @@ if (is_linux) { +@@ -415,7 +415,11 @@ if (is_linux || is_chromeos) { copy("fonts_conf") { sources = [ "fonts.conf" ] diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index e205455fbc37..f688a93a4820 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2020-07-07 21:58:11 UTC +--- base/test/launcher/test_launcher.cc.orig 2020-11-13 06:36:34 UTC +++ base/test/launcher/test_launcher.cc -@@ -55,6 +55,7 @@ +@@ -58,6 +58,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) @@ -8,12 +8,21 @@ #include #include "base/files/file_descriptor_watcher_posix.h" -@@ -557,7 +558,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -588,7 +589,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #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) options.kill_on_parent_death = true; #endif +@@ -1529,7 +1530,7 @@ bool TestLauncher::Init(CommandLine* command_line) { + results_tracker_.AddGlobalTag("OS_IOS"); + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + results_tracker_.AddGlobalTag("OS_LINUX"); + #endif + diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc index c48082540b08..07fa4b159c80 100644 --- a/www/chromium/files/patch-base_test_test__file__util__posix.cc +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -1,11 +1,11 @@ ---- base/test/test_file_util_posix.cc.orig 2020-07-07 21:57:30 UTC +--- base/test/test_file_util_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/test/test_file_util_posix.cc -@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() { +@@ -87,7 +87,7 @@ void SyncPageCacheToDisk() { sync(); } --#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_APPLE) && \ ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_APPLE) && !defined(OS_BSD) && \ + !defined(OS_ANDROID) bool EvictFileFromSystemCache(const FilePath& file) { // There doesn't seem to be a POSIX way to cool the disk cache. - NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index 3afe0098808a..b9f1034ae5ac 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,37 +1,37 @@ ---- base/test/test_suite.cc.orig 2020-05-13 18:39:35 UTC +--- base/test/test_suite.cc.orig 2020-11-13 06:36:34 UTC +++ base/test/test_suite.cc -@@ -69,7 +69,7 @@ - #include "base/test/test_support_ios.h" +@@ -66,7 +66,7 @@ + #include "base/test/test_support_android.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 "base/test/fontconfig_util_linux.h" #endif -@@ -385,14 +385,14 @@ void TestSuite::PreInitialize() { +@@ -382,14 +382,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); --#if defined(OS_LINUX) && defined(USE_AURA) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) // When calling native char conversion functions (e.g wrctomb) we need to // have the locale set. In the absence of such a call the "C" locale is the // default. In the gtk code (below) gtk_init() implicitly sets a locale. setlocale(LC_ALL, ""); // We still need number to string conversions to be locale insensitive. setlocale(LC_NUMERIC, "C"); --#endif // defined(OS_LINUX) && defined(USE_AURA) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -623,7 +623,7 @@ void TestSuite::Initialize() { +@@ -650,7 +650,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); --#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) SetUpFontconfig(); #endif diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn index 67042d6ca3e5..b7bd8c4fd45a 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -1,11 +1,11 @@ ---- base/third_party/libevent/BUILD.gn.orig 2019-03-11 22:00:51 UTC +--- base/third_party/libevent/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ base/third_party/libevent/BUILD.gn @@ -43,13 +43,20 @@ static_library("libevent") { "mac/event-config.h", ] include_dirs = [ "mac" ] -- } else if (is_linux) { -+ } else if (is_linux && !is_bsd) { +- } else if (is_linux || is_chromeos) { ++ } else if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "epoll.c", "linux/config.h", @@ -13,7 +13,7 @@ ] include_dirs = [ "linux" ] + } else if (is_bsd) { -+ sources += [ ++ sources += [ + "kqueue.c", + "freebsd/config.h", + "freebsd/event-config.h", diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index 0ff2fc68f36a..a75b61323372 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC +--- base/threading/platform_thread.h.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread.h -@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread { +@@ -230,7 +230,7 @@ class BASE_EXPORT PlatformThread { + // Returns a realtime period provided by |delegate|. + static TimeDelta GetRealtimePeriod(Delegate* delegate); - static ThreadPriority GetCurrentThreadPriority(); - --#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) // Toggles a specific thread's priority at runtime. This can be used to // change the priority of a thread in a different process and will fail // if the calling process does not have proper permissions. The diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h new file mode 100644 index 000000000000..5bcd713380b3 --- /dev/null +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h @@ -0,0 +1,18 @@ +--- base/threading/platform_thread_internal_posix.h.orig 2020-11-16 17:28:09 UTC ++++ base/threading/platform_thread_internal_posix.h +@@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit + // of CanIncreaseThreadPriority(). + Optional GetCurrentThreadPriorityForPlatform(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Current thread id is cached in thread local storage for performance reasons. + // In some rare cases it's important to clear that cache explicitly (e.g. after + // going through clone() syscall which does not call pthread_atfork() + // handlers). + BASE_EXPORT void ClearTidCache(); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + } // namespace internal + diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index 78123188b58a..ffb57676d50a 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_linux.cc.orig 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread_linux.cc -@@ -18,7 +18,9 @@ +@@ -24,7 +24,9 @@ #if !defined(OS_NACL) && !defined(OS_AIX) #include @@ -10,7 +10,7 @@ #include #include #include -@@ -99,7 +101,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN +@@ -264,7 +266,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN Optional CanIncreaseCurrentThreadPriorityForPlatform( ThreadPriority priority) { @@ -19,7 +19,7 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). struct rlimit rlim; -@@ -141,7 +143,7 @@ Optional GetCurrentThreadPriorityForPl +@@ -314,7 +316,7 @@ Optional GetCurrentThreadPriorityForPl void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index e2681e175e63..459b2c3b0328 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,11 +1,54 @@ ---- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread_posix.cc -@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) { - if (!thread_params->joinable) - base::ThreadRestrictions::SetSingletonAllowed(false); - --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) - // Threads on linux/android may inherit their priority from the thread - // where they were created. This explicitly sets the priority of all new - // threads. +@@ -32,6 +32,10 @@ + #include + #endif + ++#if defined(OS_BSD) ++#include ++#endif ++ + #if defined(OS_FUCHSIA) + #include + #else +@@ -141,7 +145,7 @@ bool CreateThread(size_t stack_size, + return success; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Store the thread ids in local storage since calling the SWI can + // expensive and PlatformThread::CurrentId is used liberally. Clear +@@ -159,11 +163,11 @@ class InitAtFork { + InitAtFork() { pthread_atfork(nullptr, nullptr, internal::ClearTidCache); } + }; + +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSSD) + + } // namespace + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + namespace internal { + +@@ -173,7 +177,7 @@ void ClearTidCache() { + + } // namespace internal + +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // static + PlatformThreadId PlatformThread::CurrentId() { +@@ -181,6 +185,8 @@ PlatformThreadId PlatformThread::CurrentId() { + // into the kernel. + #if defined(OS_APPLE) + return pthread_mach_thread_np(pthread_self()); ++#elif defined(OS_BSD) ++ return pthread_getthreadid_np(); + #elif defined(OS_LINUX) || defined(OS_CHROMEOS) + static NoDestructor init_at_fork; + if (g_thread_id == -1) { diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index b998b2d83f2c..4a1997aa7402 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,20 +1,24 @@ ---- base/threading/platform_thread_unittest.cc.orig 2020-03-23 15:31:47 UTC +--- base/threading/platform_thread_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread_unittest.cc -@@ -302,7 +302,7 @@ TEST(PlatformThreadTest, +@@ -311,7 +311,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanIncreaseThreadPriority) { --#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) // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -398,7 +398,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -405,9 +405,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { + TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); - #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(THREAD_SANITIZER)) || \ -+ ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(THREAD_SANITIZER)) || \ +-#if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ +- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ +- !defined(THREAD_SANITIZER)) || \ ++#if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ ++ ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ ++ !defined(THREAD_SANITIZER)) || \ (defined(OS_ANDROID) && !defined(ADDRESS_SANITIZER)) EXPECT_EQ(0u, stack_size); #else diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc index 43c62689cd83..755f30ed7957 100644 --- a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc +++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/scoped_blocking_call_unittest.cc.orig 2020-07-13 13:43:07 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/scoped_blocking_call_unittest.cc @@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } @@ -9,3 +9,12 @@ internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + internal::IOJankMonitoringWindow::kIOJankInterval * 5; +@@ -530,7 +530,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh + // First one starting at 10 seconds (can't start later than that or we'll trip + // the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle() + // with pending blocked tasks). +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // https://crbug.com/1071166 + #define MAYBE_MultiThreadedOverlappedWindows \ + DISABLED_MultiThreadedOverlappedWindows diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index 65da82eaa5d9..de0f014549d6 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2020-07-07 21:57:30 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/thread_task_runner_handle.cc @@ -8,6 +8,7 @@ #include diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc new file mode 100644 index 000000000000..7aa69a9a96ed --- /dev/null +++ b/www/chromium/files/patch-base_time_time__unittest.cc @@ -0,0 +1,18 @@ +--- base/time/time_unittest.cc.orig 2020-11-16 17:58:27 UTC ++++ base/time/time_unittest.cc +@@ -1969,6 +1969,7 @@ TEST(TimeDelta, Overflows) { + EXPECT_TRUE((kLargeDelta / 0.5).is_max()); + EXPECT_TRUE((kLargeDelta / -0.5).is_min()); + ++#if !defined(OS_BSD) + static_assert( + TimeDelta::Max() / kOneSecond == std::numeric_limits::infinity(), + ""); +@@ -1997,6 +1998,7 @@ TEST(TimeDelta, Overflows) { + static_assert(TimeDelta::Max() % -kOneSecond == TimeDelta::Max(), ""); + static_assert(TimeDelta::Min() % kOneSecond == TimeDelta::Min(), ""); + static_assert(TimeDelta::Min() % -kOneSecond == TimeDelta::Min(), ""); ++#endif + + // Division by zero. + static_assert((kOneSecond / 0).is_max(), ""); diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index fef6ba833abf..411d0893d684 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,8 +1,8 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2020-03-16 18:39:41 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2020-11-13 06:36:34 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ - #if defined(OS_MACOSX) + #if defined(OS_APPLE) #include +#elif defined(OS_BSD) +#include diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index 6624e1d04af6..f7ca678e981c 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,11 +1,11 @@ ---- base/trace_event/process_memory_dump.cc.orig 2019-03-11 22:00:51 UTC +--- base/trace_event/process_memory_dump.cc.orig 2020-11-13 06:36:34 UTC +++ base/trace_event/process_memory_dump.cc -@@ -94,7 +94,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta +@@ -95,7 +95,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta #if defined(OS_WIN) std::unique_ptr vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); --#elif defined(OS_MACOSX) -+#elif defined(OS_MACOSX) || defined(OS_BSD) +-#elif defined(OS_APPLE) ++#elif defined(OS_APPLE) || defined(OS_BSD) std::unique_ptr vec(new char[max_vec_size]); #elif defined(OS_POSIX) || defined(OS_FUCHSIA) std::unique_ptr vec(new unsigned char[max_vec_size]); diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.h b/www/chromium/files/patch-base_trace__event_process__memory__dump.h index 1ae1b93e6409..dea3b589c4d3 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.h +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.h @@ -1,4 +1,4 @@ ---- base/trace_event/process_memory_dump.h.orig 2019-03-11 22:00:51 UTC +--- base/trace_event/process_memory_dump.h.orig 2020-11-13 06:36:34 UTC +++ base/trace_event/process_memory_dump.h @@ -22,7 +22,7 @@ diff --git a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc new file mode 100644 index 000000000000..6f4603a02a7e --- /dev/null +++ b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc @@ -0,0 +1,20 @@ +--- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig 2020-11-16 14:03:42 UTC ++++ base/util/memory_pressure/system_memory_pressure_evaluator.cc +@@ -14,7 +14,7 @@ + #elif defined(OS_WIN) + #include "base/util/memory_pressure/system_memory_pressure_evaluator_win.h" + #include "base/win/windows_version.h" +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "base/util/memory_pressure/system_memory_pressure_evaluator_linux.h" + #endif + +@@ -45,7 +45,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval + evaluator->CreateOSSignalPressureEvaluator(monitor->CreateVoter()); + } + return evaluator; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return std::make_unique( + monitor->CreateVoter()); + #endif diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 72706cf4aaef..18dad57ca637 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,17 +1,17 @@ ---- build/config/BUILD.gn.orig 2020-05-13 18:39:35 UTC +--- build/config/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/BUILD.gn @@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } -- } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { -+ } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { +- } else if ((is_linux || is_chromeos) && current_cpu == "x64" && enable_iterator_debugging) { ++ } else if ((is_linux || is_chromeos || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? @@ -231,9 +231,7 @@ config("default_libs") { ] - } else if (is_linux) { + } else if (is_linux || is_chromeos) { libs = [ - "dl", "pthread", @@ -23,8 +23,8 @@ "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] -- } else if (is_linux || is_android || current_os == "aix") { -+ } else if (is_linux || is_bsd || is_android || current_os == "aix") { +- } else if (is_linux || is_chromeos || is_android || current_os == "aix") { ++ } else if (is_linux || is_bsd || is_chromeos || is_android || current_os == "aix") { configs += [ "//build/config/gcc:executable_config" ] if (is_chromecast) { configs += [ "//build/config/chromecast:executable_config" ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index 7c6d307fbd22..e38336dcdf13 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/BUILDCONFIG.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/BUILDCONFIG.gn @@ -131,10 +131,10 @@ declare_args() { is_official_build = false @@ -33,16 +33,16 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -288,10 +288,11 @@ is_android = current_os == "android" +@@ -285,10 +285,11 @@ if (custom_toolchain != "") { + # current_os value directly. + + is_android = current_os == "android" ++is_bsd = current_os == "freebsd" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" --is_linux = current_os == "chromeos" || current_os == "linux" -+is_linux = current_os == "chromeos" || current_os == "linux" || current_os == "freebsd" +-is_linux = current_os == "linux" ++is_linux = current_os == "linux" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" is_win = current_os == "win" || current_os == "winuwp" -+is_bsd = current_os == "freebsd" - - is_posix = !is_win && !is_fuchsia - diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 732c4ac683d7..fc8c2c97e48c 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,24 +1,24 @@ ---- build/config/compiler/BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- build/config/compiler/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/compiler/BUILD.gn -@@ -133,7 +133,7 @@ declare_args() { - # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. - # 'use_xcode_clang' may call old clang. - init_stack_vars = -- !is_android && !use_xcode_clang && (!is_official_build || is_linux) -+ !is_android && !use_xcode_clang && (!is_official_build || is_linux) && !is_bsd +@@ -128,7 +128,7 @@ declare_args() { + # + # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may + # call an old clang that doesn't support auto-init. +- init_stack_vars = !is_android && !use_xcode_clang ++ init_stack_vars = !is_android && !use_xcode_clang && !is_bsd # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -287,7 +287,7 @@ config("compiler") { +@@ -291,7 +291,7 @@ config("compiler") { } # Linker warnings. -- if (fatal_linker_warnings && !is_mac && !is_ios && current_os != "aix") { -+ if (fatal_linker_warnings && !is_mac && !is_ios && !is_bsd && current_os != "aix") { +- if (fatal_linker_warnings && !is_apple && current_os != "aix") { ++ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { ldflags += [ "-Wl,--fatal-warnings" ] } - if (fatal_linker_warnings && (is_mac || is_ios)) { -@@ -381,7 +381,7 @@ config("compiler") { + if (fatal_linker_warnings && is_apple && +@@ -389,7 +389,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,16 +27,16 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -472,7 +472,7 @@ config("compiler") { +@@ -480,7 +480,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } - if (is_clang && !is_nacl && !use_xcode_clang) { + if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { - cflags += [ "-fcrash-diagnostics-dir=" + - rebase_path("//tools/clang/crashreports", root_build_dir) ] + cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] -@@ -735,7 +735,7 @@ config("compiler_cpu_abi") { + cflags += [ +@@ -776,7 +776,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1085,7 +1085,7 @@ config("compiler_deterministic") { +@@ -1129,7 +1129,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,8 +54,8 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1476,7 +1476,7 @@ config("default_warnings") { - cflags += [ "-Wno-max-tokens" ] +@@ -1512,7 +1512,7 @@ config("default_warnings") { + cflags += [ "-Wno-nonportable-include-path" ] } - if (current_toolchain == host_toolchain || !use_xcode_clang) { @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1638,7 +1638,7 @@ config("no_chromium_code") { +@@ -1686,7 +1686,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] @@ -72,16 +72,16 @@ cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1716,7 +1716,7 @@ config("thin_archive") { +@@ -1764,7 +1764,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). -- if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { -+ if ((is_posix && !is_nacl && !is_mac && !is_ios && !is_bsd) || is_fuchsia) { +- if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { ++ if ((is_posix && !is_nacl && !is_apple && !is_bsd) || is_fuchsia) { arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2246,7 +2246,7 @@ config("symbols") { +@@ -2297,7 +2297,7 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { @@ -89,11 +89,11 @@ + cflags += [ "-g0" ] } - if (is_clang && !is_nacl && !use_xcode_clang) { -@@ -2274,7 +2274,7 @@ config("symbols") { + # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. +@@ -2339,7 +2339,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && + if (!is_apple && !is_nacl && current_cpu != "x86" && - (use_gold || use_lld)) { + (use_gold || use_lld) && !is_bsd) { if (is_clang) { diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 32358d823ffa..b49ed2337d43 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2020-07-07 21:58:11 UTC +--- build/config/compiler/compiler.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/compiler/compiler.gni -@@ -176,7 +176,7 @@ declare_args() { +@@ -192,7 +192,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index c98a61186fa9..247dd9c8c76f 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,11 +1,11 @@ ---- build/config/features.gni.orig 2019-10-21 19:06:18 UTC +--- build/config/features.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/features.gni @@ -26,7 +26,7 @@ declare_args() { proprietary_codecs = is_chrome_branded || is_chromecast # libudev usage. This currently only affects the content layer. -- use_udev = is_linux && !is_chromecast -+ use_udev = is_linux && !is_chromecast && !is_bsd +- use_udev = (is_linux || is_chromeos) && !is_chromecast ++ use_udev = (is_linux || is_chromeos) && !is_chromecast && !is_bsd - use_dbus = is_linux && !is_chromecast + use_dbus = (is_linux || is_chromeos) && !is_chromecast diff --git a/www/chromium/files/patch-build_config_freetype_freetype.gni b/www/chromium/files/patch-build_config_freetype_freetype.gni index 17bed01510f8..6431f9760dd8 100644 --- a/www/chromium/files/patch-build_config_freetype_freetype.gni +++ b/www/chromium/files/patch-build_config_freetype_freetype.gni @@ -1,4 +1,4 @@ ---- build/config/freetype/freetype.gni.orig 2019-03-18 08:59:45 UTC +--- build/config/freetype/freetype.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/freetype/freetype.gni @@ -10,5 +10,5 @@ declare_args() { # than version 2.7.1 and have color bitmap support compiled in. WARNING: diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn index e1ce0cbb1905..bc9748b2552c 100644 --- a/www/chromium/files/patch-build_config_linux_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/linux/BUILD.gn.orig 2020-05-13 18:39:36 UTC +--- build/config/linux/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/linux/BUILD.gn @@ -30,7 +30,7 @@ config("runtime_library") { diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index 8a2865a024c0..3ac955321e36 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,4 +1,4 @@ ---- build/config/linux/pkg-config.py.orig 2019-07-24 18:58:02 UTC +--- build/config/linux/pkg-config.py.orig 2020-11-13 06:36:34 UTC +++ build/config/linux/pkg-config.py @@ -59,8 +59,12 @@ def SetConfigPath(options): print("You must specify an architecture via -a if using a sysroot.") diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni index 8b68404769fb..9e340d8b8801 100644 --- a/www/chromium/files/patch-build_config_sysroot.gni +++ b/www/chromium/files/patch-build_config_sysroot.gni @@ -1,4 +1,4 @@ ---- build/config/sysroot.gni.orig 2020-05-13 18:39:36 UTC +--- build/config/sysroot.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/sysroot.gni @@ -21,9 +21,9 @@ declare_args() { diff --git a/www/chromium/files/patch-build_detect__host__arch.py b/www/chromium/files/patch-build_detect__host__arch.py index 588896662607..9d0ebae9f514 100644 --- a/www/chromium/files/patch-build_detect__host__arch.py +++ b/www/chromium/files/patch-build_detect__host__arch.py @@ -1,4 +1,4 @@ ---- build/detect_host_arch.py.orig 2019-07-24 18:58:02 UTC +--- build/detect_host_arch.py.orig 2020-11-13 06:36:34 UTC +++ build/detect_host_arch.py @@ -21,6 +21,8 @@ def HostArch(): host_arch = 'ia32' diff --git a/www/chromium/files/patch-build_gn__run__binary.py b/www/chromium/files/patch-build_gn__run__binary.py index d9e733834b4a..bf433af332eb 100644 --- a/www/chromium/files/patch-build_gn__run__binary.py +++ b/www/chromium/files/patch-build_gn__run__binary.py @@ -1,4 +1,4 @@ ---- build/gn_run_binary.py.orig 2019-07-24 18:58:02 UTC +--- build/gn_run_binary.py.orig 2020-11-13 06:36:34 UTC +++ build/gn_run_binary.py @@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. diff --git a/www/chromium/files/patch-build_linux_chrome.map b/www/chromium/files/patch-build_linux_chrome.map index 7465bc9773c5..d4b5568948cc 100644 --- a/www/chromium/files/patch-build_linux_chrome.map +++ b/www/chromium/files/patch-build_linux_chrome.map @@ -1,4 +1,4 @@ ---- build/linux/chrome.map.orig 2019-03-11 22:00:52 UTC +--- build/linux/chrome.map.orig 2020-11-13 06:36:34 UTC +++ build/linux/chrome.map @@ -1,4 +1,7 @@ { diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn index 86373b5ebf39..aae9271ac587 100644 --- a/www/chromium/files/patch-build_linux_libpci_BUILD.gn +++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn @@ -1,4 +1,4 @@ ---- build/linux/libpci/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/linux/libpci/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/linux/libpci/BUILD.gn @@ -3,20 +3,36 @@ # found in the LICENSE file. diff --git a/www/chromium/files/patch-build_linux_unbundle_libusb.gn b/www/chromium/files/patch-build_linux_unbundle_libusb.gn index 1cc0b00012c6..cc33eba51a20 100644 --- a/www/chromium/files/patch-build_linux_unbundle_libusb.gn +++ b/www/chromium/files/patch-build_linux_unbundle_libusb.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/libusb.gn.orig 2019-03-17 01:47:13 UTC +--- build/linux/unbundle/libusb.gn.orig 2020-11-16 10:04:40 UTC +++ build/linux/unbundle/libusb.gn @@ -0,0 +1,24 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py index ca2d4fd5e12e..ba6689409b13 100644 --- a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py +++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py @@ -1,4 +1,4 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2019-03-11 22:00:52 UTC +--- build/linux/unbundle/replace_gn_files.py.orig 2020-11-13 06:36:34 UTC +++ build/linux/unbundle/replace_gn_files.py @@ -27,6 +27,7 @@ REPLACEMENTS = { 'libevent': 'base/third_party/libevent/BUILD.gn', diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index ca744b0b239e..1cf6de3f5faa 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,7 +1,7 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2020-05-13 18:40:16 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2020-11-13 06:36:34 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { - enable_resource_whitelist_generation = false +@@ -50,6 +50,11 @@ if (enable_resource_allowlist_generation) { + "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } +declare_args() { @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -589,13 +594,23 @@ template("clang_toolchain") { +@@ -641,13 +646,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py index 45bc3d0a520e..fe86ac61f4b5 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,6 +1,6 @@ ---- build/toolchain/get_concurrent_links.py.orig 2019-06-04 18:55:15 UTC +--- build/toolchain/get_concurrent_links.py.orig 2020-11-13 06:36:34 UTC +++ build/toolchain/get_concurrent_links.py -@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes(): +@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index 29b9160f7b07..24073ea8f674 100644 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- build/toolchain/linux/BUILD.gn.orig 2019-04-30 22:22:28 UTC +--- build/toolchain/linux/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/toolchain/linux/BUILD.gn @@ -22,7 +22,6 @@ clang_toolchain("clang_arm") { } diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 4678bfd491de..ddeec9370073 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- cc/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ cc/BUILD.gn -@@ -599,7 +599,7 @@ cc_test_static_library("test_support") { +@@ -615,7 +615,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,11 +9,11 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -801,7 +801,6 @@ cc_test("cc_unittests") { +@@ -824,7 +824,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] - defines = [] + if (is_fuchsia) { diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index f1df08621e85..9ecfbba672a6 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,4 +1,4 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2020-07-07 21:58:11 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2020-11-13 06:36:34 UTC +++ cc/layers/scrollbar_layer_impl_base.cc @@ -219,8 +219,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); diff --git a/www/chromium/files/patch-cc_test_layer__tree__test.cc b/www/chromium/files/patch-cc_test_layer__tree__test.cc index d3df654755cb..9e1df01e2f56 100644 --- a/www/chromium/files/patch-cc_test_layer__tree__test.cc +++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc @@ -1,11 +1,11 @@ ---- cc/test/layer_tree_test.cc.orig 2020-07-13 09:14:49 UTC +--- cc/test/layer_tree_test.cc.orig 2020-11-13 06:36:34 UTC +++ cc/test/layer_tree_test.cc -@@ -645,7 +645,7 @@ LayerTreeTest::LayerTreeTest(LayerTreeTest::RendererTy +@@ -669,7 +669,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere init_vulkan = true; - } else if (renderer_type_ == RENDERER_SKIA_DAWN) { + } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); --#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) init_vulkan = true; #elif defined(OS_WIN) // TODO(sgilhuly): Initialize D3D12 for Windows. diff --git a/www/chromium/files/patch-cc_test_pixel__test.cc b/www/chromium/files/patch-cc_test_pixel__test.cc index 2412d1a501d7..432cdf4546a4 100644 --- a/www/chromium/files/patch-cc_test_pixel__test.cc +++ b/www/chromium/files/patch-cc_test_pixel__test.cc @@ -1,11 +1,11 @@ ---- cc/test/pixel_test.cc.orig 2020-07-13 09:15:14 UTC +--- cc/test/pixel_test.cc.orig 2020-11-13 06:36:34 UTC +++ cc/test/pixel_test.cc @@ -69,7 +69,7 @@ PixelTest::PixelTest(GraphicsBackend backend) init_vulkan = true; } else if (backend == kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); --#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) init_vulkan = true; #elif defined(OS_WIN) // TODO(sgilhuly): Initialize D3D12 for Windows. diff --git a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc index 71229ec3ab6f..ac015f4ea0f3 100644 --- a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc +++ b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc @@ -1,4 +1,4 @@ ---- cc/trees/frame_rate_estimator.cc.orig 2020-07-13 17:25:44 UTC +--- cc/trees/frame_rate_estimator.cc.orig 2020-11-13 06:36:34 UTC +++ cc/trees/frame_rate_estimator.cc @@ -48,7 +48,7 @@ void FrameRateEstimator::WillDraw(base::TimeTicks now) // frequency is lower than that, then using a lower frame rate is permitted. diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 19a809976d50..8e7377fb50a9 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2020-07-07 21:58:11 UTC +--- cc/trees/property_tree.cc.orig 2020-11-13 06:36:34 UTC +++ cc/trees/property_tree.cc -@@ -1245,13 +1245,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1285,13 +1285,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn new file mode 100644 index 000000000000..00783fba5d2d --- /dev/null +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -0,0 +1,13 @@ +--- chrome/BUILD.gn.orig 2020-11-16 16:03:08 UTC ++++ chrome/BUILD.gn +@@ -1214,6 +1214,10 @@ group("browser_dependencies") { + public_deps += [ "//chromeos/lacros" ] + } + ++ if (is_bsd) { ++ public_deps -= [ "//components/crash/core/app" ] ++ } ++ + if (is_chromeos) { + public_deps += [ + "//chrome/browser/chromeos", diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 40561b36dbe4..d1904bdbb5cf 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/app/BUILD.gn.orig 2020-07-07 21:58:12 UTC +--- chrome/app/BUILD.gn.orig 2020-11-13 06:36:35 UTC +++ chrome/app/BUILD.gn -@@ -139,7 +139,7 @@ static_library("test_support") { +@@ -140,7 +140,7 @@ static_library("test_support") { "//v8:v8_headers", ] diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 574ea4322784..f7cf60b9affa 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,8 +1,8 @@ ---- chrome/app/chrome_command_ids.h.orig 2020-05-13 18:39:36 UTC +--- chrome/app/chrome_command_ids.h.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chrome_command_ids.h -@@ -60,7 +60,7 @@ - #define IDC_MAXIMIZE_WINDOW 34047 +@@ -61,7 +61,7 @@ #define IDC_ALL_WINDOWS_FRONT 34048 + #define IDC_NAME_WINDOW 34049 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index c4e0477762da..d40216695f0b 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,16 +1,17 @@ ---- chrome/app/chrome_main.cc.orig 2019-09-09 21:55:07 UTC +--- chrome/app/chrome_main.cc.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chrome_main.cc -@@ -101,11 +101,11 @@ int ChromeMain(int argc, const char** argv) { - MainThreadStackSamplingProfiler scoped_sampling_profiler; +@@ -109,12 +109,12 @@ int ChromeMain(int argc, const char** argv) { // Chrome-specific process modes. --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +- defined(OS_WIN) ++ defined(OS_WIN) || defined(OS_BSD) if (command_line->HasSwitch(switches::kHeadless)) { return headless::HeadlessShellMain(params); } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || +- // defined(OS_WIN) ++ // defined(OS_WIN) || defined(OS_BSD) int rv = content::ContentMain(params); diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index aa0cbdac9e82..e1ea6214cf7a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,55 +1,55 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-07-07 21:58:12 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -107,7 +107,7 @@ +@@ -108,7 +108,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif --#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -144,12 +144,12 @@ +@@ -147,12 +147,12 @@ #include "v8/include/v8.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 "base/environment.h" #endif - #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_ANDROID) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_ANDROID) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -266,7 +266,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -258,7 +258,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) --#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) void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -306,13 +306,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -294,13 +294,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) && !defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return --#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) // The zygote process opens the resources for the renderers. - process_type == service_manager::switches::kZygoteProcess || + process_type == switches::kZygoteProcess || #endif -@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -339,7 +339,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,52 +58,52 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -361,7 +361,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -349,7 +349,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if !defined(OS_MACOSX) && !defined(OS_ANDROID) + #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); --#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) // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -427,7 +427,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD - #if defined(OS_MACOSX) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat - startup_metric_utils::RecordApplicationStartTime(now); +@@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // Record the startup process creation time on supported platforms. + #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS) ++ defined(OS_CHROMEOS) || defined(OS_BSD) + // Record the startup process creation time on supported platforms. On Android + // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( - base::Process::Current().CreationTime()); -@@ -691,7 +691,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -705,7 +705,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #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) if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -702,7 +702,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -716,7 +716,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -112,16 +112,16 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -726,7 +726,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -744,7 +744,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif --#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) nacl::RegisterPathProvider(); #endif -@@ -906,7 +906,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -924,7 +924,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -130,66 +130,66 @@ ChromeCrashReporterClient::Create(); #endif -@@ -918,7 +918,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - #if defined(OS_WIN) +@@ -937,7 +937,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif --#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #if defined(ARCH_CPU_ARM_FAMILY) && \ +- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1037,7 +1037,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1056,7 +1056,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_MAC) ++#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). - if (process_type != service_manager::switches::kZygoteProcess) { + if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1077,7 +1077,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#endif // defined(OS_POSIX) && !defined(OS_MAC) ++#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - // After all the platform Breakpads have been initialized, store the command - // line for crash reporting. -@@ -1072,7 +1072,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_ANDROID) + CHECK_EQ(base::android::GetLibraryProcessType(), +@@ -1097,7 +1097,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. --#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) AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1114,7 +1114,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1139,7 +1139,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. --#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) {switches::kNaClLoaderProcess, NaClMain}, #else {"", nullptr}, // To avoid constant array of size 0 -@@ -1142,7 +1142,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1167,7 +1167,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } --#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) void ChromeMainDelegate::ZygoteStarting( - std::vector>* - delegates) { -@@ -1180,7 +1180,7 @@ void ChromeMainDelegate::ZygoteForked() { + std::vector>* delegates) { + #if defined(OS_CHROMEOS) +@@ -1204,7 +1204,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) && !defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) content::ContentClient* ChromeMainDelegate::CreateContentClient() { return &chrome_content_client_; diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 6793780fc70e..bdca535dc0f3 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2020-07-07 21:58:12 UTC +--- chrome/app/chromium_strings.grd.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chromium_strings.grd -@@ -681,7 +681,7 @@ Chromium is unable to recover your settings. +@@ -698,7 +698,7 @@ Chromium is unable to recover your settings. @@ -9,7 +9,7 @@ Your system administrator has configured Chromium to open an alternative browser to access $1example.com. -@@ -782,7 +782,7 @@ Chromium is unable to recover your settings. +@@ -809,7 +809,7 @@ Chromium is unable to recover your settings. @@ -18,7 +18,7 @@ The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. -@@ -1004,7 +1004,7 @@ Chromium is unable to recover your settings. +@@ -1028,7 +1028,7 @@ Chromium is unable to recover your settings. diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 4e2871b96ffb..cda37d0c9fd8 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2020-07-07 21:58:12 UTC +--- chrome/app/generated_resources.grd.orig 2020-11-13 06:36:35 UTC +++ chrome/app/generated_resources.grd -@@ -5181,7 +5181,7 @@ Keep your key file in a safe place. You will need it t +@@ -5245,7 +5245,7 @@ Keep your key file in a safe place. You will need it t @@ -9,7 +9,7 @@ Legacy Browser Support -@@ -6928,7 +6928,7 @@ the Bookmarks menu."> +@@ -7236,7 +7236,7 @@ the Bookmarks menu."> Google Pay @@ -18,7 +18,7 @@ Use system title bar and borders -@@ -7854,7 +7854,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8212,7 +8212,7 @@ Please help our engineers fix this problem. Tell us wh Set as default diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index 0f869c267011..28217b08089e 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2020-07-07 21:58:12 UTC +--- chrome/app/google_chrome_strings.grd.orig 2020-11-13 06:36:35 UTC +++ chrome/app/google_chrome_strings.grd -@@ -688,7 +688,7 @@ Google Chrome is unable to recover your settings. +@@ -705,7 +705,7 @@ Google Chrome is unable to recover your settings. @@ -9,7 +9,7 @@ Your system administrator has configured Google Chrome to open an alternative browser to access $1example.com. -@@ -789,7 +789,7 @@ Google Chrome is unable to recover your settings. +@@ -816,7 +816,7 @@ Google Chrome is unable to recover your settings. @@ -18,7 +18,7 @@ The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. -@@ -1018,7 +1018,7 @@ Google Chrome is unable to recover your settings. +@@ -1042,7 +1042,7 @@ Google Chrome is unable to recover your settings. diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index bed697f91496..0df7e092f2ce 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,7 +1,7 @@ ---- chrome/app/settings_strings.grdp.orig 2020-07-07 21:58:13 UTC +--- chrome/app/settings_strings.grdp.orig 2020-11-13 06:36:36 UTC +++ chrome/app/settings_strings.grdp -@@ -83,7 +83,7 @@ - Themes +@@ -110,7 +110,7 @@ + Theme - @@ -9,7 +9,7 @@ GTK+ -@@ -97,7 +97,7 @@ +@@ -124,7 +124,7 @@ Use Classic diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc index 3678715840b5..be7ad2247838 100644 --- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -1,4 +1,4 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/app/shutdown_signal_handlers_posix.cc @@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index 34bf723d2edc..875a420e4354 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-02-03 21:53:28 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-11-13 06:36:36 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -18,7 +18,7 @@ diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd index a6e63ac69942..cf59148f8edb 100644 --- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/theme_resources.grd.orig 2019-10-30 15:46:23 UTC +--- chrome/app/theme/theme_resources.grd.orig 2020-11-13 06:36:36 UTC +++ chrome/app/theme/theme_resources.grd @@ -25,7 +25,7 @@