aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <rnagy@FreeBSD.org>2023-05-31 11:52:59 +0000
committerRobert Nagy <rnagy@FreeBSD.org>2023-05-31 13:04:45 +0000
commite0eb878be532f268d77fc5715d45e22bf1fa343e (patch)
tree917d570d829a326a69bb18a8562d9d55a97c53f9
parent5fc5f6e57638650eb96f4067d3246d6517a22ab1 (diff)
downloadports-e0eb878be532f268d77fc5715d45e22bf1fa343e.tar.gz
ports-e0eb878be532f268d77fc5715d45e22bf1fa343e.zip
www/chromium: update to 114.0.5735.90
-rw-r--r--www/chromium/Makefile45
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-BUILD.gn82
-rw-r--r--www/chromium/files/patch-ash_display_mirror__window__controller.cc4
-rw-r--r--www/chromium/files/patch-base_BUILD.gn22
-rw-r--r--www/chromium/files/patch-base_allocator_dispatcher_tls.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc10
-rw-r--r--www/chromium/files/patch-base_files_file__path__watcher__unittest.cc8
-rw-r--r--www/chromium/files/patch-base_files_file__util__unittest.cc6
-rw-r--r--www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc6
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.cc8
-rw-r--r--www/chromium/files/patch-base_process_process__metrics__posix.cc4
-rw-r--r--www/chromium/files/patch-base_rand__util.h4
-rw-r--r--www/chromium/files/patch-base_system_sys__info.cc4
-rw-r--r--www/chromium/files/patch-base_system_sys__info.h6
-rw-r--r--www/chromium/files/patch-base_test_launcher_test__launcher.cc4
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn31
-rw-r--r--www/chromium/files/patch-build_config_rust.gni4
-rw-r--r--www/chromium/files/patch-build_toolchain_gcc__toolchain.gni4
-rw-r--r--www/chromium/files/patch-cc_BUILD.gn6
-rw-r--r--www/chromium/files/patch-chrome_app_app__management__strings.grdp4
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main.cc8
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc24
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd16
-rw-r--r--www/chromium/files/patch-chrome_app_profiles__strings.grdp4
-rw-r--r--www/chromium/files/patch-chrome_app_settings__strings.grdp6
-rw-r--r--www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd6
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc56
-rw-r--r--www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__features.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc34
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd4
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__item__model.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc49
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h47
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc43
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc17
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_printer__query.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc15
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html10
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_route.ts4
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h10
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__service.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_ui__features.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_ui__features.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc24
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc21
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc92
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h34
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h8
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc128
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h38
-rw-r--r--www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc12
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.h8
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths__internal.h4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.h4
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc16
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h18
-rw-r--r--www/chromium/files/patch-chrome_common_url__constants.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_url__constants.h4
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.cc12
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.h8
-rw-r--r--www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc4
-rw-r--r--www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc10
-rw-r--r--www/chromium/files/patch-chrome_test_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_updater_app_app__uninstall.cc20
-rw-r--r--www/chromium/files/patch-chrome_utility_services.cc6
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc4
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc4
-rw-r--r--www/chromium/files/patch-components_crash_core_common_BUILD.gn4
-rw-r--r--www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc10
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc16
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.h8
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.cc12
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.h24
-rw-r--r--www/chromium/files/patch-components_flags__ui_flags__state.cc4
-rw-r--r--www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc4
-rw-r--r--www/chromium/files/patch-components_metrics_metrics__log.cc6
-rw-r--r--www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc10
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_login__database.cc8
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc8
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc6
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h8
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc4
-rw-r--r--www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc20
-rw-r--r--www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc6
-rw-r--r--www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h20
-rw-r--r--www/chromium/files/patch-components_update__client_update__query__params.cc4
-rw-r--r--www/chromium/files/patch-components_variations_service_variations__service.cc4
-rw-r--r--www/chromium/files/patch-components_version__info_version__info.h14
-rw-r--r--www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc8
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_display_skia__renderer.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc6
-rw-r--r--www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h4
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc20
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc6
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc4
-rw-r--r--www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc20
-rw-r--r--www/chromium/files/patch-content_browser_media_media__interface__proxy.cc20
-rw-r--r--www/chromium/files/patch-content_browser_network__service__instance__impl.cc6
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc14
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc12
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h4
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host.cc56
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host.h20
-rw-r--r--www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc19
-rw-r--r--www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc4
-rw-r--r--www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc4
-rw-r--r--www/chromium/files/patch-content_common_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_gpu_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc12
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc4
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h18
-rw-r--r--www/chromium/files/patch-content_public_browser_render__process__host.h4
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.cc12
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.h4
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.cc6
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.h6
-rw-r--r--www/chromium/files/patch-content_renderer_render__process__impl.cc6
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc8
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc15
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h22
-rw-r--r--www/chromium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_utility_services.cc28
-rw-r--r--www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc4
-rw-r--r--www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h17
-rw-r--r--www/chromium/files/patch-content_utility_utility__main.cc30
-rw-r--r--www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc6
-rw-r--r--www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc4
-rw-r--r--www/chromium/files/patch-extensions_browser_extension__prefs.cc11
-rw-r--r--www/chromium/files/patch-extensions_browser_pref__names.cc11
-rw-r--r--www/chromium/files/patch-extensions_browser_pref__names.h11
-rw-r--r--www/chromium/files/patch-extensions_common_api_runtime.json4
-rw-r--r--www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc6
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc6
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc14
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc4
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc22
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc4
-rw-r--r--www/chromium/files/patch-media_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_audio_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_base_cdm__promise__adapter.cc14
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc24
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h13
-rw-r--r--www/chromium/files/patch-media_base_video__frame.cc6
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h8
-rw-r--r--www/chromium/files/patch-media_gpu_buffer__validation.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc8
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc8
-rw-r--r--www/chromium/files/patch-media_media__options.gni6
-rw-r--r--www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc15
-rw-r--r--www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h4
-rw-r--r--www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc8
-rw-r--r--www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni4
-rw-r--r--www/chromium/files/patch-net_BUILD.gn29
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier.cc6
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier__passive.cc (renamed from www/chromium/files/patch-net_base_network__change__notifier__posix.cc)8
-rw-r--r--www/chromium/files/patch-net_cert_cert__verifier.cc14
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc.cc4
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc.h4
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc16
-rw-r--r--www/chromium/files/patch-net_cert_test__root__certs__unittest.cc12
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc12
-rw-r--r--www/chromium/files/patch-net_socket_tcp__socket__posix.cc4
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.cc8
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc4
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc8
-rw-r--r--www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc13
-rw-r--r--www/chromium/files/patch-remoting_host_host__attributes.cc6
-rw-r--r--www/chromium/files/patch-remoting_host_it2me_it2me__host.cc8
-rw-r--r--www/chromium/files/patch-sandbox_linux_BUILD.gn4
-rw-r--r--www/chromium/files/patch-sandbox_policy_features.cc8
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.cc4
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.h4
-rw-r--r--www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc12
-rw-r--r--www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc4
-rw-r--r--www/chromium/files/patch-services_device_public_mojom_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_network_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc37
-rw-r--r--www/chromium/files/patch-services_network_network__service.cc4
-rw-r--r--www/chromium/files/patch-services_network_public_cpp_BUILD.gn11
-rw-r--r--www/chromium/files/patch-services_network_public_mojom_BUILD.gn25
-rw-r--r--www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h11
-rw-r--r--www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc38
-rw-r--r--www/chromium/files/patch-services_video__capture_video__capture__service__impl.h29
-rw-r--r--www/chromium/files/patch-third__party_angle_BUILD.gn8
-rw-r--r--www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h4
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp20
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp4
-rw-r--r--www/chromium/files/patch-third__party_angle_util_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_public_platform_platform.h4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc10
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc10
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc33
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni8
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc14
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json521
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc11
-rw-r--r--www/chromium/files/patch-third__party_boringssl_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h4
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h751
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h2128
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm735
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h752
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h2149
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm735
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h752
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h2149
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py121
-rw-r--r--www/chromium/files/patch-third__party_opus_BUILD.gn10
-rw-r--r--www/chromium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h11
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc4
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_tracing_track.cc4
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h4
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h10
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc4
-rw-r--r--www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py4
-rw-r--r--www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn6
-rw-r--r--www/chromium/files/patch-ui_base_ime_text__input__client.h4
-rw-r--r--www/chromium/files/patch-ui_base_resource_resource__bundle.cc4
-rw-r--r--www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc4
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.cc15
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.h11
-rw-r--r--www/chromium/files/patch-ui_base_webui_web__ui__util.cc13
-rw-r--r--www/chromium/files/patch-ui_color_color__id.h4
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.cc4
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.h4
-rw-r--r--www/chromium/files/patch-ui_events_event.cc8
-rw-r--r--www/chromium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gfx_codec_png__codec.cc6
-rw-r--r--www/chromium/files/patch-ui_gfx_font__list.cc11
-rw-r--r--www/chromium/files/patch-ui_gfx_native__widget__types.h12
-rw-r--r--www/chromium/files/patch-ui_native__theme_native__theme.h4
-rw-r--r--www/chromium/files/patch-ui_ozone_common_features.cc11
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc4
-rw-r--r--www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc4
-rw-r--r--www/chromium/files/patch-ui_platform__window_platform__window__delegate.h4
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.cc10
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.h4
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc4
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.cc4
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn8
-rw-r--r--www/chromium/files/patch-v8_src_api_api.cc6
-rw-r--r--www/chromium/files/patch-v8_src_base_platform_platform-posix.cc6
-rw-r--r--www/chromium/files/patch-v8_src_execution_isolate.cc4
-rw-r--r--www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc4
-rw-r--r--www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc6
-rw-r--r--www/chromium/files/patch-v8_src_trap-handler_trap-handler.h6
330 files changed, 2040 insertions, 11631 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 51f600b6fcdb..d6b5e0e99493 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 113.0.5672.126
+PORTVERSION= 114.0.5735.90
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
@@ -69,9 +69,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
RUN_DEPENDS= xdg-open:devel/xdg-utils \
noto-basic>0:x11-fonts/noto-basic
-USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv:wchar_t jpeg \
- localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \
- tar:xz xorg
+USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
+ iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
+ python:3.7+,build qt:5 shebangfix tar:xz xorg
CPE_VENDOR= google
CPE_PRODUCT= chrome
@@ -121,7 +121,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_libjpeg=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS}" \
- extra_ldflags="${LDFLAGS}"
+ extra_ldflags="${LDFLAGS}" \
+ ffmpeg_branding="${FFMPEG_BRAND}"
# TODO: investigate building with these options:
# use_system_minigbm
@@ -156,10 +157,10 @@ ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al
ALSA_VARS= GN_ARGS+=use_alsa=true
ALSA_VARS_OFF= GN_ARGS+=use_alsa=false
-CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \
- GN_ARGS+=proprietary_codecs=true
-CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \
- GN_ARGS+=proprietary_codecs=false
+CODECS_VARS= GN_ARGS+=proprietary_codecs=true \
+ FFMPEG_BRAND="Chrome"
+CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \
+ FFMPEG_BRAND="Chromium"
CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_VARS= GN_ARGS+=use_cups=true
@@ -229,13 +230,24 @@ BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
nm=/usr/bin/llvm-nm
.endif
-# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - map ffmpeg target to ${ARCH}
.if ${ARCH} == aarch64
PLIST_SUB+= NOT_AARCH64="@comment "
-.else
+FFMPEG_TARGET= arm64
+.elif ${ARCH} == amd64
+BUILD_DEPENDS+= nasm:devel/nasm
+PLIST_SUB+= NOT_AARCH64=""
+FFMPEG_TARGET= x64
+.elif ${ARCH} == i386
+BUILD_DEPENDS+= nasm:devel/nasm
PLIST_SUB+= NOT_AARCH64=""
+FFMPEG_TARGET= ia32
.endif
+FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
+FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
+
# Allow relocations against read-only segments (override lld default)
LDFLAGS_i386= -Wl,-znotext
@@ -264,10 +276,13 @@ pre-configure:
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
# Chromium uses an unreleased version of FFmpeg, so configure it
-.for brand in Chrome Chromium
- ${CP} -R \
- ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
- ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
+ cd ${WRKSRC}/third_party/ffmpeg && \
+ ${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
+ --config-only --branding=${FFMPEG_BRAND}
+ cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
+ ${MKDIR} ${FFMPEG_CDIR}
+.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
+ -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
do-configure:
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 3e8a5d67e451..7cb18604147f 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1684318714
-SHA256 (chromium-113.0.5672.126.tar.xz) = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93
-SIZE (chromium-113.0.5672.126.tar.xz) = 1556790928
-SHA256 (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 401df2b0b0452bcb0841b52383a98649e15ad4f6baea47dc99e913a35ae40111
-SIZE (chrome-linux-113.0.5672.126-llvm13.profdata.tar.xz) = 27020448
-SHA256 (chromium-113.0.5672.126-testdata.tar.xz) = 89088e4cdc494ad5c468c7cf7e7ed26c4f76244d42ec74dac0ee141ead0fd6e6
-SIZE (chromium-113.0.5672.126-testdata.tar.xz) = 262980780
+TIMESTAMP = 1685521034
+SHA256 (chromium-114.0.5735.90.tar.xz) = 071a8620b6175923f91f0ce0e3a0b2b20bf350a7d1a0f5513c160df7c17526d8
+SIZE (chromium-114.0.5735.90.tar.xz) = 1570683592
+SHA256 (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 2a7f6a89475266193420ba70c00858093d7cd3ed0eda2a34ded2f3a6006b1526
+SIZE (chrome-linux-114.0.5735.90-llvm13.profdata.tar.xz) = 27343652
+SHA256 (chromium-114.0.5735.90-testdata.tar.xz) = 9ce66f3d7b60e5f74d0f4e4290b1e159b3346e4afb85373c745ac44fc1d14994
+SIZE (chromium-114.0.5735.90-testdata.tar.xz) = 256217488
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 2eac54a44e3a..dafde345f6b8 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ BUILD.gn
-@@ -60,7 +60,7 @@ declare_args() {
+@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
}
@@ -9,49 +9,49 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -85,7 +85,6 @@ group("gn_all") {
- "//codelabs",
- "//components:components_unittests",
- "//components/gwp_asan:gwp_asan_unittests",
-- "//infra/orchestrator:orchestrator_all",
- "//net:net_unittests",
- "//sandbox:sandbox_unittests",
- "//services:services_unittests",
-@@ -426,7 +425,7 @@ group("gn_all") {
+@@ -95,7 +95,6 @@ group("gn_all") {
+ "//codelabs",
+ "//components:components_unittests",
+ "//components/gwp_asan:gwp_asan_unittests",
+- "//infra/orchestrator:orchestrator_all",
+ "//net:net_unittests",
+ "//sandbox:sandbox_unittests",
+ "//services:services_unittests",
+@@ -419,7 +418,7 @@ group("gn_all") {
+ }
}
- }
-- 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",
-@@ -630,6 +629,15 @@ group("gn_all") {
+- 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",
+@@ -619,6 +618,15 @@ group("gn_all") {
+ }
}
- }
-+ if (is_bsd) {
-+ deps -= [
-+ "//third_party/breakpad:dump_syms($host_toolchain)",
-+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
-+ "//third_party/breakpad:minidump_dump($host_toolchain)",
-+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
-+ ]
-+ }
++ if (is_bsd) {
++ deps -= [
++ "//third_party/breakpad:dump_syms($host_toolchain)",
++ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
++ "//third_party/breakpad:minidump_dump($host_toolchain)",
++ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
++ ]
++ }
+
- if (is_mac) {
- deps += [
- "//third_party/breakpad:dump_syms",
-@@ -677,7 +685,7 @@ group("gn_all") {
- host_os == "win") {
- deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+ if (is_mac) {
+ deps += [
+ "//third_party/breakpad:dump_syms",
+@@ -666,7 +674,7 @@ group("gn_all") {
+ host_os == "win") {
+ deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+ }
+- } else if (!is_android && !is_ios && !is_fuchsia) {
++ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
+ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-- } else if (!is_android && !is_ios && !is_fuchsia) {
-+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
- deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
- }
-@@ -1100,7 +1108,7 @@ if (!is_ios) {
+@@ -1096,7 +1104,7 @@ if (!is_ios && !is_cronet_build) {
]
}
@@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
-@@ -1200,7 +1208,7 @@ if (!is_ios) {
+@@ -1196,7 +1204,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1209,7 +1217,7 @@ if (!is_ios) {
+@@ -1205,7 +1213,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1677,7 +1685,7 @@ group("chromium_builder_perf") {
+@@ -1672,7 +1680,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
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 d0bcf31e3bff..1246cfbe086e 100644
--- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig 2022-10-24 13:33:33 UTC
+--- ash/display/mirror_window_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ ash/display/mirror_window_controller.cc
-@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
if (!base::Contains(display_info_list, iter->first,
&display::ManagedDisplayInfo::id)) {
CloseAndDeleteHost(iter->second, true);
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index e4a7afebc72e..99581eac42b8 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 2023-04-28 17:01:32 UTC
+--- base/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ base/BUILD.gn
-@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -197,7 +197,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
-@@ -1105,11 +1105,23 @@ component("base") {
+@@ -1100,11 +1100,23 @@ component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
@@ -34,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1137,7 +1149,7 @@ component("base") {
+@@ -1132,7 +1144,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -43,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1178,7 +1190,7 @@ component("base") {
+@@ -1173,7 +1185,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -52,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2135,6 +2147,43 @@ component("base") {
+@@ -2127,6 +2139,43 @@ component("base") {
}
}
@@ -96,7 +96,7 @@
# iOS
if (is_ios) {
sources += [
-@@ -2244,7 +2293,7 @@ component("base") {
+@@ -2236,7 +2285,7 @@ component("base") {
}
if (dep_libevent) {
@@ -105,7 +105,7 @@
}
if (use_libevent) {
-@@ -3562,7 +3611,7 @@ test("base_unittests") {
+@@ -3559,7 +3608,7 @@ test("base_unittests") {
]
}
@@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3611,7 +3660,7 @@ test("base_unittests") {
+@@ -3608,7 +3657,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3622,7 +3671,7 @@ test("base_unittests") {
+@@ -3619,7 +3668,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3848,7 +3897,7 @@ test("base_unittests") {
+@@ -3843,7 +3892,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_dispatcher_tls.h b/www/chromium/files/patch-base_allocator_dispatcher_tls.h
index 6613880dca00..51dd6a7b59fd 100644
--- a/www/chromium/files/patch-base_allocator_dispatcher_tls.h
+++ b/www/chromium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- base/allocator/dispatcher/tls.h.orig 2023-02-08 09:03:45 UTC
+--- base/allocator/dispatcher/tls.h.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/dispatcher/tls.h
-@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
partition_alloc::PartitionPageSize();
#elif BUILDFLAG(IS_APPLE)
constexpr static size_t AllocationChunkSize = 16384;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
index e67310662bc4..b4837778e5d5 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator.h.orig 2022-11-30 08:12:58 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/page_allocator.h
-@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
+@@ -238,7 +238,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
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 d423837a8b87..7896aa46cbda 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-04-28 17:01:32 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -383,8 +383,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -387,8 +387,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index 67fdc47c1f1b..1d6b8c5f9d65 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-28 17:01:32 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -285,7 +285,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
+@@ -305,7 +305,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
"AsanBackupRefPtr requires RawPtrHookableImpl")
declare_args() {
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
index 0b3468df1b5e..62424268d4a0 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2023-04-28 17:01:32 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2023-05-31 08:12:17 UTC
+++ base/allocator/partition_allocator/partition_root.cc
-@@ -43,7 +43,7 @@
+@@ -46,7 +46,7 @@
#include "wow64apiset.h"
#endif
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
-@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -287,7 +287,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
-@@ -378,7 +378,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -381,7 +381,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -850,7 +850,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -853,7 +853,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
index 00e9c1bd57b2..de8691c92fe6 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,6 +1,6 @@
---- base/files/file_path_watcher_unittest.cc.orig 2023-02-08 09:03:45 UTC
+--- base/files/file_path_watcher_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ base/files/file_path_watcher_unittest.cc
-@@ -521,7 +521,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) {
+@@ -473,7 +473,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvent());
@@ -9,7 +9,7 @@
// Mac implementation does not detect files modified in a directory.
ASSERT_TRUE(WriteFile(file1, "content v2"));
VLOG(1) << "Waiting for file1 modification";
-@@ -1345,7 +1345,7 @@ enum Permission {
+@@ -1275,7 +1275,7 @@ enum Permission {
Execute
};
@@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
-@@ -1376,7 +1376,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -1306,7 +1306,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
}
#endif // BUILDFLAG(IS_APPLE)
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 d5440ad2aba6..7c9e00b671a6 100644
--- a/www/chromium/files/patch-base_files_file__util__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_unittest.cc.orig 2023-04-28 17:01:32 UTC
+--- base/files/file_util_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ base/files/file_util_unittest.cc
-@@ -3853,7 +3853,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -3871,7 +3871,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
-@@ -4576,7 +4576,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4594,7 +4594,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
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 ead3fe5472be..f6675773b436 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,6 +1,6 @@
---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-05-19 14:06:27 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-05-31 08:12:17 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
+@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@@ -11,7 +11,7 @@
#if BUILDFLAG(IS_APPLE)
std::vector<char> vec(allocated_pages_);
#else
-@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
return false;
}
return true;
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index 85291ccdbdfd..e5b95631f50d 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics.cc.orig 2023-03-09 06:31:50 UTC
+--- base/process/process_metrics.cc.orig 2023-05-31 08:12:17 UTC
+++ base/process/process_metrics.cc
@@ -17,7 +17,7 @@ namespace base {
namespace {
@@ -27,7 +27,7 @@
Value::Dict meminfo = memory_info_.ToDict();
meminfo.Merge(vmstat_info_.ToDict());
res.Set("meminfo", std::move(meminfo));
-@@ -98,7 +98,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
@@ -35,7 +35,7 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now();
-@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
+@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
}
@@ -43,7 +43,7 @@
#if BUILDFLAG(IS_WIN)
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
-@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
+@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc
index 9cd1a72c8e2a..278bd803c9f2 100644
--- a/www/chromium/files/patch-base_process_process__metrics__posix.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_posix.cc.orig 2022-08-31 12:19:35 UTC
+--- base/process/process_metrics_posix.cc.orig 2023-05-31 08:12:17 UTC
+++ base/process/process_metrics_posix.cc
@@ -20,6 +20,8 @@
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() {
return stats.size_in_use;
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
return GetMallocUsageMallinfo();
diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h
index 63ac19b02681..f3cfae0331e7 100644
--- a/www/chromium/files/patch-base_rand__util.h
+++ b/www/chromium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig 2022-11-30 08:12:58 UTC
+--- base/rand_util.h.orig 2023-05-31 08:12:17 UTC
+++ base/rand_util.h
-@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}
diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc
index f030b0307ea8..68ea0347c4d2 100644
--- a/www/chromium/files/patch-base_system_sys__info.cc
+++ b/www/chromium/files/patch-base_system_sys__info.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info.cc.orig 2023-03-09 06:31:50 UTC
+--- base/system/sys_info.cc.orig 2023-05-31 08:12:17 UTC
+++ base/system/sys_info.cc
-@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() {
+@@ -148,7 +148,7 @@ std::string SysInfo::HardwareModelName() {
#endif
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index 2151241365a3..5c9937f693ca 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig 2023-02-08 09:03:45 UTC
+--- base/system/sys_info.h.orig 2023-05-31 08:12:17 UTC
+++ base/system/sys_info.h
-@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo {
+@@ -253,6 +253,8 @@ class BASE_EXPORT SysInfo {
static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled);
#endif
@@ -9,7 +9,7 @@
private:
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
-@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo {
+@@ -264,7 +266,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
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 7b9cbd580612..6b0706a91793 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 2023-03-09 06:31:50 UTC
+--- base/test/launcher/test_launcher.cc.orig 2023-05-31 08:12:17 UTC
+++ base/test/launcher/test_launcher.cc
-@@ -67,6 +67,7 @@
+@@ -69,6 +69,7 @@
#include "third_party/libxml/chromium/libxml_utils.h"
#if BUILDFLAG(IS_POSIX)
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 14ce513d99fb..5c87ed247ad9 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- build/config/compiler/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ build/config/compiler/BUILD.gn
@@ -237,13 +237,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
@@ -38,7 +38,16 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
if (save_reproducers_on_lld_crash && use_lld) {
ldflags += [
-@@ -816,7 +823,7 @@ config("compiler") {
+@@ -727,7 +734,7 @@ config("compiler") {
+
+ ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
+
+- if (!is_chromeos) {
++ if (!is_chromeos && !is_bsd) {
+ # TODO(https://crbug.com/972449): turn on for ChromeOS when that
+ # toolchain has this flag.
+ # We only use one version of LLVM within a build so there's no need to
+@@ -825,7 +832,7 @@ config("compiler") {
# * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
# lldb doesn't have the needed changes yet.
# TODO(crbug.com/1379070): Remove if the upstream default ever changes.
@@ -47,7 +56,7 @@
cflags_cc += [ "-gsimple-template-names" ]
}
-@@ -996,7 +1003,7 @@ config("compiler_cpu_abi") {
+@@ -1005,7 +1012,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -56,7 +65,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1011,7 +1018,7 @@ config("compiler_cpu_abi") {
+@@ -1020,7 +1027,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -65,7 +74,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1346,7 +1353,7 @@ config("compiler_deterministic") {
+@@ -1355,7 +1362,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@@ -74,7 +83,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
-@@ -1398,7 +1405,7 @@ config("compiler_deterministic") {
+@@ -1407,7 +1414,7 @@ config("compiler_deterministic") {
}
config("clang_revision") {
@@ -83,7 +92,7 @@
update_args = [
"--print-revision",
"--verify-version=$clang_version",
-@@ -1636,7 +1643,7 @@ config("default_warnings") {
+@@ -1645,7 +1652,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -92,7 +101,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
-@@ -1827,7 +1834,7 @@ config("no_chromium_code") {
+@@ -1836,7 +1843,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -101,7 +110,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2337,7 +2344,7 @@ config("afdo_optimize_size") {
+@@ -2346,7 +2353,7 @@ config("afdo_optimize_size") {
# There are some targeted places that AFDO regresses, so we provide a separate
# config to allow AFDO to be disabled per-target.
config("afdo") {
@@ -110,7 +119,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2356,7 +2363,7 @@ config("afdo") {
+@@ -2365,7 +2372,7 @@ config("afdo") {
}
inputs = [ _clang_sample_profile ]
}
@@ -119,7 +128,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2511,7 +2518,8 @@ config("symbols") {
+@@ -2523,7 +2530,8 @@ config("symbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni
index e52e75ceb868..19d053b81726 100644
--- a/www/chromium/files/patch-build_config_rust.gni
+++ b/www/chromium/files/patch-build_config_rust.gni
@@ -1,6 +1,6 @@
---- build/config/rust.gni.orig 2023-04-28 17:01:32 UTC
+--- build/config/rust.gni.orig 2023-05-31 08:12:17 UTC
+++ build/config/rust.gni
-@@ -157,7 +157,7 @@ if (enable_rust) {
+@@ -170,7 +170,7 @@ if (enable_rust) {
rust_sysroot = "//third_party/rust-toolchain"
use_unverified_rust_toolchain = false
} else {
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index 53cbcfd600fc..9f88b28c852e 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_toolchain.gni.orig 2023-04-28 17:01:32 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2023-05-31 08:12:17 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@@ -14,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -837,22 +844,12 @@ template("gcc_toolchain") {
+@@ -859,22 +866,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index cf0f8bed2da7..017ab0893c61 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 2023-04-28 17:01:32 UTC
+--- cc/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ cc/BUILD.gn
-@@ -664,7 +664,7 @@ cc_test_static_library("test_support") {
+@@ -672,7 +672,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
-@@ -911,7 +911,6 @@ cc_test("cc_unittests") {
+@@ -922,7 +922,6 @@ cc_test("cc_unittests") {
data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/chromium/files/patch-chrome_app_app__management__strings.grdp b/www/chromium/files/patch-chrome_app_app__management__strings.grdp
index 951439da5219..6c9bfa4a371a 100644
--- a/www/chromium/files/patch-chrome_app_app__management__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_app__management__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/app_management_strings.grdp.orig 2022-07-22 17:30:31 UTC
+--- chrome/app/app_management_strings.grdp.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/app_management_strings.grdp
-@@ -173,7 +173,7 @@
+@@ -176,7 +176,7 @@
You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
</if>
diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc
index 38eea00db206..b43e62b57bbd 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/app/chrome_main.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/chrome_main.cc
-@@ -28,11 +28,11 @@
+@@ -27,11 +27,11 @@
#include "chrome/app/notification_metrics.h"
#endif
@@ -14,7 +14,7 @@
#include "chrome/app/chrome_main_linux.h"
#endif
-@@ -147,7 +147,7 @@ int ChromeMain(int argc, const char** argv) {
+@@ -136,7 +136,7 @@ int ChromeMain(int argc, const char** argv) {
SetUpBundleOverrides();
#endif
@@ -23,7 +23,7 @@
AppendExtraArgumentsToCommandLine(command_line);
#endif
-@@ -175,7 +175,7 @@ int ChromeMain(int argc, const char** argv) {
+@@ -164,7 +164,7 @@ int ChromeMain(int argc, const char** argv) {
headless::SetUpCommandLine(command_line);
} else {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
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 4a76c4bdcb91..59734c00d37e 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -135,7 +135,7 @@
+@@ -137,7 +137,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -179,16 +179,16 @@
+@@ -182,16 +182,16 @@
#include "v8/include/v8.h"
#endif
@@ -29,7 +29,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -323,7 +323,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -327,7 +327,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@@ -38,7 +38,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -408,7 +408,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -412,7 +412,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -47,7 +47,7 @@
// 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) ||
-@@ -522,7 +522,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -526,7 +526,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -56,7 +56,7 @@
// 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.
-@@ -611,7 +611,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -615,7 +615,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -65,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -941,7 +941,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
+@@ -956,7 +956,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
@@ -74,7 +74,7 @@
base::MessagePumpLibevent::InitializeFeatures();
#elif BUILDFLAG(IS_MAC)
base::PlatformThread::InitFeaturesPostFieldTrial();
-@@ -1080,7 +1080,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1094,7 +1094,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@@ -83,7 +83,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -1110,7 +1110,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1124,7 +1124,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -92,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -1484,7 +1484,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1498,7 +1498,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@@ -101,7 +101,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1586,7 +1586,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1600,7 +1600,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index a57daeea1297..07888c60362a 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/generated_resources.grd.orig 2023-04-28 17:01:32 UTC
+--- chrome/app/generated_resources.grd.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -9,7 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
-@@ -3219,7 +3219,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3258,7 +3258,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@@ -18,7 +18,7 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
-@@ -4974,7 +4974,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -5007,7 +5007,7 @@ are declared in tools/grit/grit_rule.gni.
Read information about your browser, OS, device, installed software, registry values and files
</message>
</if>
@@ -27,7 +27,7 @@
<message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
Read information about your browser, OS, device, installed software and files
</message>
-@@ -5644,7 +5644,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5689,7 +5689,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
</if>
@@ -36,7 +36,7 @@
<message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
</message>
-@@ -5690,7 +5690,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5735,7 +5735,7 @@ Keep your key file in a safe place. You will need it t
Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
</message>
</if>
@@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
-@@ -9707,7 +9707,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -9841,7 +9841,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@@ -54,7 +54,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -11048,7 +11048,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -11182,7 +11182,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@@ -63,7 +63,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
-@@ -13184,7 +13184,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -13324,7 +13324,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>
diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp
index cf95a34a489e..d7816ca6c466 100644
--- a/www/chromium/files/patch-chrome_app_profiles__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_profiles__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/profiles_strings.grdp.orig 2022-02-07 13:39:41 UTC
+--- chrome/app/profiles_strings.grdp.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/profiles_strings.grdp
-@@ -66,7 +66,7 @@
+@@ -60,7 +60,7 @@
Add Profile...
</message>
</if>
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index 60ce67608cbc..ff3753e3770a 100644
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig 2023-04-05 11:05:06 UTC
+--- chrome/app/settings_strings.grdp.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/settings_strings.grdp
-@@ -166,7 +166,7 @@
+@@ -202,7 +202,7 @@
Theme
</message>
</if>
@@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
-@@ -186,7 +186,7 @@
+@@ -222,7 +222,7 @@
Use Classic
</message>
</if>
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 8172123c8583..5ccb10f413a5 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 2023-04-05 11:05:06 UTC
+--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-05-31 08:12:17 UTC
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -16,7 +16,7 @@
<includes>
@@ -9,7 +9,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
-@@ -63,7 +63,7 @@
+@@ -67,7 +67,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@@ -18,7 +18,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
-@@ -77,7 +77,7 @@
+@@ -81,7 +81,7 @@
</if>
</then>
<else> <!-- not _is_chrome_for_testing_branded -->
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 24145d4d74f3..ae690a53f3f0 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/about_flags.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/about_flags.cc
-@@ -220,7 +220,7 @@
+@@ -221,7 +221,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -312,7 +312,7 @@
+@@ -314,7 +314,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -418,7 +418,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -420,7 +420,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@@ -27,8 +27,8 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1447,7 +1447,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval
- #endif
+@@ -1447,7 +1447,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
+ std::size(kChromeRefresh2023Level1), nullptr}};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam
kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = {
{"DocumentProviderMaxLowQualitySuggestions", "1"},
-@@ -4637,13 +4637,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4749,13 +4749,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -52,7 +52,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -4917,7 +4917,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5032,7 +5032,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -61,7 +61,7 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
-@@ -5537,7 +5537,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5679,7 +5679,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -70,16 +70,16 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -6252,7 +6252,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
+@@ -6463,7 +6463,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kParallelDownloadingDescription, kOsAll,
+ FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"enable-async-dns", flag_descriptions::kAsyncDnsName,
flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(features::kAsyncDns)},
-@@ -7145,7 +7145,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7336,7 +7336,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -88,7 +88,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -7883,7 +7883,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8111,7 +8111,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -97,16 +97,16 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -8108,7 +8108,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8356,7 +8356,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- {"enable-get-display-media-set", flag_descriptions::kGetDisplayMediaSetName,
- flag_descriptions::kGetDisplayMediaSetDescription,
+ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
+ flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
-@@ -8169,7 +8169,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8417,7 +8417,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -115,7 +115,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -8722,7 +8722,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8994,7 +8994,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -124,3 +124,21 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
+@@ -9692,7 +9692,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ {"webui-system-font", flag_descriptions::kWebUiSystemFontName,
+ flag_descriptions::kWebUiSystemFontDescription, kOsAll,
+ FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
+@@ -9893,7 +9893,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ {"data-retention-policies-disable-sync-types-needed",
+ flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
+ flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
diff --git a/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
new file mode 100644
index 000000000000..abef5d273c00
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/apps/app_service/publishers/extension_apps.cc
+@@ -25,7 +25,7 @@ ExtensionApps::~ExtensionApps() = default;
+
+ bool ExtensionApps::Accepts(const extensions::Extension* extension) {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(),
+ extension->id())) {
+ return false;
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
index cd6ccf427c25..5b2bbff3d527 100644
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc
@@ -1,4 +1,4 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-08-31 12:19:35 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.cc
@@ -20,7 +20,7 @@
#include "extensions/common/extension.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
-@@ -124,7 +124,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
+@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
index 393b6f62495b..421d2be586c0 100644
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
@@ -1,11 +1,11 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.h
-@@ -36,7 +36,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
- // and false otherwise.
+@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id);
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and
// Chrome Apps are deprecated on the |profile|. Returns true if that was the
// case, or false otherwise.
diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
index 0efa589ecfab..f34db76c1a81 100644
--- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/background/background_mode_manager.cc.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/background/background_mode_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/background/background_mode_manager.cc
-@@ -889,7 +889,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+@@ -874,7 +874,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc
index 97d82e9e7c7e..f0c0a7280a88 100644
--- a/www/chromium/files/patch-chrome_browser_browser__features.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__features.cc
@@ -1,11 +1,11 @@
---- chrome/browser/browser_features.cc.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/browser_features.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/browser_features.cc
-@@ -24,7 +24,7 @@ BASE_FEATURE(kClosedTabCache,
- // the browser exits.
+@@ -27,7 +27,7 @@ BASE_FEATURE(kClosedTabCache,
BASE_FEATURE(kDestroyProfileOnBrowserClose,
"DestroyProfileOnBrowserClose",
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_CHROMEOS_LACROS)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
index ad1d24a40f42..91327c635acf 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/browser_process_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/browser_process_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/browser_process_impl.cc
@@ -213,7 +213,7 @@
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck
#endif
-@@ -1222,7 +1222,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1195,7 +1195,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
-@@ -1475,7 +1475,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1448,7 +1448,7 @@ void BrowserProcessImpl::Unpin() {
// Mac is currently not supported.
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 520dd4047f0b..4ea24d58d8ff 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -113,13 +113,13 @@
+@@ -117,13 +117,13 @@
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
#include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
#endif
-@@ -193,7 +193,7 @@
+@@ -197,7 +197,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +25,7 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
-@@ -853,7 +853,7 @@ void PopulateChromeFrameBinders(
+@@ -881,7 +881,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -861,7 +861,7 @@ void PopulateChromeFrameBinders(
+@@ -889,7 +889,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -43,8 +43,8 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
-@@ -926,14 +926,14 @@ void PopulateChromeWebUIFrameBinders(
- SegmentationInternalsUI>(map);
+@@ -958,14 +958,14 @@ void PopulateChromeWebUIFrameBinders(
+ commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
@@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
-@@ -1377,7 +1377,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1420,7 +1420,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index 343d5124bbe1..246bf78ce181 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -240,11 +240,11 @@
+@@ -241,11 +241,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -14,7 +14,7 @@
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -279,7 +279,7 @@
+@@ -280,7 +280,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -23,7 +23,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
-@@ -991,7 +991,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -992,7 +992,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@@ -32,7 +32,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1048,7 +1048,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index d989f0b99409..8dbd05118f59 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -420,7 +420,7 @@
+@@ -424,7 +424,7 @@
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -503,12 +503,12 @@
+@@ -512,12 +512,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -24,7 +24,7 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -517,14 +517,14 @@
+@@ -526,14 +526,14 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@@ -41,7 +41,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -553,11 +553,11 @@
+@@ -562,11 +562,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -55,7 +55,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1567,7 +1567,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+@@ -1609,7 +1609,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true);
registry->RegisterBooleanPref(
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false);
@@ -64,7 +64,7 @@
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1680,7 +1680,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1722,7 +1722,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@@ -73,7 +73,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1719,7 +1719,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1761,7 +1761,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -82,7 +82,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1740,7 +1740,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1782,7 +1782,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -91,7 +91,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1759,7 +1759,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1801,7 +1801,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@@ -100,7 +100,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2582,6 +2582,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2626,6 +2626,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -109,7 +109,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2951,7 +2953,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -3020,7 +3022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@@ -118,7 +118,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4504,7 +4506,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4574,7 +4576,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -127,7 +127,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -5023,7 +5025,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5093,7 +5095,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -136,7 +136,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
-@@ -5033,7 +5035,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5103,7 +5105,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -145,7 +145,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -5072,7 +5074,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5142,7 +5144,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@@ -154,7 +154,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -6703,7 +6705,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -6849,7 +6851,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index b82601d53a43..0ef812447655 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -458,7 +458,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -460,7 +460,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;
diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
index e20aad771d13..ef2e38396831 100644
--- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
@@ -1,6 +1,6 @@
---- chrome/browser/dev_ui_browser_resources.grd.orig 2023-02-08 09:03:45 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
-@@ -33,7 +33,7 @@ This file specifies browser resources for developer-fa
+@@ -34,7 +34,7 @@ This file specifies browser resources for developer-fa
<include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" />
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 605ab1ae00aa..71cf3353ba69 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_item_model.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -766,7 +766,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
@@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1222,7 +1222,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1234,7 +1234,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
return;
}
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
index fa841ca69284..63a33db14312 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig 2023-05-17 10:17:13 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
@@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -308,7 +313,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -311,7 +316,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -481,7 +486,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -484,7 +489,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
-@@ -513,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -516,7 +521,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
-@@ -544,7 +549,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+@@ -547,7 +552,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
-@@ -668,7 +673,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -671,7 +676,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
#else
// If the stored download directory is an absolute path, we presume it's
// correct; there's not really much more validation we can do here.
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
index 06b57a07674b..57c00c7f02ed 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/profiles/profile.h"
@@ -9,12 +9,12 @@
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
-@@ -55,7 +55,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
+@@ -56,7 +56,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
enterprise_signals::ContextInfoFetcher::CreateInstance(
profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- policy::CloudPolicyStore* store = nullptr;
- // Managed device.
+ policy::CloudPolicyStore* browser_cloud_policy_store = nullptr;
+ if (management_service->HasManagementAuthority(
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index a2c668c7c5de..0aaab8f95393 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1340,6 +1340,10 @@ static_library("extensions") {
+@@ -1348,6 +1348,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
index 1293d8833b75..ed30073a08d1 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -517,7 +517,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
+@@ -544,7 +544,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index 51f0ba109d68..71220f078ea4 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 0eda00536ecc..afb652ef82f7 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,15 +1,24 @@
---- chrome/browser/flag_descriptions.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -6311,7 +6311,7 @@ const char kLibAssistantV2MigrationDescription[] =
+@@ -2450,7 +2450,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
+ const char kWebUIOmniboxPopupDescription[] =
+ "If enabled, shows the omnibox suggestions popup in WebUI.";
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ const char kWebUiSystemFontName[] = "WebUI System font";
+ const char kWebUiSystemFontDescription[] =
+ "If enabled, all WebUI surfaces will use the default UI font of the "
+@@ -6593,7 +6593,7 @@ const char kLibAssistantV2MigrationDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kGetDisplayMediaSetName[] = "GetDisplayMediaSet API";
- const char kGetDisplayMediaSetDescription[] =
- "When enabled, the getDisplayMediaSet API for capturing multiple surfaces "
-@@ -6559,7 +6559,7 @@ const char kSearchWebInSidePanelDescription[] =
+ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
+ const char kGetAllScreensMediaDescription[] =
+ "When enabled, the getAllScreensMedia API for capturing multiple screens "
+@@ -6839,7 +6839,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +27,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
-@@ -6568,7 +6568,7 @@ const char kQuickCommandsDescription[] =
+@@ -6848,7 +6848,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +36,16 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
-@@ -6589,7 +6589,7 @@ const char kWebShareDescription[] =
+@@ -6870,7 +6870,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
+ "instead of JSON.";
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ const char kUseOutOfProcessVideoDecodingName[] =
+ "Use out-of-process video decoding (OOP-VD)";
+ const char kUseOutOfProcessVideoDecodingDescription[] =
+@@ -6888,7 +6888,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -36,7 +54,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -6609,7 +6609,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -6908,7 +6908,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -45,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -6623,7 +6623,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
+@@ -6922,7 +6922,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -54,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -6724,7 +6724,7 @@ const char kElasticOverscrollDescription[] =
+@@ -7023,7 +7023,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -63,3 +81,12 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
+@@ -7052,7 +7052,7 @@ const char kSigninInterceptBubbleV2Description[] =
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
+ "Data Retention Policies Disable Sync Types";
+ const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 54051d7d60b0..ad74f6a06df1 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,15 +1,24 @@
---- chrome/browser/flag_descriptions.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/flag_descriptions.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3660,7 +3660,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
+@@ -1379,7 +1379,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd
+ extern const char kWebUIOmniboxPopupName[];
+ extern const char kWebUIOmniboxPopupDescription[];
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ extern const char kWebUiSystemFontName[];
+ extern const char kWebUiSystemFontDescription[];
+ #endif
+@@ -3815,7 +3815,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
extern const char kLacrosScreenCoordinatesEnabledDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kGetDisplayMediaSetName[];
- extern const char kGetDisplayMediaSetDescription[];
-
-@@ -3787,14 +3787,14 @@ extern const char kSearchWebInSidePanelDescription[];
+ extern const char kGetAllScreensMediaName[];
+ extern const char kGetAllScreensMediaDescription[];
+ #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+@@ -3942,14 +3942,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -26,7 +35,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -3804,7 +3804,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -3959,7 +3959,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -35,7 +44,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3814,7 +3814,7 @@ extern const char kOzonePlatformHintName[];
+@@ -3969,7 +3969,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -44,7 +53,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
-@@ -3822,13 +3822,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -3977,13 +3977,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -60,7 +69,16 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -3908,7 +3908,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -3999,7 +3999,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
+ extern const char kEnableProtoApiForClassifyUrlDescription[];
+ #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ extern const char kUseOutOfProcessVideoDecodingName[];
+ extern const char kUseOutOfProcessVideoDecodingDescription[];
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -4073,7 +4073,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -69,3 +87,12 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
+@@ -4091,7 +4091,7 @@ extern const char kSigninInterceptBubbleV2Description[
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
+ extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc
index de3500fc748e..8e33f6757d7b 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/media/webrtc/capture_policy_utils.cc
-@@ -121,7 +121,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
+@@ -125,7 +125,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite(
content::BrowserContext* context) {
@@ -9,12 +9,12 @@
Profile* profile = Profile::FromBrowserContext(context);
if (!profile) {
return false;
-@@ -148,7 +148,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny
+@@ -162,7 +162,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny
bool IsGetDisplayMediaSetSelectAllScreensAllowed(
content::BrowserContext* context,
const GURL& url) {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
Profile* profile = Profile::FromBrowserContext(context);
- if (!profile)
+ if (!profile) {
return false;
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
index ac438f7610fa..9c3ae1596e5c 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/shell.h"
#include "ui/aura/window.h"
@@ -9,7 +9,7 @@
#include "base/functional/callback.h"
#include "content/public/browser/desktop_capture.h"
#endif
-@@ -31,7 +31,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
+@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
} // namespace
@@ -18,7 +18,7 @@
namespace {
base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
-@@ -77,7 +77,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
+@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
return stream_devices_set;
}
@@ -27,7 +27,7 @@
blink::mojom::StreamDevicesSetPtr EnumerateScreens(
blink::mojom::MediaStreamType stream_type) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-@@ -128,7 +128,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
+@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
root_windows_for_testing_.Get() = std::move(root_windows);
}
@@ -36,9 +36,9 @@
void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
std::unique_ptr<webrtc::DesktopCapturer> capturer) {
g_desktop_capturer_for_testing.Get() = std::move(capturer);
-@@ -144,7 +144,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
- DCHECK(base::FeatureList::IsEnabled(
- features::kGetDisplayMediaSetAutoSelectAllScreens));
+@@ -146,7 +146,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
+ features::kGetDisplayMediaSetAutoSelectAllScreens)) ||
+ base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 177ccc28bcff..1a13efa5e189 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -65,8 +65,10 @@
+@@ -66,8 +66,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -100,7 +102,7 @@
+@@ -101,7 +103,7 @@
#include "chromeos/startup/startup_switches.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -21,7 +21,7 @@
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -512,7 +514,7 @@ void RecordStartupMetrics() {
+@@ -528,7 +530,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -30,7 +30,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -712,7 +714,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -728,7 +730,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index a90bc4c24d3c..b5480d5673b5 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -176,7 +176,7 @@
+@@ -178,7 +178,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@@ -9,7 +9,7 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
-@@ -202,7 +202,7 @@
+@@ -204,7 +204,7 @@
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
#include "chrome/browser/metrics/family_link_user_metrics_provider.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
// BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID))
-@@ -764,7 +764,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -770,7 +770,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@@ -27,7 +27,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
-@@ -843,7 +843,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -849,7 +849,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -852,7 +852,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -858,7 +858,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
#if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \
(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -45,7 +45,7 @@
if (base::FeatureList::IsEnabled(
kExtendFamilyLinkUserLogSegmentToAllPlatforms)) {
metrics_service_->RegisterMetricsProvider(
-@@ -960,7 +960,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -966,7 +966,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -54,7 +54,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1144,7 +1144,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -1163,7 +1163,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index c33ca1e33ada..bb4cd439949e 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,4 +1,4 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -93,7 +93,7 @@
@@ -27,8 +27,8 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -489,7 +489,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
- base::Unretained(this)));
+@@ -503,7 +503,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -36,7 +36,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
-@@ -539,7 +539,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -553,7 +553,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -45,7 +45,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -568,7 +568,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -582,7 +582,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,8 +54,8 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
-@@ -959,7 +959,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
- }
+@@ -1004,7 +1004,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
index 33a17bee0723..b6e94c226334 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
@@ -1,7 +1,7 @@
---- chrome/browser/net/system_network_context_manager.h.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/net/system_network_context_manager.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/net/system_network_context_manager.h
-@@ -194,7 +194,7 @@ class SystemNetworkContextManager {
- void UpdateExplicitlyAllowedNetworkPorts();
+@@ -207,7 +207,7 @@ class SystemNetworkContextManager {
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index af8688fdafd6..f6326517f71f 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -205,12 +205,12 @@
+@@ -206,12 +206,12 @@
#include "components/spellcheck/browser/pref_names.h"
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -15,7 +15,7 @@
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -772,14 +772,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -770,14 +770,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -32,7 +32,7 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
-@@ -1439,7 +1439,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1431,7 +1431,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -41,7 +41,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
-@@ -1509,18 +1509,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1501,18 +1501,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -63,7 +63,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
-@@ -1533,7 +1533,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1525,7 +1525,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
// || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
@@ -72,7 +72,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
-@@ -1637,7 +1637,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1629,7 +1629,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -81,7 +81,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
-@@ -1724,13 +1724,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1725,13 +1725,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -97,7 +97,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1761,7 +1761,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1762,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -106,16 +106,7 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1790,7 +1790,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \
-- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA))
-+ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
- { key::kChromeAppsEnabled,
- extensions::pref_names::kChromeAppsEnabled,
- base::Value::Type::BOOLEAN },
-@@ -1850,7 +1850,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1844,7 +1844,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -124,7 +115,7 @@
{ key::kHighEfficiencyModeEnabled,
performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
base::Value::Type::BOOLEAN },
-@@ -1895,7 +1895,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1889,7 +1889,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(ENABLE_PPAPI)
@@ -133,7 +124,7 @@
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
-@@ -2162,7 +2162,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2156,7 +2156,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -142,7 +133,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
-@@ -2219,7 +2219,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2213,7 +2213,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@@ -151,7 +142,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -2254,7 +2254,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2248,7 +2248,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies;
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -160,7 +151,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
-@@ -2608,7 +2608,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2604,7 +2604,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -169,7 +160,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -2616,7 +2616,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2612,7 +2612,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -178,7 +169,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
-@@ -2629,7 +2629,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2625,7 +2625,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));
diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
new file mode 100644
index 000000000000..264a3cec6660
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/policy/policy_value_and_status_aggregator.cc
+@@ -55,7 +55,7 @@
+ #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
+ #endif // BUILDFLAG(ENABLE_EXTENSIONS)
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h"
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+
+@@ -106,7 +106,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
+ #else // BUILDFLAG(IS_CHROMEOS_ASH)
+ policy::CloudPolicyManager* cloud_policy_manager =
+ profile->GetUserCloudPolicyManager();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (!cloud_policy_manager) {
+ cloud_policy_manager = profile->GetProfileCloudPolicyManager();
+ }
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index a486968f5c7c..b445a3781892 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -464,13 +464,13 @@
+@@ -465,13 +465,13 @@
#include "components/os_crypt/sync/os_crypt.h"
#endif
@@ -16,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -503,7 +503,7 @@
+@@ -504,7 +504,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@@ -25,7 +25,7 @@
#include "ui/color/system_theme.h"
#endif
-@@ -800,7 +800,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
+@@ -731,7 +731,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@@ -34,7 +34,7 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -904,7 +904,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
+@@ -872,7 +872,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
@@ -43,7 +43,7 @@
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -1033,7 +1033,7 @@ void RegisterProfilePrefsForMigration(
+@@ -987,7 +987,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@@ -52,7 +52,7 @@
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
-@@ -1686,11 +1686,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1690,11 +1690,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
#endif
@@ -66,7 +66,7 @@
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
-@@ -1878,7 +1878,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
+@@ -1857,7 +1857,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023
@@ -75,7 +75,7 @@
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -2038,7 +2038,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
+@@ -1992,7 +1992,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
index cdf3c9e15bc4..e13e2da04e41 100644
--- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -602,7 +602,7 @@ PrintBackendServiceManager::RegisterClient(
+@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient(
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
@@ -9,7 +9,7 @@
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
-@@ -868,7 +868,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -960,7 +960,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
case ClientType::kQueryWithUi:
@@ -18,7 +18,7 @@
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
-@@ -925,7 +925,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -1017,7 +1017,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:
@@ -27,3 +27,12 @@
// No need to update if there were other query with UI clients.
if (HasQueryWithUiClientForRemoteId(remote_id)) {
return absl::nullopt;
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+ RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result) {
++ typename std::remove_reference<T>::type... result) {
+ auto found_callbacks_map = saved_callbacks.find(remote_id);
+ if (found_callbacks_map == saved_callbacks.end())
+ return; // No callbacks to run.
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h
new file mode 100644
index 000000000000..d7c9307957bc
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.h
@@ -0,0 +1,11 @@
+--- chrome/browser/printing/print_backend_service_manager.h.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/printing/print_backend_service_manager.h
+@@ -587,7 +587,7 @@ class PrintBackendServiceManager {
+ template <class... T>
+ void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result);
++ typename std::remove_reference<T>::type... result);
+
+ // Test support for client ID management.
+ static void SetClientsForTesting(
diff --git a/www/chromium/files/patch-chrome_browser_printing_printer__query.cc b/www/chromium/files/patch-chrome_browser_printing_printer__query.cc
index 186da4ad3b5b..f980d96b1c26 100644
--- a/www/chromium/files/patch-chrome_browser_printing_printer__query.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_printer__query.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/printer_query.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/printing/printer_query.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/printing/printer_query.cc
-@@ -339,7 +339,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
+@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index e21e56e95bbc..59c95f5c6cc1 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -361,17 +361,17 @@
+@@ -363,17 +363,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -21,7 +21,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
-@@ -535,7 +535,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -543,7 +543,7 @@ void ChromeBrowserMainExtraPartsProfiles::
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
browser_sync::UserEventServiceFactory::GetInstance();
@@ -30,7 +30,7 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
BrowsingDataHistoryObserverService::Factory::GetInstance();
-@@ -606,16 +606,16 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -614,16 +614,16 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
DriveServiceFactory::GetInstance();
#endif
@@ -50,7 +50,7 @@
enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance();
#endif
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -718,12 +718,12 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -729,12 +729,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -65,12 +65,12 @@
enterprise_idle::IdleServiceFactory::GetInstance();
#endif
ModelTypeStoreServiceFactory::GetInstance();
-@@ -786,7 +786,7 @@ void ChromeBrowserMainExtraPartsProfiles::
- PolicyBlocklistFactory::GetInstance();
+@@ -801,7 +801,7 @@ void ChromeBrowserMainExtraPartsProfiles::
PredictionServiceFactory::GetInstance();
+
PrimaryAccountPolicyManagerFactory::GetInstance();
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
ProfileTokenWebSigninInterceptorFactory::GetInstance();
+ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
#endif
- #if !BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
index bf4e3f5b5d90..1b0d866547c9 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/profiles/profile_impl.cc
-@@ -260,6 +260,10 @@
+@@ -263,6 +263,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@@ -11,7 +11,16 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
-@@ -865,7 +869,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -611,7 +615,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
+ #else
+ {
+ #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ProfileManager* profile_manager = g_browser_process->profile_manager();
+ ProfileAttributesEntry* entry =
+ profile_manager->GetProfileAttributesStorage()
+@@ -886,7 +890,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
index 014e10c0cde4..13e8ab242934 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profiles_state.cc.orig 2022-09-24 10:57:32 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/profiles/profiles_state.cc
-@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
+@@ -182,7 +182,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
PrefService* local_state,
bool show_warning) {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
index 645e71dd8d1d..01f9a99a0ed6 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
@@ -1,15 +1,15 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -28,7 +28,7 @@
+@@ -27,7 +27,7 @@
+ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
- button-aria-description="$i18n{opensInNewTab}"
on-click="openThemeUrl_" external></cr-link-row>
-<if expr="not is_linux">
+<if expr="not is_posix">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
<cr-button id="useDefault" on-click="onUseDefaultClick_">
-@@ -36,7 +36,7 @@
+@@ -35,7 +35,7 @@
</cr-button>
</template>
</if>
@@ -18,7 +18,7 @@
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, systemTheme_)]]"
-@@ -143,7 +143,7 @@
+@@ -142,7 +142,7 @@
</div>
</template>
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
index 7f29c0c45ee8..23d3b7137343 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
@@ -1,6 +1,6 @@
---- chrome/browser/resources/settings/route.ts.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -223,7 +223,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -232,7 +232,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection(
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
index bcccad91c79f..da2a6a7844ae 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-01-11 09:17:16 UTC
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
@@ -18,7 +18,7 @@
#include "net/base/url_util.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif
-@@ -364,7 +364,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
+@@ -368,7 +368,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
new file mode 100644
index 000000000000..d5caa475b486
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
+@@ -41,7 +41,7 @@
+ #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
+ #elif BUILDFLAG(IS_CHROMEOS)
+ #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h"
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h"
+ #endif
+
+@@ -61,7 +61,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
+ #elif BUILDFLAG(IS_ANDROID)
+ return std::make_unique<SupervisedUserWebContentHandlerImpl>(
+ web_contents, frame_id, navigation_id);
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ return std::make_unique<SupervisedUserWebContentHandlerImpl>(
+ web_contents, frame_id, navigation_id);
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
index 78b330b4a77e..4254c53da5d5 100644
--- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -127,7 +127,7 @@
#endif // BUILDFLAG(IS_ANDROID)
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-@@ -473,7 +473,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -475,7 +475,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -18,7 +18,7 @@
if (base::FeatureList::IsEnabled(features::kTabGroupsSaveSyncIntegration)) {
controllers.push_back(std::make_unique<syncer::ModelTypeController>(
syncer::SAVED_TAB_GROUP,
-@@ -486,7 +486,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -488,7 +488,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
// Chrome prefers OS provided spell checkers where they exist. So only sync the
// custom dictionary on platforms that typically don't provide one.
@@ -27,7 +27,7 @@
// Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back(
-@@ -653,7 +653,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
+@@ -655,7 +655,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
switch (type) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
index 1f9c96af2b75..7b5d4c095569 100644
--- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/sync_service_factory.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/sync/sync_service_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/sync/sync_service_factory.cc
-@@ -76,7 +76,7 @@
+@@ -74,7 +74,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
-@@ -117,7 +117,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -119,7 +119,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/1052397): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is
// complete.
@@ -18,7 +18,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
-@@ -258,7 +258,7 @@ SyncServiceFactory::SyncServiceFactory()
+@@ -257,7 +257,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ThemeServiceFactory::GetInstance());
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index 2d9b2085c2c9..03e90c59964b 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/task_manager/sampling/task_group.h
-@@ -43,7 +43,7 @@ constexpr int kUnsupportedVMRefreshFlags =
+@@ -44,7 +44,7 @@ constexpr int kUnsupportedVMRefreshFlags =
REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
@@ -9,7 +9,7 @@
REFRESH_TYPE_FD_COUNT |
#endif
REFRESH_TYPE_HARD_FAULTS;
-@@ -149,7 +149,7 @@ class TaskGroup {
+@@ -150,7 +150,7 @@ class TaskGroup {
}
#endif // BUILDFLAG(ENABLE_NACL)
@@ -18,7 +18,7 @@
int open_fd_count() const { return open_fd_count_; }
void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -169,7 +169,7 @@ class TaskGroup {
+@@ -170,7 +170,7 @@ class TaskGroup {
void RefreshNaClDebugStubPort(int child_process_unique_id);
void OnRefreshNaClDebugStubPortDone(int port);
#endif
@@ -27,7 +27,7 @@
void OnOpenFdCountRefreshDone(int open_fd_count);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -241,7 +241,7 @@ class TaskGroup {
+@@ -243,7 +243,7 @@ class TaskGroup {
#if BUILDFLAG(ENABLE_NACL)
int nacl_debug_stub_port_;
#endif // BUILDFLAG(ENABLE_NACL)
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
index 8835599eae0a..e86cab39ab67 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/themes/theme_service.cc.orig 2023-02-08 09:03:45 UTC
+--- chrome/browser/themes/theme_service.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/themes/theme_service.cc
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
#include "extensions/browser/extension_registry_observer.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -313,7 +313,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
+@@ -315,7 +315,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 2d872769684a..e04055c2ec8c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -105,7 +105,7 @@
+@@ -110,7 +110,7 @@
#include "components/user_manager/user_manager.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
-@@ -293,7 +293,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -298,7 +298,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
-@@ -545,7 +545,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -550,7 +550,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -1112,7 +1112,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1151,7 +1151,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
index f1b3b27d5fc8..15ad283a6105 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/chrome_pages.cc.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -69,7 +69,7 @@
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
-@@ -651,7 +651,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -663,7 +663,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
index b021c86d8de9..cd1ebc7182ec 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/chrome_pages.h.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/ui/chrome_pages.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -34,7 +34,7 @@ enum class ConsentLevel;
} // namespace signin
@@ -9,7 +9,7 @@
namespace web_app {
enum class AppSettingsPageEntryPoint;
} // namespace web_app
-@@ -241,7 +241,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -245,7 +245,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
new file mode 100644
index 000000000000..c657ac76f19f
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
+@@ -1954,7 +1954,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
+ return OmniboxFieldTrial::IsChromeRefreshIconsEnabled()
+ ? omnibox::kShareWinChromeRefreshIcon
+ : omnibox::kShareWinIcon;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return OmniboxFieldTrial::IsChromeRefreshIconsEnabled()
+ ? omnibox::kShareLinuxChromeRefreshIcon
+ : omnibox::kShareIcon;
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
index 6423d810b828..c61af2352d4f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin_view_controller.cc.orig 2023-02-08 09:03:45 UTC
+--- chrome/browser/ui/signin_view_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/signin_view_controller.cc
-@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -276,7 +276,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
SkColor profile_color,
signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index 3d2f2240242d..4296a043f478 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-02-08 09:03:45 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -94,7 +94,7 @@ static const char* kBadFlags[] = {
+@@ -95,7 +95,7 @@ static const char* kBadFlags[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 5a17d927ef8f..4d5f2e2fffe3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -132,7 +132,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#include "components/headless/policy/headless_mode_policy.h"
-@@ -957,7 +957,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -961,7 +961,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@@ -18,7 +18,7 @@
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
-@@ -1061,7 +1061,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1065,7 +1065,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@@ -27,7 +27,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1253,7 +1253,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1257,7 +1257,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
<< "Failed launch with app: couldn't pick a profile";
std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 1af3e964a57e..49c368c8b738 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -204,7 +204,7 @@
+@@ -208,7 +208,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/hats/hats_helper.h"
-@@ -538,12 +538,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -546,12 +546,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
new file mode 100644
index 000000000000..bd09c0c8074b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/ui_features.cc.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/ui/ui_features.cc
+@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
+ "TopChromeWebUIUsesSpareRenderer",
+ base::FEATURE_ENABLED_BY_DEFAULT);
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables alternate update-related text to be displayed in browser app menu
+ // button, menu item and confirmation dialog.
+ BASE_FEATURE(kUpdateTextOptions,
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
new file mode 100644
index 000000000000..6bce0fbfcc8c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/ui_features.h.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/ui/ui_features.h
+@@ -203,7 +203,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
+
+ BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kUpdateTextOptions);
+ extern const base::FeatureParam<int> kUpdateTextOptionNumber;
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 63a048ab306e..64b5e3c207d9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -51,7 +51,7 @@
#include "components/user_manager/user_manager.h"
@@ -18,7 +18,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
-@@ -294,7 +294,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -298,7 +298,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@@ -27,7 +27,7 @@
// If the window was sent to a different workspace, prioritize it if
// it was sent to the current workspace and deprioritize it
// otherwise. This is done by MoveBrowsersInWorkspaceToFront()
-@@ -442,7 +442,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -456,7 +456,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@@ -36,7 +36,7 @@
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
-@@ -459,7 +459,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -473,7 +473,7 @@ void BrowserFrame::SelectNativeTheme() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
index 111592898de6..d1c3274d005e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -12,7 +12,7 @@
#include "ui/views/context_menu_controller.h"
@@ -18,7 +18,7 @@
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
-@@ -228,7 +228,7 @@ class BrowserFrame : public views::Widget, public view
+@@ -232,7 +232,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index ebc553a4f091..1fcd3afadd3a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1994,7 +1994,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -1997,7 +1997,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
// CrOS cleanup is done.
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index dec0f2ba4fc7..c11de64711f0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
-@@ -40,7 +40,7 @@
+@@ -42,7 +42,7 @@
#include "ui/aura/window.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
#endif
-@@ -61,7 +61,7 @@ constexpr int kBackToTabImageSize = 16;
+@@ -63,7 +63,7 @@ constexpr int kBackToTabImageSize = 16;
// The height of the controls bar at the top of the window.
constexpr int kTopControlsHeight = 30;
@@ -18,7 +18,7 @@
// Frame border when window shadow is not drawn.
constexpr int kFrameBorderThickness = 4;
#endif
-@@ -151,7 +151,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -153,7 +153,7 @@ class WindowEventObserver : public ui::EventObserver {
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
@@ -27,7 +27,7 @@
// Calculate input bounds for Linux. This is needed because the input bounds
// is not necessary the same as the local bounds on Linux.
if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -341,7 +341,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -350,7 +350,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
hide_close_button_animation_.set_continuous(false);
hide_close_button_animation_.set_delegate(this);
@@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
-@@ -469,7 +469,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -480,7 +480,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
@@ -45,7 +45,7 @@
// On Linux the top bar background will be drawn in OnPaint().
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -514,7 +514,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -525,7 +525,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
-@@ -715,7 +715,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -726,7 +726,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +63,7 @@
// Draw the PiP window frame borders and shadows, including the top bar
// background.
if (window_frame_provider_) {
-@@ -838,7 +838,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -849,7 +849,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,7 +72,7 @@
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const auto tiled_edges = frame()->tiled_edges();
-@@ -859,7 +859,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+@@ -870,7 +870,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -81,8 +81,8 @@
return FrameBorderInsets();
#else
return gfx::Insets(kResizeBorder);
-@@ -870,7 +870,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
- return FrameBorderInsets().top() + kTopControlsHeight;
+@@ -889,7 +889,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+ top_height + border_thickness.bottom());
}
-#if BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
index e0ede5c2b088..5440df2444b0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -20,7 +20,7 @@
#include "ui/views/controls/image_view.h"
@@ -18,7 +18,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
-@@ -159,7 +159,7 @@ class PictureInPictureBrowserFrameView
+@@ -163,7 +163,7 @@ class PictureInPictureBrowserFrameView
// Called when mouse entered or exited the pip window.
void OnMouseEnteredOrExitedWindow(bool entered);
@@ -27,7 +27,7 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
-@@ -222,7 +222,7 @@ class PictureInPictureBrowserFrameView
+@@ -227,7 +227,7 @@ class PictureInPictureBrowserFrameView
gfx::MultiAnimation show_close_button_animation_;
gfx::MultiAnimation hide_close_button_animation_;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
index 26d4d15724e7..a0a21d22bee1 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-02-08 09:03:45 UTC
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -61,7 +61,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
+@@ -62,7 +62,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
SetAnimateOnStateChange(true);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index 5073bf862a1a..d729493d1e65 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
-@@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -581,7 +581,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled())
return;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index 9f7ca5804a11..f6085133ae92 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -79,7 +79,7 @@
+@@ -81,7 +81,7 @@
#include "components/remote_cocoa/browser/window.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/aura/client/drag_drop_client.h"
#endif
-@@ -187,7 +187,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
const gfx::ImageSkia& image) {
@@ -18,7 +18,7 @@
aura::Window* root_window =
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
if (aura::client::GetDragDropClient(root_window)) {
-@@ -361,7 +361,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -363,7 +363,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
// - ChromeOS Ash
// Releasing capture on Ash cancels gestures so avoid it.
@@ -27,7 +27,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -957,7 +957,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -952,7 +952,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,7 +36,7 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
-@@ -1957,7 +1957,7 @@ void TabDragController::CompleteDrag() {
+@@ -1978,7 +1978,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@@ -45,7 +45,7 @@
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
// for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2340,7 +2340,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2361,7 +2361,7 @@ TabDragController::Liveness TabDragController::GetLoca
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
index 27bb85fad3bd..7ac96b559cde 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -749,7 +749,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+@@ -751,7 +751,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
// not become active. Setting this to false creates the need to explicitly
// hide the hovercard on press, touch, and keyboard events.
SetCanActivate(false);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
index 3c448c30f749..b484a301ca3a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -406,7 +406,7 @@ std::string GetFileExtension(FileExtension file_extens
}
@@ -9,7 +9,7 @@
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
-@@ -869,7 +869,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
+@@ -872,7 +872,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts.";
// TODO(crbug.com/1273568): Investigate the true source of flakiness instead
// of papering over it here.
@@ -18,7 +18,7 @@
ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts());
#endif
LOG(INFO)
-@@ -1740,7 +1740,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
+@@ -1812,7 +1812,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@@ -27,7 +27,7 @@
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
-@@ -2905,7 +2905,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
+@@ -2992,7 +2992,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@@ -36,7 +36,7 @@
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -2920,7 +2920,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3007,7 +3007,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@@ -45,7 +45,7 @@
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -2930,7 +2930,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3017,7 +3017,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
@@ -54,7 +54,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
-@@ -2946,7 +2946,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
+@@ -3033,7 +3033,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
@@ -63,7 +63,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
-@@ -3565,7 +3565,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
+@@ -3759,7 +3759,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const AppId& app_id) {
@@ -72,7 +72,7 @@
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
-@@ -3740,7 +3740,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
+@@ -3938,7 +3938,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@@ -81,7 +81,7 @@
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
-@@ -3784,7 +3784,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
+@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
index 8becdbaaf6cf..255ebdf7fdf0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about_ui.cc.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/ui/webui/about_ui.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/about_ui.cc
-@@ -602,7 +602,7 @@ std::string ChromeURLs() {
+@@ -603,7 +603,7 @@ std::string ChromeURLs() {
return html;
}
@@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data,
-@@ -656,7 +656,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -657,7 +657,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index 0ca230380b39..6821cef556b5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -362,7 +362,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+@@ -416,7 +416,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
bool deprecated_app = false;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
auto* context = extension_system_->extension_service()->GetBrowserContext();
deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
-@@ -425,7 +425,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+@@ -479,7 +479,7 @@ void AppHomePageHandler::FillExtensionInfoList(
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index 9a11fef4a893..8f69ec21fe73 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -330,7 +330,7 @@
+@@ -325,7 +325,7 @@
#include "chrome/browser/ui/webui/app_launcher_page_ui.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
#endif
-@@ -356,17 +356,17 @@
+@@ -351,17 +351,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -30,7 +30,7 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
-@@ -746,7 +746,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -702,7 +702,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -39,7 +39,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1054,7 +1054,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -982,7 +982,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<ash::KerberosInBrowserUI>;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -1109,7 +1109,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1037,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@@ -57,7 +57,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
-@@ -1177,27 +1177,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1105,27 +1105,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
index 9742c0e83134..db0370606d04 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -171,7 +171,7 @@ enum class ReportingType {
+@@ -172,7 +172,7 @@ enum class ReportingType {
kUserActivity
};
@@ -9,7 +9,7 @@
const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent";
const char kManagementScreenCaptureData[] = "managementScreenCaptureData";
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -973,7 +973,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
+@@ -974,7 +974,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
kManagementOnPageVisitedVisibleData, &info);
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index c6f9fbe3d38a..f905f1c9bdbc 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -127,7 +127,7 @@
+@@ -129,7 +129,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/display/screen.h"
#endif
-@@ -147,7 +147,7 @@
+@@ -149,7 +149,7 @@
#include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
#endif
@@ -18,16 +18,7 @@
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -236,7 +236,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
- #endif
-
- html_source->AddBoolean("isChildAccount", profile->IsChild());
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
- #else
- bool allow_qt_theme = false;
-@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -384,7 +384,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
{"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
{"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
@@ -36,7 +27,7 @@
{"gtkTheme", IDS_SETTINGS_GTK_THEME},
{"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
{"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -399,7 +399,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -394,7 +394,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@@ -45,7 +36,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
-@@ -421,7 +421,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -416,7 +416,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h
index 15fa48031949..4bb635a4f3b2 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/extension_status_utils.h.orig 2023-01-11 09:17:16 UTC
+--- chrome/browser/web_applications/extension_status_utils.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/web_applications/extension_status_utils.h
-@@ -48,7 +48,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+@@ -56,7 +56,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
const std::string& extension_id);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
index 4ec760ba0f73..4f915cc85885 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-03-09 06:31:50 UTC
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/web_applications/extensions/extension_status_utils.cc
@@ -26,7 +26,7 @@ namespace {
const char* g_preinstalled_app_for_testing = nullptr;
@@ -9,7 +9,7 @@
// TODO(b/268221237): Remove this allow-list.
const char kDefaultAllowedExtensionIds[] =
"alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -113,7 +113,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+@@ -116,7 +116,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -17,4 +17,4 @@
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context,
const std::string& extension_id) {
- if (!base::FeatureList::IsEnabled(features::kChromeAppsDeprecation))
+ if (testing::g_enable_chrome_apps_for_testing) {
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
deleted file mode 100644
index de466c07cd29..000000000000
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
+++ /dev/null
@@ -1,92 +0,0 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.cc.orig 2023-04-28 17:01:32 UTC
-+++ chrome/browser/web_applications/os_integration/os_integration_test_override.cc
-@@ -214,7 +214,7 @@ bool OsIntegrationTestOverride::IsRunOnOsLoginEnabled(
- Profile* profile,
- const AppId& app_id,
- const std::string& app_name) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string shortcut_filename =
- "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
- return base::PathExists(startup().Append(shortcut_filename));
-@@ -491,7 +491,7 @@ base::FilePath OsIntegrationTestOverride::GetShortcutP
- app_installed_profiles.end()) {
- return shortcut_path;
- }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string shortcut_filename =
- "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
- base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
-@@ -516,7 +516,7 @@ bool OsIntegrationTestOverride::IsShortcutCreated(Prof
- base::FilePath app_shortcut_path =
- GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
- return base::PathExists(app_shortcut_path);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- base::FilePath desktop_shortcut_path =
- GetShortcutPath(profile, desktop(), app_id, app_name);
- return base::PathExists(desktop_shortcut_path);
-@@ -544,7 +544,7 @@ bool OsIntegrationTestOverride::SimulateDeleteShortcut
- GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
- DCHECK(base::PathExists(app_folder_shortcut_path));
- return base::DeletePathRecursively(app_folder_shortcut_path);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- base::FilePath desktop_shortcut_path =
- GetShortcutPath(profile, desktop(), app_id, app_name);
- LOG(INFO) << desktop_shortcut_path;
-@@ -561,7 +561,7 @@ bool OsIntegrationTestOverride::ForceDeleteAllShortcut
- return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin();
- #elif BUILDFLAG(IS_MAC)
- return DeleteChromeAppsDir();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return DeleteDesktopDirOnLinux();
- #else
- NOTREACHED() << "Not implemented on ChromeOS/Fuchsia ";
-@@ -601,7 +601,7 @@ void OsIntegrationTestOverride::EnableOrDisablePathOnL
- startup_enabled_[file_path] = enable_on_login;
- }
-
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool OsIntegrationTestOverride::DeleteDesktopDirOnLinux() {
- if (desktop_.IsValid()) {
- return desktop_.Delete();
-@@ -634,7 +634,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
- #elif BUILDFLAG(IS_MAC)
- bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path);
- DCHECK(success);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool success = desktop_.CreateUniqueTempDirUnderPath(base_path);
- DCHECK(success);
- success = startup_.CreateUniqueTempDirUnderPath(base_path);
-@@ -653,7 +653,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
- #elif BUILDFLAG(IS_MAC)
- bool success = chrome_apps_folder_.CreateUniqueTempDir();
- DCHECK(success);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool success = desktop_.CreateUniqueTempDir();
- DCHECK(success);
- success = startup_.CreateUniqueTempDir();
-@@ -661,7 +661,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
- #endif
- }
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- auto callback =
- base::BindRepeating([](base::FilePath filename, std::string xdg_command,
- std::string file_contents) {
-@@ -695,7 +695,7 @@ OsIntegrationTestOverride::~OsIntegrationTestOverride(
- }
- }
- }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Reset the file handling callback.
- SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting(
- UpdateMimeInfoDatabaseOnLinuxCallback());
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
index fe382b973154..e6d8742381ca 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
@@ -1,29 +1,11 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/web_applications/os_integration/os_integration_test_override.h
-@@ -36,7 +36,7 @@ class ShellLinkItem;
-
- namespace web_app {
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- struct LinuxFileRegistration {
- std::string xdg_command;
- std::string file_contents;
-@@ -201,7 +201,7 @@ class OsIntegrationTestOverride
- }
- void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
- bool enable_on_login);
+@@ -92,7 +92,7 @@ class OsIntegrationTestOverride
+ virtual const base::FilePath& chrome_apps_folder() = 0;
+ virtual void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
+ bool enable_on_login) = 0;
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool DeleteDesktopDirOnLinux();
- const base::FilePath& desktop() { return desktop_.GetPath(); }
- const base::FilePath& startup() { return startup_.GetPath(); }
-@@ -250,7 +250,7 @@ class OsIntegrationTestOverride
- base::ScopedTempDir chrome_apps_folder_;
- std::map<base::FilePath, bool> startup_enabled_;
-
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- base::ScopedTempDir desktop_;
- base::ScopedTempDir startup_;
- std::vector<LinuxFileRegistration> linux_file_registration_;
+ virtual const base::FilePath& desktop() = 0;
+ virtual const base::FilePath& startup() = 0;
+ virtual const base::FilePath& applications_dir() = 0;
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
index 267320830902..d7481a87f26a 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-04-05 11:05:06 UTC
+--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
-@@ -170,7 +170,7 @@ void ShortcutSubManager::Execute(
+@@ -166,7 +166,7 @@ void ShortcutSubManager::Execute(
return;
}
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
index 45ce1d12cb3f..1c003c894b1e 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
@@ -1,11 +1,11 @@
---- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2022-11-30 08:12:58 UTC
+--- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
-@@ -45,7 +45,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id,
- Profile* profile,
+@@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id,
+ const base::FilePath& profile_path,
ResultCallback callback);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Exposed for testing purposes. Register the set of
// MIME-type-to-file-extensions mappings corresponding to |file_handlers|. File
- // I/O and a a callout to the Linux shell are performed asynchronously.
+ // I/O and callouts to the Linux shell are performed asynchronously.
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
new file mode 100644
index 000000000000..89bd7e6e93ab
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
@@ -0,0 +1,128 @@
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc
+@@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
+ }
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Performs a blocking read of app icons from the disk.
+ SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager,
+ const AppId& app_id,
+@@ -224,7 +224,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor
+ GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
+ CHECK(base::PathExists(app_folder_shortcut_path));
+ return base::DeletePathRecursively(app_folder_shortcut_path);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FilePath desktop_shortcut_path =
+ GetShortcutPath(profile, desktop(), app_id, app_name);
+ LOG(INFO) << desktop_shortcut_path;
+@@ -241,7 +241,7 @@ bool OsIntegrationTestOverrideImpl::ForceDeleteAllShor
+ return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin();
+ #elif BUILDFLAG(IS_MAC)
+ return DeleteChromeAppsDir();
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return DeleteDesktopDirOnLinux();
+ #else
+ NOTREACHED() << "Not implemented on ChromeOS/Fuchsia ";
+@@ -277,7 +277,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM
+ }
+ #endif // BUILDFLAG(IS_WIN)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() {
+ if (desktop_.IsValid()) {
+ return desktop_.Delete();
+@@ -291,7 +291,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab
+ Profile* profile,
+ const AppId& app_id,
+ const std::string& app_name) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string shortcut_filename =
+ "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
+ return base::PathExists(startup().Append(shortcut_filename));
+@@ -347,7 +347,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan
+ is_file_handled =
+ shell_integration::CanApplicationHandleURL(app_path, test_file_url);
+ base::DeleteFile(test_file_path);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FilePath user_applications_dir =
+ applications_dir().Append("applications");
+ bool database_update_called = false;
+@@ -391,7 +391,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC
+ return absl::nullopt;
+ }
+ return GetIconTopLeftColorFromShortcutFile(shortcut_path);
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile);
+ if (!provider) {
+ return absl::nullopt;
+@@ -441,7 +441,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort
+ app_installed_profiles.end()) {
+ return shortcut_path;
+ }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string shortcut_filename =
+ "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
+ base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
+@@ -467,7 +467,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated(
+ base::FilePath app_shortcut_path =
+ GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
+ return base::PathExists(app_shortcut_path);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FilePath desktop_shortcut_path =
+ GetShortcutPath(profile, desktop(), app_id, app_name);
+ return base::PathExists(desktop_shortcut_path);
+@@ -656,7 +656,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat
+ }
+ #endif // BUILDFLAG(IS_MAC)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const base::FilePath& OsIntegrationTestOverrideImpl::desktop() {
+ return desktop_.GetPath();
+ }
+@@ -691,7 +691,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+ #elif BUILDFLAG(IS_MAC)
+ bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path);
+ CHECK(success);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool success = desktop_.CreateUniqueTempDirUnderPath(base_path);
+ CHECK(success);
+ success = startup_.CreateUniqueTempDirUnderPath(base_path);
+@@ -712,7 +712,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+ #elif BUILDFLAG(IS_MAC)
+ bool success = chrome_apps_folder_.CreateUniqueTempDir();
+ CHECK(success);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool success = desktop_.CreateUniqueTempDir();
+ CHECK(success);
+ success = startup_.CreateUniqueTempDir();
+@@ -722,7 +722,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+ #endif
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ auto callback = base::BindRepeating([](base::FilePath filename_in,
+ std::string xdg_command,
+ std::string file_contents) {
+@@ -767,7 +767,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr
+ }
+ }
+ }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Reset the file handling callback.
+ SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting(
+ UpdateMimeInfoDatabaseOnLinuxCallback());
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
new file mode 100644
index 000000000000..c7cf9c268f44
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
@@ -0,0 +1,38 @@
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2023-05-31 08:12:17 UTC
++++ chrome/browser/web_applications/test/os_integration_test_override_impl.h
+@@ -38,7 +38,7 @@ class ShellLinkItem;
+
+ namespace web_app {
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ struct LinuxFileRegistration {
+ base::FilePath file_name;
+ std::string xdg_command;
+@@ -116,7 +116,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+ bool DeleteApplicationMenuDirOnWin();
+ #endif // BUILDFLAG(IS_WIN)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool DeleteDesktopDirOnLinux();
+ #endif // BUILDFLAG(IS_LINUX)
+
+@@ -235,7 +235,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+ const base::FilePath& chrome_apps_folder() override;
+ void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
+ bool enable_on_login) override;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const base::FilePath& desktop() override;
+ const base::FilePath& startup() override;
+ const base::FilePath& applications_dir() override;
+@@ -282,7 +282,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+ base::ScopedTempDir chrome_apps_folder_;
+ std::map<base::FilePath, bool> startup_enabled_;
+
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::ScopedTempDir desktop_;
+ base::ScopedTempDir startup_;
+ base::ScopedTempDir applications_dir_;
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index b81cb942d82c..a80c8d67055b 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -590,7 +590,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+@@ -561,7 +561,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
g_observer->ConfiguringCable(request_type);
}
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index fa65bd5460a9..2330a2989d5c 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/chrome_features.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/chrome_features.cc
@@ -82,7 +82,7 @@ BASE_FEATURE(kAsyncDns,
);
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -308,7 +308,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
+@@ -319,7 +319,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
// Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
// If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
// Apps will not launch and will be marked in the UI as deprecated.
-@@ -335,7 +335,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
+@@ -346,7 +346,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -45,7 +45,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -351,7 +351,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -362,7 +362,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -54,7 +54,7 @@
true
#else
false
-@@ -752,7 +752,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+@@ -766,7 +766,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
"KAnonymityServiceStorage",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -63,7 +63,7 @@
BASE_FEATURE(kLinuxLowMemoryMonitor,
"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -765,7 +765,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -779,7 +779,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
&kLinuxLowMemoryMonitor, "critical_level", 255};
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 392a1043e29d..8238cbcc334c 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/chrome_features.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/chrome_features.h
@@ -64,13 +64,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns);
@@ -16,7 +16,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -192,7 +192,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
+@@ -198,7 +198,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +25,7 @@
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps);
-@@ -441,7 +441,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
+@@ -450,7 +450,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
@@ -34,7 +34,7 @@
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -449,7 +449,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -458,7 +458,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
index a4d0a1e1465c..4e039448a59a 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths_internal.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/common/chrome_paths_internal.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/chrome_paths_internal.h
-@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
+@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
// Get the path to the user's documents directory.
bool GetUserDocumentsDirectory(base::FilePath* result);
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index 07556e581391..7f76eb45653b 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/chrome_switches.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/chrome_switches.cc
-@@ -852,14 +852,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -860,14 +860,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 896b2ba1d86c..02b3494fd241 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig 2023-04-05 11:05:06 UTC
+--- chrome/common/chrome_switches.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/chrome_switches.h
-@@ -266,12 +266,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -268,12 +268,12 @@ extern const char kAllowNaClSocketAPI[];
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 2f72151debcf..d0da20d332c8 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/pref_names.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/pref_names.cc
-@@ -1151,7 +1151,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
+@@ -1181,7 +1181,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system";
const char kSystemTheme[] = "extensions.theme.system_theme";
-@@ -1255,7 +1255,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1288,7 +1288,7 @@ const char kShowUpdatePromotionInfoBar[] =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
// Boolean that is false if we should show window manager decorations. If
// true, we draw a custom chrome frame (thicker title bar and blue border).
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1759,7 +1759,7 @@ const char kDownloadDirUpgraded[] = "download.director
+@@ -1789,7 +1789,7 @@ const char kDownloadDirUpgraded[] = "download.director
const char kDownloadLastCompleteTime[] = "download.last_complete_time";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
-@@ -2179,7 +2179,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2220,7 +2220,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
// requests.
const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
@@ -36,7 +36,7 @@
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3209,7 +3209,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed
+@@ -3248,7 +3248,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed
const char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";
@@ -45,7 +45,7 @@
// Boolean that indicates if system notifications are allowed to be used in
// place of Chrome notifications.
const char kAllowSystemNotifications[] = "system_notifications.allowed";
-@@ -3262,7 +3262,7 @@ const char kCACertificateManagementAllowed[] =
+@@ -3301,7 +3301,7 @@ const char kCACertificateManagementAllowed[] =
const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled";
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,7 +54,7 @@
const char kEnforceLocalAnchorConstraintsEnabled[] =
"enforce_local_anchor_constraints_enabled";
#endif
-@@ -3585,7 +3585,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe
+@@ -3629,7 +3629,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe
const char kNewBaseUrlInheritanceBehaviorAllowed[] =
"new_base_url_inheritance_behavior_allowed";
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index e469379aaf89..50c763ec26ef 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/pref_names.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/pref_names.h
-@@ -372,7 +372,7 @@ extern const char kUseAshProxy[];
+@@ -377,7 +377,7 @@ extern const char kUseAshProxy[];
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// TODO(https://crbug.com/1317782): Remove in M110.
extern const char kUsesSystemThemeDeprecated[];
extern const char kSystemTheme[];
-@@ -393,7 +393,7 @@ extern const char kShowUpdatePromotionInfoBar[];
+@@ -399,7 +399,7 @@ extern const char kShowUpdatePromotionInfoBar[];
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
extern const char kUseCustomChromeFrame[];
#endif
extern const char kPartitionDefaultZoomLevel[];
-@@ -580,7 +580,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
+@@ -585,7 +585,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
extern const char kDownloadDirUpgraded[];
extern const char kDownloadLastCompleteTime[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -698,7 +698,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
+@@ -705,7 +705,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
extern const char kWebAppsPreferences[];
extern const char kWebAppsIsolationState[];
@@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
extern const char kWebAppsUrlHandlerInfo[];
#endif
-@@ -827,7 +827,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -832,7 +832,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
extern const char kAmbientAuthenticationInPrivateModesEnabled[];
extern const char kBasicAuthOverHttpEnabled[];
@@ -45,7 +45,7 @@
extern const char kAuthNegotiateDelegateByKdcPolicy[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -1106,7 +1106,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture
+@@ -1111,7 +1111,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture
#endif
extern const char kSandboxExternalProtocolBlocked[];
@@ -54,7 +54,7 @@
extern const char kAllowSystemNotifications[];
#endif
-@@ -1132,7 +1132,7 @@ extern const char kCACertificateManagementAllowed[];
+@@ -1137,7 +1137,7 @@ extern const char kCACertificateManagementAllowed[];
extern const char kChromeRootStoreEnabled[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -63,7 +63,7 @@
// TODO(https://crbug.com/1406103): delete this after a few milestones.
extern const char kEnforceLocalAnchorConstraintsEnabled[];
#endif
-@@ -1282,7 +1282,7 @@ extern const char kDIPSTimerLastUpdate[];
+@@ -1288,7 +1288,7 @@ extern const char kDIPSTimerLastUpdate[];
extern const char kThrottleNonVisibleCrossOriginIframesAllowed[];
extern const char kNewBaseUrlInheritanceBehaviorAllowed[];
diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc
index 774fa86a5451..adab52f83ad1 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/url_constants.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/url_constants.cc
-@@ -522,7 +522,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
+@@ -528,7 +528,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
"https://support.google.com/chromebook/?p=multidevice";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h
index 0be81421510d..a718f714954c 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.h
+++ b/www/chromium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/url_constants.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/url_constants.h
-@@ -497,7 +497,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
+@@ -504,7 +504,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
extern const char kPhoneHubPermissionLearnMoreURL[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index ea227202ebc8..8ea3806e0bec 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/webui_url_constants.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -514,18 +514,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
+@@ -515,18 +515,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
const char kOsUIVersionURL[] = "os://version";
#endif
@@ -22,7 +22,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
-@@ -540,14 +540,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -541,14 +541,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -39,7 +39,7 @@
const char kChromeUIBrowserSwitchHost[] = "browser-switch";
const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
const char kChromeUIEnterpriseProfileWelcomeHost[] =
-@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -565,7 +565,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@@ -48,7 +48,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -642,7 +642,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -644,7 +644,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,7 +57,7 @@
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
-@@ -864,7 +864,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -869,7 +869,7 @@ const char* const kChromeDebugURLs[] = {
blink::kChromeUIGpuJavaCrashURL,
kChromeUIJavaCrashURL,
#endif
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index 75a2763d540b..54d212a68db5 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig 2023-04-28 17:01:32 UTC
+--- chrome/common/webui_url_constants.h.orig 2023-05-31 08:12:17 UTC
+++ chrome/common/webui_url_constants.h
-@@ -435,24 +435,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
+@@ -436,24 +436,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -467,14 +467,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -468,14 +468,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
extern const char kChromeUIBrowserSwitchHost[];
extern const char kChromeUIBrowserSwitchURL[];
extern const char kChromeUIEnterpriseProfileWelcomeHost[];
-@@ -488,7 +488,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -489,7 +489,7 @@ extern const char kChromeUIProfilePickerUrl[];
extern const char kChromeUIProfilePickerStartupQuery[];
#endif
diff --git a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
index 8579a519cc67..337fec372adc 100644
--- a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
+++ b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-03-09 06:31:50 UTC
+--- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -345,7 +345,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
+@@ -346,7 +346,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
void ChromeRenderFrameObserver::DraggableRegionsChanged() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index 4f0285f65ba7..3a46fad827aa 100644
--- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/services/printing/print_backend_service_impl.cc
-@@ -43,7 +43,7 @@
+@@ -45,7 +45,7 @@
#include "printing/backend/cups_connection_pool.h"
#endif
@@ -9,7 +9,7 @@
#include "base/no_destructor.h"
#include "ui/linux/linux_ui.h"
#include "ui/linux/linux_ui_delegate_stub.h"
-@@ -70,7 +70,7 @@ namespace printing {
+@@ -72,7 +72,7 @@ namespace printing {
namespace {
@@ -18,7 +18,7 @@
void InstantiateLinuxUiDelegate() {
// TODO(crbug.com/809738) Until a real UI can be used in a utility process,
// need to use the stub version.
-@@ -503,7 +503,7 @@ void PrintBackendServiceImpl::Init(
+@@ -456,7 +456,7 @@ void PrintBackendServiceImpl::Init(
// `InitCommon()`.
InitializeProcessForPrinting();
print_backend_ = PrintBackend::CreateInstance(locale);
@@ -27,7 +27,7 @@
// Test framework already initializes the UI, so this should not go in
// `InitCommon()`. Additionally, low-level Linux UI is not needed when tests
// are using `TestPrintingContext`.
-@@ -714,7 +714,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -677,7 +677,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend_->GetPrinterDriverInfo(*printer_name));
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index 4f509726b521..845692889a0f 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2023-05-09 07:16:03 UTC
+--- chrome/test/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ chrome/test/BUILD.gn
-@@ -10279,7 +10279,7 @@ test("chrome_app_unittests") {
+@@ -10376,7 +10376,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
diff --git a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc
new file mode 100644
index 000000000000..c8d4ffe38ed7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc
@@ -0,0 +1,20 @@
+--- chrome/updater/app/app_uninstall.cc.orig 2023-05-31 08:12:17 UTC
++++ chrome/updater/app/app_uninstall.cc
+@@ -39,7 +39,7 @@
+ #include "chrome/updater/posix/setup.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // TODO(crbug.com/1431487): Remove these includes after investigation.
+ #include "base/ranges/algorithm.h"
+ #include "url/gurl.h"
+@@ -141,7 +141,7 @@ void AppUninstall::UninstallAll(int reason) {
+ uninstall_data.version = base::Version(kUpdaterVersion);
+ }
+ // TODO(crbug.com/1431487): Remove this code after investigation.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ CHECK(base::ranges::none_of(config_->PingUrl(), [](const GURL& url) {
+ return url.DomainIs("update.googleapis.com");
+ })) << "Attempted to send an uninstall ping to non-local server";
diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc
index f0765bb1424e..68f23b10a999 100644
--- a/www/chromium/files/patch-chrome_utility_services.cc
+++ b/www/chromium/files/patch-chrome_utility_services.cc
@@ -1,4 +1,4 @@
---- chrome/utility/services.cc.orig 2023-02-08 09:03:45 UTC
+--- chrome/utility/services.cc.orig 2023-05-31 08:12:17 UTC
+++ chrome/utility/services.cc
@@ -56,7 +56,7 @@
#include "chrome/services/system_signals/mac/mac_system_signals_service.h"
@@ -36,7 +36,7 @@
auto RunDocumentAnalysis(
mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) {
return std::make_unique<DocumentAnalysisService>(std::move(receiver));
-@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -463,7 +463,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
services.Add(RunWindowsIconReader);
#endif // BUILDFLAG(IS_WIN)
@@ -45,7 +45,7 @@
services.Add(RunSystemSignalsService);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
services.Add(RunFileUtil);
#endif
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
index eb8e390bc3e8..f739fe285289 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-04-28 17:01:32 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-05-31 08:12:17 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -2260,7 +2260,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -2317,7 +2317,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index 4355a8895593..f4732f691898 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig 2023-04-28 17:01:32 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-05-31 08:12:17 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -267,7 +267,7 @@ const base::FeatureParam<int>
+@@ -274,7 +274,7 @@ const base::FeatureParam<int>
bool ShouldShowImprovedUserConsentForCreditCardSave() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
index da1b930f809c..ed890d4f07a4 100644
--- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn
@@ -1,6 +1,6 @@
---- components/crash/core/common/BUILD.gn.orig 2022-11-30 08:12:58 UTC
+--- components/crash/core/common/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ components/crash/core/common/BUILD.gn
-@@ -8,7 +8,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
+@@ -9,7 +9,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
declare_args() {
# If set to true, this will stub out and disable the entire crash key system.
diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
index 318699ced101..a1c85f4c9372 100644
--- a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
@@ -1,6 +1,6 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-03-09 06:31:50 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -81,7 +81,7 @@ const char kDesktop[] =
+@@ -82,7 +82,7 @@ const char kDesktop[] =
"Safari/537.36";
#endif // BUILDFLAG(IS_ANDROID)
@@ -9,7 +9,7 @@
std::string GetMachine() {
struct utsname unixinfo;
uname(&unixinfo);
-@@ -189,7 +189,7 @@ void CheckUserAgentStringOrdering(bool mobile_device)
+@@ -190,7 +190,7 @@ void CheckUserAgentStringOrdering(bool mobile_device)
int value;
ASSERT_TRUE(base::StringToInt(pieces[i], &value));
}
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 1afa0229ce49..aaa016190aa7 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig 2023-04-28 17:01:32 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig 2023-05-31 08:12:17 UTC
+++ components/feature_engagement/public/feature_configurations.cc
@@ -39,7 +39,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
absl::optional<FeatureConfig> GetClientSideFeatureConfig(
@@ -9,13 +9,13 @@
if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
absl::optional<FeatureConfig> config = FeatureConfig();
config->valid = true;
-@@ -1150,7 +1150,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -1140,7 +1140,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
- if (kIPHAutofillVirtualCardSuggestionFeature.name == feature->name) {
- // A config that allows the virtual card credit card suggestion IPH to be
- // shown when:
+
+ if (kIPHAutofillExternalAccountProfileSuggestionFeature.name ==
+ feature->name) {
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index 6e05968b5c5b..468f8ab6e9a2 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,21 +1,21 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2023-04-28 17:01:32 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2023-05-31 08:12:17 UTC
+++ components/feature_engagement/public/feature_constants.cc
-@@ -19,7 +19,7 @@ BASE_FEATURE(kUseClientConfigIPH,
+@@ -20,7 +20,7 @@ BASE_FEATURE(kUseClientConfigIPH,
BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHBatterySaverModeFeature,
- "IPH_BatterySaverMode",
- base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -472,7 +472,8 @@ BASE_FEATURE(kIPHiOSPromoCredentialProviderExtensionFe
+ BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature,
+ "IPH_AutofillFeedbackNewBadge",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -480,7 +480,8 @@ BASE_FEATURE(kIPHiOSPromoDefaultBrowserFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature,
- "IPH_AutofillVirtualCardSuggestion",
+ BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature,
+ "IPH_AutofillExternalAccountProfileSuggestion",
base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
index 4cda79e9bc55..ad8fca07bcef 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig 2023-04-28 17:01:32 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2023-05-31 08:12:17 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -22,7 +22,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH);
BASE_DECLARE_FEATURE(kIPHDummyFeature);
@@ -6,16 +6,16 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature);
BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature);
BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature);
- BASE_DECLARE_FEATURE(kIPHDesktopTabGroupsNewGroupFeature);
-@@ -194,7 +194,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoCredentialProviderExt
+@@ -196,7 +196,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoDefaultBrowserFeature
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature);
BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ||
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
index 556f01f7e4f7..43fc1dc26854 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,21 +1,21 @@
---- components/feature_engagement/public/feature_list.cc.orig 2023-04-28 17:01:32 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2023-05-31 08:12:17 UTC
+++ components/feature_engagement/public/feature_list.cc
-@@ -133,7 +133,7 @@ const base::Feature* const kAllFeatures[] = {
- &kIPHiOSPromoCredentialProviderExtensionFeature,
+@@ -134,7 +134,7 @@ const base::Feature* const kAllFeatures[] = {
+ &kIPHiOSPromoDefaultBrowserFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ &kIPHAutofillFeedbackNewBadgeFeature,
&kIPHBatterySaverModeFeature,
&kIPHDesktopTabGroupsNewGroupFeature,
- &kIPHDesktopCustomizeChromeFeature,
-@@ -171,7 +171,8 @@ const base::Feature* const kAllFeatures[] = {
+@@ -173,7 +173,8 @@ const base::Feature* const kAllFeatures[] = {
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ &kIPHAutofillExternalAccountProfileSuggestionFeature,
&kIPHAutofillVirtualCardSuggestionFeature,
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ||
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index 244d9a01d4cf..2ccf3b5b572f 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,40 +1,40 @@
---- components/feature_engagement/public/feature_list.h.orig 2023-04-28 17:01:32 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2023-05-31 08:12:17 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -244,7 +244,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoCredentialProviderE
+@@ -246,7 +246,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoDefaultBrowserFeatu
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature,
+ "IPH_AutofillFeedbackNewBadge");
DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode");
- DEFINE_VARIATION_PARAM(kIPHDesktopCustomizeChromeFeature,
- "IPH_DesktopCustomizeChrome");
-@@ -302,7 +302,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea
+@@ -306,7 +306,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature,
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature,
+ "IPH_AutofillExternalAccountProfileSuggestion");
DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature,
- "IPH_AutofillVirtualCardSuggestion");
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
-@@ -428,7 +429,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
- VARIATION_ENTRY(kIPHiOSPromoPostRestoreFeature),
+@@ -437,7 +438,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHiOSPromoCredentialProviderExtensionFeature),
+ VARIATION_ENTRY(kIPHiOSPromoDefaultBrowserFeature),
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature),
VARIATION_ENTRY(kIPHBatterySaverModeFeature),
VARIATION_ENTRY(kIPHDesktopCustomizeChromeFeature),
- VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature),
-@@ -467,7 +468,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -477,7 +478,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature),
VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature),
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ||
diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc
index cd97ff23d6fc..7ea4f5f93ee7 100644
--- a/www/chromium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- components/flags_ui/flags_state.cc.orig 2022-07-22 17:30:31 UTC
+--- components/flags_ui/flags_state.cc.orig 2023-05-31 08:12:17 UTC
+++ components/flags_ui/flags_state.cc
-@@ -672,7 +672,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -673,7 +673,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
return kOsCrOS;
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
return kOsLacros;
diff --git a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
index 3bca22543e5a..ad656d4c8b5c 100644
--- a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
+++ b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
@@ -1,4 +1,4 @@
---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2023-04-28 17:01:32 UTC
+--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2023-05-31 08:12:17 UTC
+++ components/gwp_asan/crash_handler/crash_analyzer.cc
@@ -30,7 +30,7 @@
#include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
@@ -9,7 +9,7 @@
#include <signal.h>
#elif BUILDFLAG(IS_APPLE)
#include <mach/exception_types.h>
-@@ -65,7 +65,7 @@ bool CrashAnalyzer::GetExceptionInfo(
+@@ -90,7 +90,7 @@ bool CrashAnalyzer::GetExceptionInfo(
crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
const crashpad::ExceptionSnapshot& exception) {
diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc
index c39ba1c6e877..9a8e8df6cd30 100644
--- a/www/chromium/files/patch-components_metrics_metrics__log.cc
+++ b/www/chromium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig 2023-04-28 17:01:32 UTC
+--- components/metrics/metrics_log.cc.orig 2023-05-31 08:12:17 UTC
+++ components/metrics/metrics_log.cc
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
#include "base/win/current_module.h"
#endif
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
-@@ -131,7 +131,7 @@ void RecordCurrentTime(
+@@ -130,7 +130,7 @@ void RecordCurrentTime(
}
}
diff --git a/www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc b/www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc
new file mode 100644
index 000000000000..6aa9f0b57d28
--- /dev/null
+++ b/www/chromium/files/patch-components_omnibox_browser_omnibox__edit__model.cc
@@ -0,0 +1,10 @@
+--- components/omnibox/browser/omnibox_edit_model.cc.orig 2023-05-31 08:12:17 UTC
++++ components/omnibox/browser/omnibox_edit_model.cc
+@@ -23,6 +23,7 @@
+ #include "base/trace_event/trace_event.h"
+ #include "base/trace_event/typed_macros.h"
+ #include "build/build_config.h"
++#include "build/branding_buildflags.h"
+ #include "components/bookmarks/browser/bookmark_model.h"
+ #include "components/dom_distiller/core/url_constants.h"
+ #include "components/dom_distiller/core/url_utils.h"
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
index a2a2628144b0..c4dc79c89ecd 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/login_database.cc.orig 2023-04-05 11:05:06 UTC
+--- components/password_manager/core/browser/login_database.cc.orig 2023-05-31 08:12:17 UTC
+++ components/password_manager/core/browser/login_database.cc
-@@ -757,7 +757,7 @@ std::string GeneratePlaceholders(size_t count) {
+@@ -771,7 +771,7 @@ std::string GeneratePlaceholders(size_t count) {
return result;
}
@@ -9,7 +9,7 @@
// Fills |form| with necessary data required to be removed from the database
// and returns it.
PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -774,7 +774,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
+@@ -788,7 +788,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
// Whether we should try to return the decryptable passwords while the
// encryption service fails for some passwords.
bool ShouldReturnPartialPasswords() {
@@ -18,7 +18,7 @@
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
#else
return false;
-@@ -1602,7 +1602,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
+@@ -1617,7 +1617,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
index a70913789f5e..a030187c57ac 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-04-28 17:01:32 UTC
+--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ components/password_manager/core/browser/login_database_unittest.cc
-@@ -2115,7 +2115,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
+@@ -2141,7 +2141,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
base::HistogramTester histogram_tester;
ASSERT_TRUE(db.Init());
@@ -9,7 +9,7 @@
// Make sure that we can't get any logins when database is corrupted.
// Disabling the checks in chromecast because encryption is unavailable.
std::vector<std::unique_ptr<PasswordForm>> result;
-@@ -2142,7 +2142,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
+@@ -2168,7 +2168,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
#endif
// Check histograms.
@@ -18,7 +18,7 @@
histogram_tester.ExpectUniqueSample(
"PasswordManager.DeleteUndecryptableLoginsReturnValue",
metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted,
-@@ -2185,7 +2185,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL
+@@ -2211,7 +2211,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL
}
#endif // BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
index f8db219ad43d..d97902e2976d 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/common/password_manager_features.cc.orig 2023-04-28 17:01:32 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2023-05-31 08:12:17 UTC
+++ components/password_manager/core/common/password_manager_features.cc
-@@ -82,7 +82,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal,
+@@ -95,7 +95,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal,
"PasswordManagerLogToTerminal",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -9,7 +9,7 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
BASE_FEATURE(kForceInitialSyncWhenDecryptionFails,
-@@ -210,7 +210,7 @@ BASE_FEATURE(kPasswordStrengthIndicator,
+@@ -218,7 +218,7 @@ BASE_FEATURE(kPasswordStrengthIndicator,
"PasswordStrengthIndicator",
base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
index 36cb82725cce..f38b5204ec7c 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
@@ -1,7 +1,7 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2023-04-28 17:01:32 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2023-05-31 08:12:17 UTC
+++ components/password_manager/core/common/password_manager_features.h
-@@ -42,7 +42,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFence
- BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites);
+@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites)
+ BASE_DECLARE_FEATURE(kFillingAcrossGroupedSites);
BASE_DECLARE_FEATURE(kFillOnAccountSelect);
BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal);
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails);
#endif
BASE_DECLARE_FEATURE(kInferConfirmationPasswordField);
-@@ -75,7 +75,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
+@@ -74,7 +74,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop
BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble);
#endif
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index f1ec7a6c387e..4441be344582 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-04-05 11:05:06 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-05-31 08:12:17 UTC
+++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -453,7 +453,7 @@ void CloudPolicyClient::FetchPolicy() {
+@@ -455,7 +455,7 @@ void CloudPolicyClient::FetchPolicy() {
fetch_request->set_invalidation_payload(invalidation_payload_);
}
}
diff --git a/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc b/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc
new file mode 100644
index 000000000000..c8121adc61a2
--- /dev/null
+++ b/www/chromium/files/patch-components_power__metrics_energy__metrics__provider.cc
@@ -0,0 +1,20 @@
+--- components/power_metrics/energy_metrics_provider.cc.orig 2023-05-31 08:12:17 UTC
++++ components/power_metrics/energy_metrics_provider.cc
+@@ -7,7 +7,7 @@
+ #include "build/build_config.h"
+ #if BUILDFLAG(IS_WIN)
+ #include "components/power_metrics/energy_metrics_provider_win.h"
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/power_metrics/energy_metrics_provider_linux.h"
+ #endif // BUILDFLAG(IS_WIN)
+
+@@ -20,7 +20,7 @@ EnergyMetricsProvider::~EnergyMetricsProvider() = defa
+ std::unique_ptr<EnergyMetricsProvider> EnergyMetricsProvider::Create() {
+ #if BUILDFLAG(IS_WIN)
+ return EnergyMetricsProviderWin::Create();
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return EnergyMetricsProviderLinux::Create();
+ #else
+ return nullptr;
diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
index 9405de2a75bb..ec095ff2492b 100644
--- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
+++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
@@ -1,4 +1,4 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-03-09 06:31:50 UTC
+--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
@@ -20,7 +20,7 @@
@@ -9,7 +9,7 @@
#include "components/services/font/public/cpp/font_loader.h"
#endif
-@@ -65,7 +65,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+@@ -66,7 +66,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
// Initialize font access for Skia.
#if BUILDFLAG(IS_WIN)
content::InitializeDWriteFontProxy();
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
content::UtilityThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -88,7 +88,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+@@ -89,7 +89,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
base::BindOnce([] { SkFontMgr::RefDefault(); }));
// Sanity check that fonts are working.
diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
deleted file mode 100644
index 7f4b7238d53e..000000000000
--- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2022-02-28 16:54:41 UTC
-+++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h
-@@ -21,7 +21,7 @@
- #include "mojo/public/cpp/bindings/pending_receiver.h"
- #include "mojo/public/cpp/bindings/receiver.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h"
- #include "third_party/skia/include/core/SkRefCnt.h"
- #endif
-@@ -73,7 +73,7 @@ class PaintPreviewCompositorCollectionImpl
- std::unique_ptr<PaintPreviewCompositorImpl>>
- compositors_;
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
-
diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc
index 7ddb06164b11..7a50db1faeea 100644
--- a/www/chromium/files/patch-components_update__client_update__query__params.cc
+++ b/www/chromium/files/patch-components_update__client_update__query__params.cc
@@ -1,6 +1,6 @@
---- components/update_client/update_query_params.cc.orig 2022-02-28 16:54:41 UTC
+--- components/update_client/update_query_params.cc.orig 2023-05-31 08:12:17 UTC
+++ components/update_client/update_query_params.cc
-@@ -40,6 +40,8 @@ const char kOs[] =
+@@ -41,6 +41,8 @@ const char kOs[] =
"fuchsia";
#elif BUILDFLAG(IS_OPENBSD)
"openbsd";
diff --git a/www/chromium/files/patch-components_variations_service_variations__service.cc b/www/chromium/files/patch-components_variations_service_variations__service.cc
index d0794e727931..2868af24ef63 100644
--- a/www/chromium/files/patch-components_variations_service_variations__service.cc
+++ b/www/chromium/files/patch-components_variations_service_variations__service.cc
@@ -1,6 +1,6 @@
---- components/variations/service/variations_service.cc.orig 2023-04-28 17:01:32 UTC
+--- components/variations/service/variations_service.cc.orig 2023-05-31 08:12:17 UTC
+++ components/variations/service/variations_service.cc
-@@ -94,7 +94,7 @@ std::string GetPlatformString() {
+@@ -95,7 +95,7 @@ std::string GetPlatformString() {
return "android";
#elif BUILDFLAG(IS_FUCHSIA)
return "fuchsia";
diff --git a/www/chromium/files/patch-components_version__info_version__info.h b/www/chromium/files/patch-components_version__info_version__info.h
index 62af471f2c6a..c346fda68902 100644
--- a/www/chromium/files/patch-components_version__info_version__info.h
+++ b/www/chromium/files/patch-components_version__info_version__info.h
@@ -1,6 +1,6 @@
---- components/version_info/version_info.h.orig 2023-04-28 17:01:32 UTC
+--- components/version_info/version_info.h.orig 2023-05-31 08:12:17 UTC
+++ components/version_info/version_info.h
-@@ -7,12 +7,7 @@
+@@ -7,10 +7,6 @@
#include <string>
@@ -9,11 +9,9 @@
-#include "build/branding_buildflags.h"
-#include "build/build_config.h"
#include "components/version_info/channel.h"
--#include "components/version_info/version_info_values.h"
+ #include "components/version_info/version_info_values.h"
- namespace base {
- class Version;
-@@ -20,6 +15,10 @@ class Version;
+@@ -20,6 +16,10 @@ class Version;
namespace version_info {
@@ -24,7 +22,7 @@
// Returns the product name and reduced version information for the User-Agent
// header, in the format: Chrome/<major_version>.0.build_version.0, where
// `build_version` is a frozen BUILD number.
-@@ -27,21 +26,11 @@ const std::string GetProductNameAndVersionForReducedUs
+@@ -27,21 +27,11 @@ const std::string GetProductNameAndVersionForReducedUs
const std::string& build_version);
// Returns the product name, e.g. "Chromium" or "Google Chrome".
@@ -48,7 +46,7 @@
// Returns the major component (aka the milestone) of the version as an int,
// e.g. 6 when the version is "6.0.490.1".
int GetMajorVersionNumberAsInt();
-@@ -53,89 +42,22 @@ std::string GetMajorVersionNumber();
+@@ -53,89 +43,22 @@ std::string GetMajorVersionNumber();
const base::Version& GetVersion();
// Returns a version control specific identifier of this release.
diff --git a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
index 24e03b76bf79..a65ab432c3ce 100644
--- a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
+++ b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
@@ -1,11 +1,11 @@
---- components/viz/common/gpu/dawn_context_provider.cc.orig 2022-02-28 16:54:41 UTC
+--- components/viz/common/gpu/dawn_context_provider.cc.orig 2023-05-31 08:12:17 UTC
+++ components/viz/common/gpu/dawn_context_provider.cc
-@@ -20,7 +20,7 @@ namespace {
+@@ -23,7 +23,7 @@ namespace {
wgpu::BackendType GetDefaultBackendType() {
#if BUILDFLAG(IS_WIN)
return wgpu::BackendType::D3D12;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return wgpu::BackendType::Vulkan;
- #else
- NOTREACHED();
+ #elif BUILDFLAG(IS_MAC)
+ return wgpu::BackendType::Metal;
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index b0451c21fdd0..3b733b461cb5 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1279,7 +1279,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1289,7 +1289,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
->GetDeviceQueue()
->GetVulkanPhysicalDevice(),
VK_IMAGE_TILING_OPTIMAL, ycbcr_info);
diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
index 66007d7e6318..d16c908ed1e8 100644
--- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
+++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display/skia_renderer.cc.orig 2023-04-28 17:01:32 UTC
+--- components/viz/service/display/skia_renderer.cc.orig 2023-05-31 08:12:17 UTC
+++ components/viz/service/display/skia_renderer.cc
-@@ -1158,7 +1158,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1168,7 +1168,7 @@ void SkiaRenderer::ClearFramebuffer() {
if (current_frame()->current_render_pass->has_transparent_background) {
ClearCanvas(SkColors::kTransparent);
} else {
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index d87daa9aefb8..52c9f71c708a 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -102,7 +102,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -103,7 +103,7 @@ RootCompositorFrameSinkImpl::Create(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// For X11, we need notify client about swap completion after resizing, so the
// client can use it for synchronize with X11 WM.
output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -607,7 +607,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -617,7 +617,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
display_client_->DidCompleteSwapWithSize(pixel_size);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 0007e949554b..224bc95c37d9 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-03-09 06:31:50 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-05-31 08:12:17 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -200,7 +200,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+@@ -204,7 +204,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index 2c5f507eac77..48664b1499ff 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- content/app/content_main_runner_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -139,13 +139,13 @@
+@@ -143,13 +143,13 @@
#include "content/browser/posix_file_descriptor_info_impl.h"
#include "content/public/common/content_descriptors.h"
@@ -16,7 +16,7 @@
#include "base/files/file_path_watcher_inotify.h"
#include "base/native_library.h"
#include "base/rand_util.h"
-@@ -188,6 +188,10 @@
+@@ -192,6 +192,10 @@
#include "chromeos/startup/startup_switches.h"
#endif
@@ -27,7 +27,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
#include "content/browser/android/battery_metrics.h"
-@@ -389,7 +393,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -393,7 +397,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE)
@@ -36,7 +36,7 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -427,7 +431,10 @@ void PreloadLibraryCdms() {
+@@ -431,7 +435,10 @@ void PreloadLibraryCdms() {
void PreSandboxInit() {
// Ensure the /dev/urandom is opened.
@@ -47,7 +47,7 @@
// May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
// files.
-@@ -438,9 +445,16 @@ void PreSandboxInit() {
+@@ -442,9 +449,16 @@ void PreSandboxInit() {
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
CRYPTO_pre_sandbox_init();
@@ -64,7 +64,7 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -810,11 +824,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -829,11 +843,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -78,7 +78,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -1002,8 +1015,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1021,8 +1034,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
process_type == switches::kZygoteProcess) {
PreSandboxInit();
}
@@ -99,7 +99,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE)
-@@ -1071,7 +1096,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1090,7 +1115,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
->ReconfigureAfterFeatureListInit(process_type);
}
@@ -108,7 +108,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -1106,6 +1131,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1125,6 +1150,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index cb39ea1b40d4..fb12b530c777 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- content/browser/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ content/browser/BUILD.gn
-@@ -2366,6 +2366,13 @@ source_set("browser") {
+@@ -2389,6 +2389,13 @@ source_set("browser") {
]
}
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index 1707fa8f04e5..33e9ed7fa657 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,4 +1,4 @@
---- content/browser/browser_main_loop.cc.orig 2023-03-09 06:31:50 UTC
+--- content/browser/browser_main_loop.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/browser_main_loop.cc
@@ -245,6 +245,12 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
@@ -29,9 +29,9 @@
@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() {
base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing);
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// We use quite a few file descriptors for our IPC as well as disk the disk
- // cache,and the default limit on the Mac is low (256), so bump it up.
+ // cache, and the default limit on Apple is low (256), so bump it up.
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index 34a118737f00..a09c9e78d89f 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-04-28 17:01:32 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1723,7 +1723,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+@@ -1706,7 +1706,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
}
diff --git a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc
deleted file mode 100644
index f9ccc0daa54b..000000000000
--- a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/media/frameless_media_interface_proxy.cc.orig 2022-08-31 12:19:35 UTC
-+++ content/browser/media/frameless_media_interface_proxy.cc
-@@ -16,7 +16,7 @@
- #include "media/mojo/mojom/renderer_extensions.mojom.h"
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/public/browser/stable_video_decoder_factory.h"
- #include "media/base/media_switches.h"
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -67,7 +67,7 @@ void FramelessMediaInterfaceProxy::CreateVideoDecoder(
-
- mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
- oop_video_decoder;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
- if (!render_process_host_) {
- if (!stable_vd_factory_remote_.is_bound()) {
diff --git a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
deleted file mode 100644
index 99e2c2c1c630..000000000000
--- a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/media/media_interface_proxy.cc.orig 2022-10-24 13:33:33 UTC
-+++ content/browser/media/media_interface_proxy.cc
-@@ -73,7 +73,7 @@
- #include "media/mojo/services/mojo_renderer_service.h" // nogncheck
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/public/browser/stable_video_decoder_factory.h"
- #include "media/base/media_switches.h"
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -286,7 +286,7 @@ void MediaInterfaceProxy::CreateVideoDecoder(
-
- mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
- oop_video_decoder;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
- render_frame_host().GetProcess()->CreateStableVideoDecoder(
- oop_video_decoder.InitWithNewPipeAndPassReceiver());
diff --git a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
index 790e2e4e2454..8a0798108e84 100644
--- a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
+++ b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/network_service_instance_impl.cc.orig 2023-03-09 06:31:50 UTC
+--- content/browser/network_service_instance_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/network_service_instance_impl.cc
-@@ -76,7 +76,7 @@
+@@ -78,7 +78,7 @@
#include "content/browser/network/network_service_process_tracker_win.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/system_dns_resolution/system_dns_resolver.h"
#include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
#endif
-@@ -404,7 +404,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -422,7 +422,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
}
#endif // BUILDFLAG(IS_POSIX)
diff --git a/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc
index 7c4559d65802..c2237e819833 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/renderer_host/back_forward_cache_impl.cc
-@@ -57,7 +57,7 @@ BASE_FEATURE(kBackForwardCacheSize,
+@@ -58,7 +58,7 @@ BASE_FEATURE(kBackForwardCacheSize,
// Sets the BackForwardCache size for desktop.
// See crbug.com/1291435.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
index 92151b08bebb..3d4861d77e1d 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/delegated_frame_host.cc.orig 2023-02-08 09:03:45 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -296,7 +296,7 @@ void DelegatedFrameHost::EmbedSurface(
if (!primary_surface_id ||
primary_surface_id->local_surface_id() != local_surface_id_) {
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index e09566a1c321..c0258a2af880 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -215,7 +215,7 @@
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
-@@ -1149,7 +1149,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1179,7 +1179,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
// to indicate failure and std::numeric_limits<size_t>::max() to indicate
// unlimited.
size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
struct rlimit limit;
if (getrlimit(RLIMIT_NPROC, &limit) != 0)
return kUnknownPlatformProcessLimit;
-@@ -1241,7 +1241,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1271,7 +1271,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
return;
}
@@ -27,7 +27,7 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -1330,7 +1330,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1360,7 +1360,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
std::unique_ptr<service_manager::BinderRegistry> binders_;
mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
@@ -36,7 +36,7 @@
mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
video_encode_accelerator_factory_remote_;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -2156,7 +2156,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
+@@ -2182,7 +2182,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -45,7 +45,7 @@
void RenderProcessHostImpl::CreateStableVideoDecoder(
mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -3355,6 +3355,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3387,6 +3387,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
@@ -53,7 +53,7 @@
switches::kDisableUseMojoVideoDecoderForPepper,
switches::kDisableV8IdleTasks,
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
-@@ -4855,7 +4856,7 @@ void RenderProcessHostImpl::ResetIPC() {
+@@ -4908,7 +4909,7 @@ void RenderProcessHostImpl::ResetIPC() {
coordinator_connector_receiver_.reset();
tracing_registration_.reset();
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index 23f6084584ec..56c0da22a0b8 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-04-28 17:01:32 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-05-31 08:12:17 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -85,7 +85,7 @@
+@@ -86,7 +86,7 @@
#include "content/public/browser/android/child_process_importance.h"
#endif
@@ -9,7 +9,7 @@
#include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -498,7 +498,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -499,7 +499,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Sets this RenderProcessHost to be guest only. For Testing only.
void SetForGuestsOnlyForTesting();
@@ -18,7 +18,7 @@
// Launch the zygote early in the browser startup.
static void EarlyZygoteLaunch();
#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC)
-@@ -707,7 +707,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -708,7 +708,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver)
override;
@@ -27,7 +27,7 @@
void CreateStableVideoDecoder(
mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver)
override;
-@@ -1182,7 +1182,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -1188,7 +1188,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// RenderProcessHost. This is destroyed early in ResetIPC() method.
std::unique_ptr<PermissionServiceContext> permission_service_context_;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index e66eb94f0bff..d62e916df95a 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-03-09 06:31:50 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -250,7 +250,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -272,7 +272,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index 14b60613dbb3..a68767489ae1 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-04-28 17:01:32 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -119,7 +119,7 @@
+@@ -121,7 +121,7 @@
#include "ui/gfx/gdi_util.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/linux/linux_ui.h"
-@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+@@ -454,7 +454,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
->GetCOM();
@@ -18,7 +18,7 @@
BrowserAccessibilityManager* manager =
host()->GetOrCreateRootBrowserAccessibilityManager();
if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1597,7 +1597,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1620,7 +1620,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
return GetTextInputManager() && GetTextInputManager()->should_do_learning();
}
@@ -27,7 +27,7 @@
bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
const gfx::Range& range,
const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2429,7 +2429,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2452,7 +2452,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
return NeedsInputGrab();
#else
return false;
-@@ -2606,7 +2606,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2628,7 +2628,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
index 4dce59e979dd..f5977e126ba9 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-01-11 09:17:16 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-05-31 08:12:17 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
+@@ -246,7 +246,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc
new file mode 100644
index 000000000000..7555b877f57e
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -0,0 +1,56 @@
+--- content/browser/utility_process_host.cc.orig 2023-05-31 08:12:17 UTC
++++ content/browser/utility_process_host.cc
+@@ -59,7 +59,7 @@
+ #include "content/browser/v8_snapshot_files.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/files/file_util.h"
+ #include "base/files/scoped_file.h"
+ #include "base/pickle.h"
+@@ -69,7 +69,7 @@
+ #include "media/capture/capture_switches.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/task/sequenced_task_runner.h"
+ #include "components/viz/host/gpu_client.h"
+ #include "media/capture/capture_switches.h"
+@@ -80,7 +80,7 @@ namespace content {
+
+ namespace {
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ base::ScopedFD PassNetworkContextParentDirs(
+ std::vector<base::FilePath> network_context_parent_dirs) {
+ base::Pickle pickle;
+@@ -129,7 +129,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr
+ started_(false),
+ name_(u"utility process"),
+ file_data_(std::make_unique<ChildProcessLauncherFileData>()),
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)),
+ #endif
+ client_(std::move(client)) {
+@@ -409,7 +409,7 @@ bool UtilityProcessHost::StartProcess() {
+ file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload());
+ #endif // BUILDFLAG(IS_POSIX)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // The network service should have access to the parent directories
+ // necessary for its usage.
+ if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
+@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() {
+ }
+ #endif // BUILDFLAG(IS_LINUX)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableVideoCaptureUseGpuMemoryBuffer) &&
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.h b/www/chromium/files/patch-content_browser_utility__process__host.h
new file mode 100644
index 000000000000..2c0f740f0490
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_utility__process__host.h
@@ -0,0 +1,20 @@
+--- content/browser/utility_process_host.h.orig 2023-05-31 08:12:17 UTC
++++ content/browser/utility_process_host.h
+@@ -39,7 +39,7 @@ namespace base {
+ class Thread;
+ } // namespace base
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ namespace viz {
+ class GpuClient;
+ } // namespace viz
+@@ -210,7 +210,7 @@ class CONTENT_EXPORT UtilityProcessHost
+ std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_;
+ #endif
+
diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
index 14284e8b53b0..0728e3bed70b 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_process_host_receiver_bindings.cc.orig 2022-02-28 16:54:41 UTC
+--- content/browser/utility_process_host_receiver_bindings.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/utility_process_host_receiver_bindings.cc
-@@ -10,7 +10,7 @@
+@@ -10,12 +10,12 @@
#include "content/public/browser/content_browser_client.h"
#include "content/public/common/content_client.h"
@@ -9,7 +9,13 @@
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
#include "content/browser/font_service.h" // nogncheck
#endif
-@@ -19,7 +19,7 @@ namespace content {
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/viz/host/gpu_client.h"
+ #include "content/public/browser/gpu_client.h"
+ #endif
+@@ -24,13 +24,13 @@ namespace content {
void UtilityProcessHost::BindHostReceiver(
mojo::GenericPendingReceiver receiver) {
@@ -18,3 +24,10 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
+ }
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) {
+ gpu_client_ =
+ content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing());
diff --git a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
index 19469c6479ad..5b5b0a7b87e7 100644
--- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
+++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
@@ -1,4 +1,4 @@
---- content/browser/utility_sandbox_delegate.cc.orig 2023-03-09 06:31:50 UTC
+--- content/browser/utility_sandbox_delegate.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/utility_sandbox_delegate.cc
@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate::
#if BUILDFLAG(ENABLE_PPAPI)
@@ -17,7 +17,7 @@
sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -117,10 +117,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
+@@ -125,10 +125,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
// unsandboxed zygote and then apply their actual sandboxes in the forked
// process upon startup.
if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
index d6250626d7d6..f9ecfc4d4301 100644
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
@@ -1,4 +1,4 @@
---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-03-09 06:31:50 UTC
+--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-05-31 08:12:17 UTC
+++ content/browser/webui/web_ui_main_frame_observer.cc
@@ -13,7 +13,7 @@
#include "content/public/browser/navigation_handle.h"
@@ -27,7 +27,7 @@
void WebUIMainFrameObserver::OnDidAddMessageToConsole(
RenderFrameHost* source_frame,
blink::mojom::ConsoleMessageLevel log_level,
-@@ -163,7 +163,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
+@@ -167,7 +167,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
// TODO(crbug.com/1129544) This is currently disabled due to Windows DLL
// thunking issues. Fix & re-enable.
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index 8b66612226ea..845dbbb84b14 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- content/common/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ content/common/BUILD.gn
-@@ -430,6 +430,9 @@ if (is_linux || is_chromeos) {
+@@ -432,6 +432,9 @@ if (is_linux || is_chromeos) {
public = [ "set_process_title_linux.h" ]
sources = [ "set_process_title_linux.cc" ]
deps = [ "//base" ]
@@ -10,7 +10,7 @@
}
}
-@@ -475,7 +478,7 @@ mojom("mojo_bindings") {
+@@ -477,7 +480,7 @@ mojom("mojo_bindings") {
if (enable_ipc_logging) {
enabled_features += [ "ipc_logging" ]
}
diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn
index 05549b1cda52..df0953cea5de 100644
--- a/www/chromium/files/patch-content_gpu_BUILD.gn
+++ b/www/chromium/files/patch-content_gpu_BUILD.gn
@@ -1,6 +1,6 @@
---- content/gpu/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- content/gpu/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ content/gpu/BUILD.gn
-@@ -102,6 +102,17 @@ target(link_target_type, "gpu_sources") {
+@@ -104,6 +104,17 @@ target(link_target_type, "gpu_sources") {
}
}
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index 9d2a255c1197..1ec4af172700 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig 2023-04-05 11:05:06 UTC
+--- content/gpu/gpu_main.cc.orig 2023-05-31 08:12:17 UTC
+++ content/gpu/gpu_main.cc
-@@ -89,7 +89,7 @@
+@@ -90,7 +90,7 @@
#include "sandbox/win/src/sandbox.h"
#endif
@@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "sandbox/policy/linux/sandbox_linux.h"
#include "sandbox/policy/sandbox_type.h"
-@@ -110,7 +110,7 @@ namespace content {
+@@ -112,7 +112,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -175,7 +175,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +27,7 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif BUILDFLAG(IS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -270,7 +270,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -285,7 +285,7 @@ int GpuMain(MainFunctionParams parameters) {
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
}
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -405,7 +405,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -420,7 +420,7 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
index d84426e97588..2f4f1418d1fd 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2022-02-28 16:54:41 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -20,7 +20,7 @@
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
ChildThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -53,7 +53,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
+@@ -54,7 +54,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
void PpapiBlinkPlatformImpl::Shutdown() {}
blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
index 49f8ee07eeb1..e6e8118a3307 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,15 +1,6 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-07-22 17:30:31 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2023-05-31 08:12:17 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
-@@ -12,7 +12,7 @@
- #include "build/build_config.h"
- #include "content/child/blink_platform_impl.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h"
- #include "third_party/skia/include/core/SkRefCnt.h"
- #endif
-@@ -38,11 +38,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
+@@ -33,7 +33,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
blink::WebString DefaultLocale() override;
private:
@@ -17,9 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
};
diff --git a/www/chromium/files/patch-content_public_browser_render__process__host.h b/www/chromium/files/patch-content_public_browser_render__process__host.h
index 413ce7db83b0..e092947641fb 100644
--- a/www/chromium/files/patch-content_public_browser_render__process__host.h
+++ b/www/chromium/files/patch-content_public_browser_render__process__host.h
@@ -1,7 +1,7 @@
---- content/public/browser/render_process_host.h.orig 2023-04-28 17:01:32 UTC
+--- content/public/browser/render_process_host.h.orig 2023-05-31 08:12:17 UTC
+++ content/public/browser/render_process_host.h
@@ -54,7 +54,7 @@
- #include "content/public/browser/android/child_process_importance.h"
+ #include "services/network/public/mojom/attribution.mojom-forward.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index 92e4ba8602b0..b7ae5608c416 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_features.cc.orig 2023-04-28 17:01:32 UTC
+--- content/public/common/content_features.cc.orig 2023-05-31 08:12:17 UTC
+++ content/public/common/content_features.cc
-@@ -39,7 +39,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
+@@ -44,7 +44,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
"AudioServiceOutOfProcess",
// TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
// built with OS_CHROMEOS instead of OS_LINUX.
@@ -9,7 +9,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
base::FEATURE_ENABLED_BY_DEFAULT
#else
-@@ -51,7 +51,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
+@@ -56,7 +56,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
// kAudioServiceOutOfProcess feature is enabled.
BASE_FEATURE(kAudioServiceSandbox,
"AudioServiceSandbox",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -541,7 +541,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens,
+@@ -549,7 +549,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens,
// (activated by kUserAgentClientHint)
BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
@@ -27,7 +27,7 @@
// Supports proxying thread type changes of renderer processes to browser
// process and having browser process handle adjusting thread properties (nice
// value, c-group, latency sensitivity...) for renderers which have sandbox
-@@ -1392,7 +1392,7 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1414,7 +1414,7 @@ BASE_FEATURE(kWebAssemblyTiering,
BASE_FEATURE(kWebAssemblyTrapHandler,
"WebAssemblyTrapHandler",
#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -36,7 +36,7 @@
defined(ARCH_CPU_X86_64)) || \
(BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1450,7 +1450,11 @@ BASE_FEATURE(kWebUICodeCache,
+@@ -1472,7 +1472,11 @@ BASE_FEATURE(kWebUICodeCache,
// Controls whether the WebUSB API is enabled:
// https://wicg.github.io/webusb
diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h
index 37c925360dad..17e295e35be5 100644
--- a/www/chromium/files/patch-content_public_common_content__features.h
+++ b/www/chromium/files/patch-content_public_common_content__features.h
@@ -1,6 +1,6 @@
---- content/public/common/content_features.h.orig 2023-04-05 11:05:06 UTC
+--- content/public/common/content_features.h.orig 2023-05-31 08:12:17 UTC
+++ content/public/common/content_features.h
-@@ -115,7 +115,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO
+@@ -117,7 +117,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO
CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH);
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index 12545cd3414c..5280e17fc60f 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig 2023-04-28 17:01:32 UTC
+--- content/public/common/content_switches.cc.orig 2023-05-31 08:12:17 UTC
+++ content/public/common/content_switches.cc
-@@ -371,6 +371,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -367,6 +367,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
// builds.
const char kEnableLogging[] = "enable-logging";
@@ -9,7 +9,7 @@
// Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
// triggering of change attribute of the NetInfo API when there is a change in
// the connection type.
-@@ -1003,7 +1005,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -1012,7 +1014,7 @@ const char kEnableAutomation[] = "enable-automation";
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index eec584e713da..777d0252a63d 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig 2023-04-28 17:01:32 UTC
+--- content/public/common/content_switches.h.orig 2023-05-31 08:12:17 UTC
+++ content/public/common/content_switches.h
-@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+@@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
CONTENT_EXPORT extern const char kEnableLCDText[];
CONTENT_EXPORT extern const char kEnableLogging[];
@@ -8,7 +8,7 @@
CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc
index 7b9ebedaead7..a2f047431f03 100644
--- a/www/chromium/files/patch-content_renderer_render__process__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_process_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- content/renderer/render_process_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/renderer/render_process_impl.cc
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
#if BUILDFLAG(IS_WIN)
#include "base/win/win_util.h"
#endif
@@ -9,7 +9,7 @@
#include "v8/include/v8-wasm-trap-handler-posix.h"
#endif
-@@ -231,7 +231,7 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -221,7 +221,7 @@ RenderProcessImpl::RenderProcessImpl()
v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
}
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index e5a1b0f4f334..db02200c0af7 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/render_thread_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- content/renderer/render_thread_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/renderer/render_thread_impl.cc
@@ -202,6 +202,8 @@
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -1059,7 +1061,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1061,7 +1063,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
kGpuStreamPriorityMedia);
const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
#endif // BUILDFLAG(IS_LINUX)
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1068,7 +1070,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1070,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
gpu::kGpuFeatureStatusEnabled);
const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) &&
#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1856,7 +1858,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
+@@ -1848,7 +1850,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
bool enable_video_encode_accelerator) {
mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
vea_provider;
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index 88d3c436fd0d..f014326cd48f 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -114,7 +114,7 @@
@@ -9,8 +9,15 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
-@@ -180,7 +180,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -178,13 +178,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+ sudden_termination_disables_(0),
+ is_locked_to_site_(false),
main_thread_scheduler_(main_thread_scheduler) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ sk_sp<font_service::FontLoader> font_loader;
+ #endif
+
// RenderThread may not exist in some tests.
if (RenderThreadImpl::current()) {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +25,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -190,7 +190,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -27,7 +34,7 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -248,7 +248,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -251,7 +251,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
#endif
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index f6f992d0100a..653da295dd4b 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,15 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2023-04-28 17:01:32 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2023-05-31 08:12:17 UTC
+++ content/renderer/renderer_blink_platform_impl.h
-@@ -31,7 +31,7 @@
- #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
- #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h" // nogncheck
- #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
- #endif
-@@ -242,7 +242,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -239,7 +239,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
const gpu::GPUInfo& gpu_info) const;
@@ -18,12 +9,3 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -262,7 +262,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
- mutable base::WaitableEvent io_thread_id_ready_event_;
- base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
-
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index 9479ab7a68ac..11483d6a7259 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- content/shell/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ content/shell/BUILD.gn
-@@ -981,7 +981,7 @@ group("content_shell_crash_test") {
+@@ -995,7 +995,7 @@ group("content_shell_crash_test") {
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
}
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index c6085455d3d2..8ac9dca103da 100644
--- a/www/chromium/files/patch-content_test_BUILD.gn
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- content/test/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- content/test/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ content/test/BUILD.gn
-@@ -2149,7 +2149,7 @@ static_library("run_all_unittests") {
+@@ -2164,7 +2164,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -3194,7 +3194,7 @@ test("content_unittests") {
+@@ -3214,7 +3214,7 @@ test("content_unittests") {
deps += [ "//third_party/boringssl" ]
}
diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc
index 927bbcb23576..60e54ce32cf4 100644
--- a/www/chromium/files/patch-content_utility_services.cc
+++ b/www/chromium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig 2023-04-28 17:01:32 UTC
+--- content/utility/services.cc.orig 2023-05-31 08:12:17 UTC
+++ content/utility/services.cc
@@ -65,7 +65,7 @@
extern sandbox::TargetServices* g_utility_target_services;
@@ -18,7 +18,16 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
#include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
-@@ -216,7 +216,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
+@@ -104,7 +104,7 @@ extern sandbox::TargetServices* g_utility_target_servi
+ #include "ui/accessibility/accessibility_features.h"
+ #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #include "services/viz/public/cpp/gpu/gpu.h"
+ #endif // BUILDFLAG(IS_LINUX)
+@@ -221,7 +221,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
<< "task_policy_set TASK_QOS_POLICY";
#endif
@@ -27,7 +36,16 @@
auto* command_line = base::CommandLine::ForCurrentProcess();
if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -320,7 +320,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+@@ -305,7 +305,7 @@ auto RunVideoCapture(
+ mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) {
+ auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
+ std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
+ mojo::PendingRemote<viz::mojom::Gpu> remote_gpu;
+ content::UtilityThread::Get()->BindHostReceiver(
+@@ -337,7 +337,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
@@ -36,7 +54,7 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
auto RunStableVideoDecoderFactoryProcessService(
mojo::PendingReceiver<
-@@ -331,7 +331,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+@@ -348,7 +348,7 @@ auto RunStableVideoDecoderFactoryProcessService(
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
@@ -45,7 +63,7 @@
auto RunVideoEncodeAcceleratorProviderFactory(
mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
receiver) {
-@@ -389,13 +389,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -406,13 +406,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
index 1f2efe71edd0..87b7212eae57 100644
--- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
+++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2022-02-28 16:54:41 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
@@ -9,7 +9,7 @@
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
UtilityThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
+@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
blink::WebSandboxSupport*
UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
index a9f9964ff3a1..fbf629fa8aa6 100644
--- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
+++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
@@ -1,15 +1,6 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2022-02-28 16:54:41 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2023-05-31 08:12:17 UTC
+++ content/utility/utility_blink_platform_with_sandbox_support_impl.h
-@@ -10,7 +10,7 @@
- #include "build/build_config.h"
- #include "third_party/blink/public/platform/platform.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h" // nogncheck
- #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
- #endif
-@@ -38,10 +38,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
+@@ -33,7 +33,7 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
blink::WebSandboxSupport* GetSandboxSupport() override;
private:
@@ -17,8 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
};
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc
index b757d161110b..5e0491de9d28 100644
--- a/www/chromium/files/patch-content_utility_utility__main.cc
+++ b/www/chromium/files/patch-content_utility_utility__main.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_main.cc.orig 2023-04-28 17:01:32 UTC
+--- content/utility/utility_main.cc.orig 2023-05-31 08:12:17 UTC
+++ content/utility/utility_main.cc
@@ -31,7 +31,7 @@
#include "third_party/icu/source/common/unicode/unistr.h"
@@ -6,18 +6,21 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/file_descriptor_store.h"
+ #include "base/files/file_util.h"
+ #include "base/pickle.h"
+@@ -39,7 +39,9 @@
#include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
#include "gpu/config/gpu_info_collector.h"
#include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h"
-@@ -42,15 +42,21 @@
- #if BUILDFLAG(ENABLE_PRINTING)
- #include "printing/sandbox/print_backend_sandbox_hook_linux.h"
- #endif
+#if !BUILDFLAG(IS_BSD)
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
#include "services/audio/audio_sandbox_hook_linux.h"
#include "services/network/network_sandbox_hook_linux.h"
+ // gn check is not smart enough to realize that this include only applies to
+@@ -51,10 +53,14 @@
+ #endif
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -32,7 +35,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chromeos/ash/components/assistant/buildflags.h"
#include "chromeos/ash/services/ime/ime_sandbox_hook.h"
-@@ -62,7 +68,7 @@
+@@ -66,7 +72,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
@@ -41,12 +44,17 @@
#include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck
#endif
-@@ -83,10 +89,10 @@ namespace content {
+@@ -87,7 +93,7 @@ namespace content {
namespace {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ std::vector<std::string> GetNetworkContextsParentDirectories() {
+ base::MemoryMappedFile::Region region;
+ base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
+@@ -115,7 +121,7 @@ std::vector<std::string> GetNetworkContextsParentDirec
+
bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) {
const bool obtain_gpu_info =
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -54,7 +62,7 @@
sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding;
-@@ -168,7 +174,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -197,7 +203,7 @@ int UtilityMain(MainFunctionParams parameters) {
}
}
@@ -63,7 +71,7 @@
// Initializes the sandbox before any threads are created.
// TODO(jorgelo): move this after GTK initialization when we enable a strict
// Seccomp-BPF policy.
-@@ -196,7 +202,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -226,7 +232,7 @@ int UtilityMain(MainFunctionParams parameters) {
pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook);
break;
#endif
@@ -72,7 +80,7 @@
case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
pre_sandbox_hook =
base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -223,6 +229,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -253,6 +259,7 @@ int UtilityMain(MainFunctionParams parameters) {
default:
break;
}
@@ -80,7 +88,7 @@
if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
(parameters.zygote_child || !pre_sandbox_hook.is_null())) {
sandbox::policy::SandboxLinux::Options sandbox_options;
-@@ -231,6 +238,11 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -261,6 +268,11 @@ int UtilityMain(MainFunctionParams parameters) {
sandbox::policy::Sandbox::Initialize(
sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
}
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index d12177188d78..ecc89313825e 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2023-04-05 11:05:06 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2023-05-31 08:12:17 UTC
+++ extensions/browser/api/messaging/message_service.cc
-@@ -70,7 +70,7 @@ namespace {
+@@ -71,7 +71,7 @@ namespace {
const char kReceivingEndDoesntExistError[] =
"Could not establish connection. Receiving end does not exist.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
const char kProhibitedByPoliciesError[] =
-@@ -464,7 +464,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -483,7 +483,7 @@ void MessageService::OpenChannelToNativeApp(
return;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
index 24896237005b..89f2deb108a4 100644
--- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-04-05 11:05:06 UTC
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
@@ -14,7 +14,7 @@
#include "extensions/browser/api/networking_private/networking_private_chromeos.h"
@@ -9,7 +9,7 @@
#include "extensions/browser/api/networking_private/networking_private_linux.h"
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
#include "components/wifi/wifi_service.h"
-@@ -68,7 +68,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
+@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
delegate = new NetworkingPrivateChromeOS(browser_context);
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
delegate = new NetworkingPrivateLacros(browser_context);
diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc
deleted file mode 100644
index c0cabd822dfb..000000000000
--- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/browser/extension_prefs.cc.orig 2023-04-05 11:05:06 UTC
-+++ extensions/browser/extension_prefs.cc
-@@ -2228,7 +2228,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
- registry->RegisterListPref(
- pref_names::kExtendedBackgroundLifetimeForPortConnectionsToUrls);
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false);
- #endif
- registry->RegisterBooleanPref(
diff --git a/www/chromium/files/patch-extensions_browser_pref__names.cc b/www/chromium/files/patch-extensions_browser_pref__names.cc
deleted file mode 100644
index e2dea81fc05d..000000000000
--- a/www/chromium/files/patch-extensions_browser_pref__names.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/browser/pref_names.cc.orig 2023-04-05 11:05:06 UTC
-+++ extensions/browser/pref_names.cc
-@@ -53,7 +53,7 @@ const char kManifestV2Availability[] = "extensions.man
- const char kPinnedExtensions[] = "extensions.pinned_extensions";
- const char kStorageGarbageCollect[] = "extensions.storage.garbagecollect";
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled";
- #endif
- const char kChromeAppsWebViewPermissiveBehaviorAllowed[] =
diff --git a/www/chromium/files/patch-extensions_browser_pref__names.h b/www/chromium/files/patch-extensions_browser_pref__names.h
deleted file mode 100644
index f70450528346..000000000000
--- a/www/chromium/files/patch-extensions_browser_pref__names.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/browser/pref_names.h.orig 2023-04-05 11:05:06 UTC
-+++ extensions/browser/pref_names.h
-@@ -114,7 +114,7 @@ extern const char kPinnedExtensions[];
- extern const char kStorageGarbageCollect[];
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // A preference for whether Chrome Apps should be allowed. The default depends
- // on the ChromeAppsDeprecation feature flag, and this pref can extend support
- // for Chrome Apps by enterprise policy.
diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json
index 03df612028d0..793ffc4dfcf6 100644
--- a/www/chromium/files/patch-extensions_common_api_runtime.json
+++ b/www/chromium/files/patch-extensions_common_api_runtime.json
@@ -1,6 +1,6 @@
---- extensions/common/api/runtime.json.orig 2022-08-31 12:19:35 UTC
+--- extensions/common/api/runtime.json.orig 2023-05-31 08:12:17 UTC
+++ extensions/common/api/runtime.json
-@@ -86,7 +86,8 @@
+@@ -89,7 +89,8 @@
"cros",
"linux",
"openbsd",
diff --git a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
index c8b72e8ec142..bc82da76db4d 100644
--- a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
@@ -1,11 +1,11 @@
---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-04-05 11:05:06 UTC
+--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-05-31 08:12:17 UTC
+++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
@@ -44,7 +44,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- info->os = api::runtime::PLATFORM_OS_CROS;
+ info->os = api::runtime::PlatformOs::kCros;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- info->os = api::runtime::PLATFORM_OS_LINUX;
+ info->os = api::runtime::PlatformOs::kLinux;
#endif
return true;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
index 3539dc60b787..9f3ed7d8cc10 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-04-28 17:01:32 UTC
+--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-05-31 08:12:17 UTC
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -3491,7 +3491,7 @@ GLES2Decoder* GLES2Decoder::Create(
+@@ -3492,7 +3492,7 @@ GLES2Decoder* GLES2Decoder::Create(
}
// Allow linux to run fuzzers.
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
index 0504bfd5af6f..45e0d45fcd9b 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-04-28 17:01:32 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-05-31 08:12:17 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
-@@ -39,7 +39,7 @@
+@@ -43,7 +43,7 @@
#include "ui/gl/gl_version_info.h"
#include "ui/gl/scoped_binders.h"
@@ -9,7 +9,7 @@
#include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
#endif
-@@ -573,7 +573,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
+@@ -592,7 +592,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
WGPUDevice wgpuDevice,
WGPUBackendType backend_type,
std::vector<WGPUTextureFormat> view_formats) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
index 20c50d9813ac..7d1ab1a77b52 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
@@ -1,11 +1,11 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-04-28 17:01:32 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-05-31 08:12:17 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
-@@ -192,7 +192,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
+@@ -201,7 +201,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
+ return false;
+ }
- // TODO: remove it when below formats are converted to multi plane shared
- // image formats.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- switch (format.resource_format()) {
- case viz::YUV_420_BIPLANAR:
- case viz::YUVA_420_TRIPLANAR:
+ if (format.IsLegacyMultiplanar()) {
+ // ExternalVkImageBacking doesn't work properly with external sampler
+ // multi-planar formats on Linux, see https://crbug.com/1394888.
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
index fcd2927ccd5a..4361e90a1929 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-04-28 17:01:32 UTC
+--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-05-31 08:12:17 UTC
+++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
-@@ -198,7 +198,7 @@ bool WrappedSkImageBacking::Initialize() {
+@@ -209,7 +209,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri
constexpr GrRenderable is_renderable = GrRenderable::kYes;
constexpr GrProtected is_protected = GrProtected::kNo;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index 3a0ab7d181a3..3e16623acfe5 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-04-28 17:01:32 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1238,7 +1238,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1231,7 +1231,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
if (gr_context_type_ != GrContextType::kVulkan &&
use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 09928d49a1b4..5b211729b9f7 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig 2023-04-28 17:01:32 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2023-05-31 08:12:17 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -330,7 +330,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -334,7 +334,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
enable_watchdog = false;
#endif
@@ -9,7 +9,7 @@
bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
#else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
// For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -367,7 +367,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -371,7 +371,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
bool attempted_startsandbox = false;
@@ -18,7 +18,7 @@
// On Chrome OS ARM Mali, GPU driver userspace creates threads when
// initializing a GL context, so start the sandbox early.
// TODO(zmo): Need to collect OS version before this.
-@@ -444,7 +444,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -442,7 +442,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
}
@@ -27,7 +27,7 @@
// The ContentSandboxHelper is currently the only one implementation of
// GpuSandboxHelper and it has no dependency. Except on Linux where
// VaapiWrapper checks the GL implementation to determine which display
-@@ -530,7 +530,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
command_line, gpu_feature_info_,
gpu_preferences_.disable_software_rasterizer, false);
if (gl_use_swiftshader_) {
@@ -36,7 +36,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -665,7 +665,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -672,7 +672,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
@@ -45,7 +45,7 @@
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -719,7 +719,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -726,7 +726,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
}
}
@@ -54,7 +54,7 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -869,7 +869,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -867,7 +867,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
@@ -63,9 +63,9 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -933,7 +933,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
-
- InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
+@@ -937,7 +937,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+ }
+ }
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
index e39ba3cb5c16..a8c994c106b7 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_web_contents_impl.cc.orig 2023-02-08 09:03:45 UTC
+--- headless/lib/browser/headless_web_contents_impl.cc.orig 2023-05-31 08:12:17 UTC
+++ headless/lib/browser/headless_web_contents_impl.cc
-@@ -61,7 +61,7 @@ namespace headless {
+@@ -60,7 +60,7 @@ namespace headless {
namespace {
void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) {
diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 46f28c6b887c..40841f10a485 100644
--- a/www/chromium/files/patch-media_BUILD.gn
+++ b/www/chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig 2023-04-05 11:05:06 UTC
+--- media/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ media/BUILD.gn
-@@ -94,6 +94,9 @@ config("media_config") {
+@@ -93,6 +93,9 @@ config("media_config") {
defines += [ "DLOPEN_PULSEAUDIO" ]
}
}
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index ee01a79a0bb8..df09b9e5d2b6 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig 2023-04-05 11:05:06 UTC
+--- media/audio/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ media/audio/BUILD.gn
-@@ -266,9 +266,20 @@ source_set("audio") {
+@@ -270,9 +270,20 @@ source_set("audio") {
]
}
diff --git a/www/chromium/files/patch-media_base_cdm__promise__adapter.cc b/www/chromium/files/patch-media_base_cdm__promise__adapter.cc
new file mode 100644
index 000000000000..78c1400719b4
--- /dev/null
+++ b/www/chromium/files/patch-media_base_cdm__promise__adapter.cc
@@ -0,0 +1,14 @@
+--- media/base/cdm_promise_adapter.cc.orig 2023-05-31 11:26:38 UTC
++++ media/base/cdm_promise_adapter.cc
+@@ -95,9 +95,11 @@ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+ for (auto& [promise_id, promise] : promises_) {
++#if defined(__clang__) && (__clang_major__ >= 16)
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
++#endif
+ promise->reject(CdmPromise::Exception::INVALID_STATE_ERROR,
+ ToSystemCode(reason), "Operation aborted.");
+ }
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index 6b744f541f37..f57f8b513cbb 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,7 +1,7 @@
---- media/base/media_switches.cc.orig 2023-04-28 17:01:32 UTC
+--- media/base/media_switches.cc.orig 2023-05-31 08:12:17 UTC
+++ media/base/media_switches.cc
-@@ -12,7 +12,7 @@
- #include "components/system_media_controls/linux/buildflags/buildflags.h"
+@@ -15,7 +15,7 @@
+ #include "gpu/config/gpu_finch_features.h"
#include "media/media_buildflags.h"
-#if BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
#include "base/cpu.h"
#endif
-@@ -604,7 +604,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
+@@ -620,7 +620,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
// Show toolbar button that opens dialog for controlling media sessions.
BASE_FEATURE(kGlobalMediaControls,
"GlobalMediaControls",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -652,7 +652,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
+@@ -668,7 +668,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
"GlobalMediaControlsPictureInPicture",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -696,7 +696,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -712,7 +712,7 @@ BASE_FEATURE(kUnifiedAutoplay,
"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -36,17 +36,9 @@
// Enable vaapi video decoding on linux. This is already enabled by default on
// chromeos, but needs an experiment on linux.
BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -1212,14 +1212,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn
- base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Spawn utility processes to perform hardware decode acceleration instead of
- // using the GPU process.
- const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoDecoding{
+@@ -1248,7 +1248,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo
"UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index cce754463523..7addcf78ebad 100644
--- a/www/chromium/files/patch-media_base_media__switches.h
+++ b/www/chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,6 @@
---- media/base/media_switches.h.orig 2023-04-28 17:01:32 UTC
+--- media/base/media_switches.h.orig 2023-05-31 08:12:17 UTC
+++ media/base/media_switches.h
-@@ -279,7 +279,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
+@@ -282,7 +282,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture);
@@ -9,14 +9,9 @@
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux);
-@@ -396,11 +396,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(
- kAllowClearDolbyVisionInMseWhenPlatformEncryptedDvEnabled);
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -411,7 +411,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index 4ee8ccad3b18..c51676d637b9 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig 2023-04-05 11:05:06 UTC
+--- media/base/video_frame.cc.orig 2023-05-31 08:12:17 UTC
+++ media/base/video_frame.cc
@@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString(
return "OWNED_MEMORY";
@@ -54,7 +54,7 @@
DCHECK(frame->dmabuf_fds_);
// If there are any |dmabuf_fds_| plugged in, we should refer them too.
wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1302,7 +1302,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
+@@ -1305,7 +1305,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
: mailbox_holders_[texture_index];
}
@@ -63,7 +63,7 @@
const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
-@@ -1415,7 +1415,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1418,7 +1418,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
storage_type_(storage_type),
visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
natural_size_(natural_size),
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index 3893b196f06e..aa03f265c606 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,8 +1,8 @@
---- media/base/video_frame.h.orig 2023-04-28 17:01:32 UTC
+--- media/base/video_frame.h.orig 2023-05-31 08:12:17 UTC
+++ media/base/video_frame.h
@@ -44,7 +44,7 @@
#include "base/mac/scoped_cftyperef.h"
- #endif // BUILDFLAG(IS_MAC)
+ #endif // BUILDFLAG(IS_APPLE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -27,7 +27,7 @@
// Wraps provided dmabufs
// (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
// VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -604,7 +604,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -599,7 +599,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// mailbox, the caller must wait for the included sync point.
const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
@@ -36,7 +36,7 @@
// Returns a vector containing the backing DmaBufs for this frame. The number
// of returned DmaBufs will be equal or less than the number of planes of
// the frame. If there are less, this means that the last FD contains the
-@@ -822,7 +822,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -817,7 +817,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
// GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc
index c45a0388754a..4460837afa30 100644
--- a/www/chromium/files/patch-media_gpu_buffer__validation.cc
+++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc
@@ -1,4 +1,4 @@
---- media/gpu/buffer_validation.cc.orig 2022-05-19 14:06:27 UTC
+--- media/gpu/buffer_validation.cc.orig 2023-05-31 08:12:17 UTC
+++ media/gpu/buffer_validation.cc
@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/size.h"
@@ -18,7 +18,7 @@
if (fd < 0) {
VLOG(1) << "Invalid file descriptor";
return false;
-@@ -73,7 +73,7 @@ bool VerifyGpuMemoryBufferHandle(
+@@ -76,7 +76,7 @@ bool VerifyGpuMemoryBufferHandle(
VLOG(1) << "Unsupported: " << pixel_format;
return false;
}
diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index ffb42613d29e..b0cd56a4e07e 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-04-05 11:05:06 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-05-31 08:12:17 UTC
+++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -213,7 +213,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr
+@@ -212,7 +212,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr
#if BUILDFLAG(USE_VAAPI)
create_decoder_function_cb = base::BindOnce(&VaapiVideoDecoder::Create);
#elif BUILDFLAG(USE_V4L2_CODEC) && \
@@ -9,7 +9,7 @@
create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create);
#else
return nullptr;
-@@ -860,14 +860,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -909,14 +909,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
}
}
@@ -26,7 +26,7 @@
// Linux w/ V4L2 should not use a custom allocator
// Only tested with video_decode_accelerator_tests
// TODO(wenst@) Test with full Chromium Browser
-@@ -997,7 +997,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1046,7 +1046,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
<< " VideoFrames";
auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
index d27a1dbf45c4..833cc904d4a0 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-04-28 17:01:32 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-05-31 08:12:17 UTC
+++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -771,7 +771,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -776,7 +776,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
const gfx::Size decoder_natural_size =
aspect_ratio_.GetNaturalSize(decoder_visible_rect);
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
index 7208c9a3d052..b70a6cd66249 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,8 +1,8 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-02-08 09:03:45 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-05-31 08:12:17 UTC
+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -755,7 +755,7 @@ VADisplayState::VADisplayState()
- bool VADisplayState::Initialize() {
- base::AutoLock auto_lock(va_lock_);
+@@ -1609,7 +1609,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl
+ return {};
+ }
-#if BUILDFLAG(IS_OZONE) && BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni
index 373cef5087dd..805c4da7aa9a 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,6 +1,6 @@
---- media/media_options.gni.orig 2023-04-28 17:01:32 UTC
+--- media/media_options.gni.orig 2023-05-31 08:12:17 UTC
+++ media/media_options.gni
-@@ -186,12 +186,15 @@ declare_args() {
+@@ -173,12 +173,15 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
@@ -17,7 +17,7 @@
(!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
is_cast_audio_only)) {
use_alsa = true
-@@ -207,6 +210,10 @@ declare_args() {
+@@ -194,6 +197,10 @@ declare_args() {
if (!use_cras && !is_castos && !is_asan && !is_tsan) {
use_pulseaudio = true
}
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
index 8870ad481c4d..43737b845a85 100644
--- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
+++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
@@ -1,15 +1,6 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-04-05 11:05:06 UTC
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-05-31 08:12:17 UTC
+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -39,7 +39,7 @@ gfx::GpuMemoryBufferHandle GetVideoFrameGpuMemoryBuffe
- gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle =
- input->GetGpuMemoryBuffer()->CloneHandle();
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP);
- CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty());
- #else
-@@ -751,7 +751,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
+@@ -724,7 +724,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
return input.id;
}
@@ -18,7 +9,7 @@
// static
gfx::NativePixmapHandle StructTraits<
media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -772,7 +772,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
+@@ -745,7 +745,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
output->type = gfx::NATIVE_PIXMAP;
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
index 1f64b0477e74..726ae5f93460 100644
--- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
@@ -1,6 +1,6 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2022-09-24 10:57:32 UTC
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-05-31 08:12:17 UTC
+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
+@@ -694,7 +694,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
static const gfx::GpuMemoryBufferId& id(
const gfx::GpuMemoryBufferHandle& input);
diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index 65744fc0aaae..082b8913758d 100644
--- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-04-28 17:01:32 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-05-31 08:12:17 UTC
+++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -726,7 +726,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -730,7 +730,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
}
bool is_software_backed_video_frame = !video_frame->HasTextures();
@@ -9,7 +9,7 @@
is_software_backed_video_frame &= !video_frame->HasDmaBufs();
#endif
-@@ -1157,7 +1157,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1183,7 +1183,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
is_webgpu_compatible = (gpu_memory_buffer != nullptr);
#endif
@@ -18,7 +18,7 @@
is_webgpu_compatible = (gpu_memory_buffer != nullptr);
if (is_webgpu_compatible) {
is_webgpu_compatible &=
-@@ -1176,7 +1176,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1202,7 +1202,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
gpu::SHARED_IMAGE_USAGE_SCANOUT;
diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
index ec996d0514a3..b87cdf024716 100644
--- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- mojo/public/tools/bindings/mojom.gni.orig 2023-04-28 17:01:32 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig 2023-05-31 08:12:17 UTC
+++ mojo/public/tools/bindings/mojom.gni
-@@ -732,6 +732,16 @@ template("mojom") {
+@@ -744,6 +744,16 @@ template("mojom") {
enabled_features += [ "is_apple" ]
}
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 4d6ed4420929..ffc32220b46b 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- net/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ net/BUILD.gn
@@ -107,7 +107,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
@@ -9,12 +9,16 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1219,6 +1219,15 @@ component("net") {
+@@ -1231,6 +1231,19 @@ component("net") {
deps += [ "//third_party/xdg_shared_mime_info" ]
}
+ if (is_bsd) {
+ sources -= [
++ "base/address_map_cache_linux.cc",
++ "base/address_map_cache_linux.h",
++ "base/address_map_linux.cc",
++ "base/address_map_linux.h",
+ "base/address_tracker_linux.cc",
+ "base/address_tracker_linux.h",
+ "base/network_change_notifier_linux.cc",
@@ -25,16 +29,7 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1345,7 +1354,7 @@ component("net") {
- }
- }
-
-- if (is_android || is_chromeos) {
-+ if (is_android || is_chromeos || is_bsd) {
- sources += [
- "base/network_change_notifier_posix.cc",
- "base/network_change_notifier_posix.h",
-@@ -1378,7 +1387,7 @@ component("net") {
+@@ -1386,7 +1399,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
@@ -43,8 +38,8 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -2822,7 +2831,7 @@ test("net_unittests") {
- sources += [ "proxy_resolution/proxy_config_service_linux_unittest.cc" ]
+@@ -2847,7 +2860,7 @@ test("net_unittests") {
+ ]
}
- if (is_linux || is_chromeos) {
@@ -52,7 +47,7 @@
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
-@@ -2893,6 +2902,10 @@ test("net_unittests") {
+@@ -2915,6 +2928,10 @@ test("net_unittests") {
"//url:buildflags",
]
@@ -63,7 +58,7 @@
if (enable_websockets) {
deps += [ "//net/server:tests" ]
}
-@@ -2960,7 +2973,7 @@ test("net_unittests") {
+@@ -2996,7 +3013,7 @@ test("net_unittests") {
]
}
@@ -72,7 +67,7 @@
sources += [ "tools/quic/quic_simple_server_test.cc" ]
}
-@@ -3088,7 +3101,7 @@ test("net_unittests") {
+@@ -3131,7 +3148,7 @@ test("net_unittests") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc
index 8e09cebb2d97..bf0a9d06d5a3 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -1,4 +1,4 @@
---- net/base/network_change_notifier.cc.orig 2023-03-09 06:31:50 UTC
+--- net/base/network_change_notifier.cc.orig 2023-05-31 08:12:17 UTC
+++ net/base/network_change_notifier.cc
@@ -37,7 +37,7 @@
#include "net/base/network_change_notifier_linux.h"
@@ -6,10 +6,10 @@
#include "net/base/network_change_notifier_mac.h"
-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "net/base/network_change_notifier_posix.h"
+ #include "net/base/network_change_notifier_passive.h"
#elif BUILDFLAG(IS_FUCHSIA)
#include "net/base/network_change_notifier_fuchsia.h"
-@@ -327,6 +327,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
#elif BUILDFLAG(IS_FUCHSIA)
return std::make_unique<NetworkChangeNotifierFuchsia>(
/*require_wlan=*/false);
diff --git a/www/chromium/files/patch-net_base_network__change__notifier__posix.cc b/www/chromium/files/patch-net_base_network__change__notifier__passive.cc
index bb4a31bf79fa..8f22c6025c65 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier__passive.cc
@@ -1,8 +1,8 @@
---- net/base/network_change_notifier_posix.cc.orig 2022-08-31 12:19:35 UTC
-+++ net/base/network_change_notifier_posix.cc
-@@ -92,7 +92,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt
+--- net/base/network_change_notifier_passive.cc.orig 2023-05-31 08:12:17 UTC
++++ net/base/network_change_notifier_passive.cc
+@@ -107,7 +107,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern
NetworkChangeNotifier::NetworkChangeCalculatorParams
- NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() {
+ NetworkChangeNotifierPassive::NetworkChangeCalculatorParamsPassive() {
NetworkChangeCalculatorParams params;
-#if BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-net_cert_cert__verifier.cc b/www/chromium/files/patch-net_cert_cert__verifier.cc
index 4689f7588721..fdff52e2134d 100644
--- a/www/chromium/files/patch-net_cert_cert__verifier.cc
+++ b/www/chromium/files/patch-net_cert_cert__verifier.cc
@@ -1,11 +1,11 @@
---- net/cert/cert_verifier.cc.orig 2023-04-28 17:01:32 UTC
+--- net/cert/cert_verifier.cc.orig 2023-05-31 08:12:17 UTC
+++ net/cert/cert_verifier.cc
-@@ -91,7 +91,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa
- #if BUILDFLAG(CHROME_ROOT_STORE_ONLY)
- verify_proc = CertVerifyProc::CreateBuiltinWithChromeRootStore(
- std::move(cert_net_fetcher));
+@@ -40,7 +40,7 @@ class DefaultCertVerifyProcFactory : public net::CertV
+ return CertVerifyProc::CreateBuiltinWithChromeRootStore(
+ std::move(cert_net_fetcher), impl_params.crl_set,
+ base::OptionalToPtr(impl_params.root_store_data));
-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- verify_proc =
- CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher));
+ return CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher),
+ impl_params.crl_set);
#else
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc
index 7d1582f51418..d4ee27dbeed9 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.cc.orig 2023-04-28 17:01:32 UTC
+--- net/cert/cert_verify_proc.cc.orig 2023-05-31 08:12:17 UTC
+++ net/cert/cert_verify_proc.cc
-@@ -413,7 +413,7 @@ base::Value::Dict CertVerifyParams(
+@@ -409,7 +409,7 @@ base::Value::Dict CertVerifyParams(
} // namespace
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h
index 0bce5007ed42..e841de132e26 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.h.orig 2023-04-28 17:01:32 UTC
+--- net/cert/cert_verify_proc.h.orig 2023-05-31 08:12:17 UTC
+++ net/cert/cert_verify_proc.h
-@@ -68,7 +68,7 @@ class NET_EXPORT CertVerifyProc
+@@ -75,7 +75,7 @@ class NET_EXPORT CertVerifyProc
kMaxValue = kChainLengthOne
};
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
index 4f24a2b10dac..81c04a14133a 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
@@ -1,18 +1,18 @@
---- net/cert/cert_verify_proc_unittest.cc.orig 2023-04-28 17:01:32 UTC
+--- net/cert/cert_verify_proc_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ net/cert/cert_verify_proc_unittest.cc
-@@ -222,7 +222,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc(
- case CERT_VERIFY_PROC_WIN:
- return base::MakeRefCounted<CertVerifyProcWin>();
+@@ -214,7 +214,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc(
+ case CERT_VERIFY_PROC_IOS:
+ return base::MakeRefCounted<CertVerifyProcIOS>(std::move(crl_set));
#endif
-#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
case CERT_VERIFY_PROC_BUILTIN:
return CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher),
- CreateSslSystemTrustStore());
-@@ -252,7 +252,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = {
+ std::move(crl_set),
+@@ -243,7 +243,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = {
+ CERT_VERIFY_PROC_ANDROID,
+ #elif BUILDFLAG(IS_IOS)
CERT_VERIFY_PROC_IOS,
- #elif BUILDFLAG(IS_WIN)
- CERT_VERIFY_PROC_WIN,
-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
CERT_VERIFY_PROC_BUILTIN,
diff --git a/www/chromium/files/patch-net_cert_test__root__certs__unittest.cc b/www/chromium/files/patch-net_cert_test__root__certs__unittest.cc
index 57dde3fbc73f..f5ffb4432e52 100644
--- a/www/chromium/files/patch-net_cert_test__root__certs__unittest.cc
+++ b/www/chromium/files/patch-net_cert_test__root__certs__unittest.cc
@@ -1,11 +1,11 @@
---- net/cert/test_root_certs_unittest.cc.orig 2023-04-28 17:01:32 UTC
+--- net/cert/test_root_certs_unittest.cc.orig 2023-05-31 08:12:17 UTC
+++ net/cert/test_root_certs_unittest.cc
-@@ -43,7 +43,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc() {
- #if BUILDFLAG(CHROME_ROOT_STORE_ONLY)
+@@ -46,7 +46,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc() {
return CertVerifyProc::CreateBuiltinWithChromeRootStore(
- /*cert_net_fetcher=*/nullptr);
+ /*cert_net_fetcher=*/nullptr, CRLSet::BuiltinCRLSet().get(),
+ /*root_store_data=*/nullptr);
-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- return CertVerifyProc::CreateBuiltinVerifyProc(/*cert_net_fetcher=*/nullptr);
+ return CertVerifyProc::CreateBuiltinVerifyProc(/*cert_net_fetcher=*/nullptr,
+ CRLSet::BuiltinCRLSet().get());
#else
- return CertVerifyProc::CreateSystemVerifyProc(/*cert_net_fetcher=*/nullptr);
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 5b813cfe91f9..05d9e7978487 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,10 +1,10 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-01-11 09:17:16 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-05-31 08:12:17 UTC
+++ net/proxy_resolution/proxy_config_service_linux.cc
@@ -6,7 +6,9 @@
#include <errno.h>
#include <limits.h>
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
#include <sys/inotify.h>
+#endif
#include <unistd.h>
@@ -14,7 +14,7 @@
}
#endif // defined(USE_GIO)
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
// Converts |value| from a decimal string to an int. If there was a failure
// parsing, returns |default_value|.
int StringToIntOrDefault(base::StringPiece value, int default_value) {
@@ -26,11 +26,11 @@
} // namespace
-@@ -1248,9 +1252,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
- case base::nix::DESKTOP_ENVIRONMENT_KDE3:
+@@ -1249,9 +1253,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
case base::nix::DESKTOP_ENVIRONMENT_KDE5:
-+#if !defined(OS_BSD)
+ case base::nix::DESKTOP_ENVIRONMENT_KDE6:
++#if !BUILDFLAG(IS_BSD)
setting_getter_ =
std::make_unique<SettingGetterImplKDE>(env_var_getter_.get());
break;
diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
index e4725ee15fd2..ed7253f313a8 100644
--- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/tcp_socket_posix.cc.orig 2023-04-05 11:05:06 UTC
+--- net/socket/tcp_socket_posix.cc.orig 2023-05-31 08:12:17 UTC
+++ net/socket/tcp_socket_posix.cc
-@@ -99,6 +99,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
+@@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
return false;
}
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index a71e4db5052e..427db42d403a 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig 2023-04-28 17:01:32 UTC
+--- net/socket/udp_socket_posix.cc.orig 2023-05-31 08:12:17 UTC
+++ net/socket/udp_socket_posix.cc
-@@ -576,7 +576,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -575,7 +575,7 @@ int UDPSocketPosix::SetDoNotFragment() {
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -9,7 +9,7 @@
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
-@@ -597,7 +597,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -596,7 +596,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
int value = broadcast ? 1 : 0;
int rv;
@@ -18,7 +18,7 @@
// SO_REUSEPORT on OSX permits multiple processes to each receive
// UDP multicast or broadcast datagrams destined for the bound
// port.
-@@ -910,7 +910,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
+@@ -909,7 +909,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (last_error == EINVAL)
return ERR_ADDRESS_IN_USE;
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
index c0706edfaecd..c4a03fe59495 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
@@ -1,4 +1,4 @@
---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-04-28 17:01:32 UTC
+--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-05-31 08:12:17 UTC
+++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
@@ -35,7 +35,7 @@
#include "net/url_request/url_request_context_builder.h"
@@ -18,7 +18,7 @@
// On Linux, use a fixed ProxyConfigService, since the default one
// depends on glib.
//
-@@ -127,7 +127,7 @@ class CertVerifyImpl {
+@@ -126,7 +126,7 @@ class CertVerifyImpl {
std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName(
base::StringPiece impl_name,
scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index 19cc144d2c21..6574699fc1ac 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,4 +1,4 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-04-28 17:01:32 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-05-31 08:12:17 UTC
+++ net/tools/cert_verify_tool/cert_verify_tool.cc
@@ -31,7 +31,7 @@
#include "net/url_request/url_request_context_builder.h"
@@ -18,16 +18,16 @@
// On Linux, use a fixed ProxyConfigService, since the default one
// depends on glib.
//
-@@ -222,7 +222,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
- base::StringPiece impl_name,
+@@ -223,7 +223,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
scoped_refptr<net::CertNetFetcher> cert_net_fetcher,
+ scoped_refptr<net::CRLSet> crl_set,
RootStoreType root_store_type) {
-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
if (impl_name == "platform") {
if (root_store_type != RootStoreType::kSystem) {
-@@ -535,7 +535,7 @@ int main(int argc, char** argv) {
+@@ -537,7 +537,7 @@ int main(int argc, char** argv) {
std::string impls_str = command_line.GetSwitchValueASCII("impls");
if (impls_str.empty()) {
// Default value.
diff --git a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
index 71281ce12fd0..f5d4dab751ac 100644
--- a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
+++ b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
@@ -1,6 +1,6 @@
---- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-08-31 12:19:35 UTC
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2023-05-31 08:12:17 UTC
+++ remoting/codec/webrtc_video_encoder_vpx.cc
-@@ -89,7 +89,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
+@@ -88,7 +88,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
const webrtc::DesktopSize& size) {
SetCommonCodecParameters(config, size);
diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc
index acb6c45303c2..3f21cb3e83a4 100644
--- a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc
+++ b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc
@@ -1,6 +1,6 @@
---- remoting/host/chromoting_host_services_client.cc.orig 2023-02-08 09:03:45 UTC
+--- remoting/host/chromoting_host_services_client.cc.orig 2023-05-31 08:12:17 UTC
+++ remoting/host/chromoting_host_services_client.cc
-@@ -51,7 +51,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con
+@@ -64,7 +64,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con
} // namespace
@@ -9,7 +9,7 @@
// static
constexpr char
-@@ -129,7 +129,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic
+@@ -142,7 +142,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic
if (session_services_remote_.is_bound()) {
return true;
}
diff --git a/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc b/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc
index 51fab8b81a0e..5648358d1517 100644
--- a/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc
+++ b/www/chromium/files/patch-remoting_host_desktop__capturer__wrapper.cc
@@ -1,4 +1,4 @@
---- remoting/host/desktop_capturer_wrapper.cc.orig 2023-04-05 11:05:06 UTC
+--- remoting/host/desktop_capturer_wrapper.cc.orig 2023-05-31 08:12:17 UTC
+++ remoting/host/desktop_capturer_wrapper.cc
@@ -13,7 +13,7 @@
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
@@ -6,10 +6,19 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "remoting/host/linux/wayland_desktop_capturer.h"
#include "remoting/host/linux/wayland_utils.h"
#endif
+@@ -32,7 +32,7 @@ void DesktopCapturerWrapper::CreateCapturer(
+ const webrtc::DesktopCaptureOptions& options) {
+ DCHECK(!capturer_);
-@@ -100,7 +100,7 @@ void DesktopCapturerWrapper::OnCaptureResult(
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (IsRunningWayland()) {
+ capturer_ = std::make_unique<WaylandDesktopCapturer>(options);
+ } else {
+@@ -109,7 +109,7 @@ void DesktopCapturerWrapper::OnCaptureResult(
bool DesktopCapturerWrapper::SupportsFrameCallbacks() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc
index c8cd55ddec85..78020cddf6f1 100644
--- a/www/chromium/files/patch-remoting_host_host__attributes.cc
+++ b/www/chromium/files/patch-remoting_host_host__attributes.cc
@@ -1,7 +1,7 @@
---- remoting/host/host_attributes.cc.orig 2023-03-09 06:31:50 UTC
+--- remoting/host/host_attributes.cc.orig 2023-05-31 08:12:17 UTC
+++ remoting/host/host_attributes.cc
-@@ -108,7 +108,7 @@ std::string GetHostAttributes() {
- media::InitializeMediaFoundation()) {
+@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
+ if (media::InitializeMediaFoundation()) {
result.push_back("HWEncoder");
}
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc
index 1ddcce257a03..74fb72bb136d 100644
--- a/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc
+++ b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc
@@ -1,6 +1,6 @@
---- remoting/host/it2me/it2me_host.cc.orig 2023-03-09 06:31:50 UTC
+--- remoting/host/it2me/it2me_host.cc.orig 2023-05-31 08:12:17 UTC
+++ remoting/host/it2me/it2me_host.cc
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
#include "remoting/signaling/signaling_id_util.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -9,7 +9,7 @@
#include "remoting/host/linux/wayland_manager.h"
#include "remoting/host/linux/wayland_utils.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -144,7 +144,7 @@ void It2MeHost::Connect(
+@@ -111,7 +111,7 @@ void It2MeHost::Connect(
OnPolicyUpdate(std::move(policies));
@@ -18,7 +18,7 @@
if (IsRunningWayland()) {
WaylandManager::Get()->Init(host_context_->ui_task_runner());
}
-@@ -283,7 +283,7 @@ void It2MeHost::ConnectOnNetworkThread(
+@@ -251,7 +251,7 @@ void It2MeHost::ConnectOnNetworkThread(
// Set up the desktop environment options.
DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault());
diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn
index ca345c979964..6807b5b84dea 100644
--- a/www/chromium/files/patch-sandbox_linux_BUILD.gn
+++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/linux/BUILD.gn.orig 2023-02-08 09:03:45 UTC
+--- sandbox/linux/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ sandbox/linux/BUILD.gn
@@ -12,11 +12,11 @@ if (is_android) {
}
@@ -15,7 +15,7 @@
# On Android, use plain GTest.
use_base_test_suite = is_linux || is_chromeos
-@@ -379,6 +379,17 @@ component("sandbox_services") {
+@@ -380,6 +380,17 @@ component("sandbox_services") {
"services/libc_interceptor.h",
]
}
diff --git a/www/chromium/files/patch-sandbox_policy_features.cc b/www/chromium/files/patch-sandbox_policy_features.cc
index a1ae5a435d6e..ffabad02602a 100644
--- a/www/chromium/files/patch-sandbox_policy_features.cc
+++ b/www/chromium/files/patch-sandbox_policy_features.cc
@@ -1,7 +1,7 @@
---- sandbox/policy/features.cc.orig 2022-11-30 08:12:58 UTC
+--- sandbox/policy/features.cc.orig 2023-05-31 08:12:17 UTC
+++ sandbox/policy/features.cc
@@ -15,7 +15,11 @@ namespace sandbox::policy::features {
- // (Only causes an effect when feature kNetworkService is enabled.)
+ // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
BASE_FEATURE(kNetworkServiceSandbox,
"NetworkServiceSandbox",
+#if BUILDFLAG(IS_BSD)
@@ -9,6 +9,6 @@
+#else
base::FEATURE_DISABLED_BY_DEFAULT);
+#endif
- #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_FUCHSIA)
- #if BUILDFLAG(IS_WIN)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ // Enables a fine-grained seccomp-BPF syscall filter for the network service.
diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc
index 8aced142b35b..880f30609692 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.cc
+++ b/www/chromium/files/patch-sandbox_policy_switches.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/switches.cc.orig 2023-03-09 06:31:50 UTC
+--- sandbox/policy/switches.cc.orig 2023-05-31 08:12:17 UTC
+++ sandbox/policy/switches.cc
@@ -54,10 +54,10 @@ const char kFileUtilSandbox[] = "file_util";
const char kMirroringSandbox[] = "mirroring";
@@ -13,7 +13,7 @@
const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -104,7 +104,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
+@@ -96,7 +96,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
// Meant to be used as a browser-level switch for testing purposes only.
const char kNoSandbox[] = "no-sandbox";
diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h
index 33479c2ecd93..514826d21e6e 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.h
+++ b/www/chromium/files/patch-sandbox_policy_switches.h
@@ -1,4 +1,4 @@
---- sandbox/policy/switches.h.orig 2023-03-09 06:31:50 UTC
+--- sandbox/policy/switches.h.orig 2023-05-31 08:12:17 UTC
+++ sandbox/policy/switches.h
@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kFileUtilSandb
SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[];
@@ -13,7 +13,7 @@
SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -82,7 +82,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
+@@ -81,7 +81,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[];
SANDBOX_POLICY_EXPORT extern const char kNoSandbox[];
diff --git a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
index 1b350ee75596..918562c2bcb1 100644
--- a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
+++ b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
@@ -1,6 +1,6 @@
---- services/cert_verifier/cert_verifier_creation.cc.orig 2023-04-28 17:01:32 UTC
+--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-05-31 08:12:17 UTC
+++ services/cert_verifier/cert_verifier_creation.cc
-@@ -12,7 +12,7 @@
+@@ -14,7 +14,7 @@
#include "net/cert_net/cert_net_fetcher_url_request.h"
#include "net/net_buildflags.h"
@@ -9,16 +9,16 @@
#include "net/cert/cert_verify_proc_builtin.h"
#include "net/cert/internal/system_trust_store.h"
#endif
-@@ -90,7 +90,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce
+@@ -114,7 +114,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri
user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot(
user_slot_restriction_.get()))
: nullptr));
-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
verify_proc = net::CreateCertVerifyProcBuiltin(
- std::move(cert_net_fetcher), net::CreateSslSystemTrustStore());
- #else
-@@ -225,6 +225,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
+ std::move(cert_net_fetcher), std::move(crl_set),
+ net::CreateSslSystemTrustStore());
+@@ -215,6 +215,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
bool IsUsingCertNetFetcher() {
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
index aa1c4eaebc8c..8fb2ebf8bcd0 100644
--- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
+++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
@@ -1,6 +1,6 @@
---- services/device/geolocation/location_arbitrator.cc.orig 2023-03-09 06:31:50 UTC
+--- services/device/geolocation/location_arbitrator.cc.orig 2023-05-31 08:12:17 UTC
+++ services/device/geolocation/location_arbitrator.cc
-@@ -159,7 +159,7 @@ LocationArbitrator::NewNetworkLocationProvider(
+@@ -162,7 +162,7 @@ LocationArbitrator::NewNetworkLocationProvider(
std::unique_ptr<LocationProvider>
LocationArbitrator::NewSystemLocationProvider() {
diff --git a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn
index 208d48c30b91..a06afd957ea4 100644
--- a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn
+++ b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn
@@ -1,6 +1,6 @@
---- services/device/public/mojom/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- services/device/public/mojom/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ services/device/public/mojom/BUILD.gn
-@@ -97,7 +97,7 @@ mojom("device_service") {
+@@ -94,7 +94,7 @@ mojom("device_service") {
enable_js_fuzzing = false
enabled_features = []
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index 75e59c6705a1..8a752722ea5d 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- services/network/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ services/network/BUILD.gn
-@@ -333,7 +333,6 @@ if (is_linux || is_chromeos) {
+@@ -362,7 +362,6 @@ if (is_linux || is_chromeos) {
]
deps = [
"//base:base",
diff --git a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc
index 2273308e265e..f415276d159b 100644
--- a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc
@@ -1,36 +1,37 @@
---- services/network/network_sandbox_hook_linux.cc.orig 2023-04-28 17:01:32 UTC
+--- services/network/network_sandbox_hook_linux.cc.orig 2023-05-31 08:12:17 UTC
+++ services/network/network_sandbox_hook_linux.cc
-@@ -8,11 +8,14 @@
- #include "base/rand_util.h"
- #include "base/system/sys_info.h"
+@@ -14,11 +14,14 @@
+ #include "sandbox/policy/features.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
using sandbox::syscall_broker::BrokerFilePermission;
using sandbox::syscall_broker::MakeBrokerCommandSet;
+#endif
namespace network {
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
sandbox::syscall_broker::BrokerCommandSet GetNetworkBrokerCommandSet() {
return MakeBrokerCommandSet({
sandbox::syscall_broker::COMMAND_ACCESS,
-@@ -30,8 +33,10 @@ std::vector<BrokerFilePermission> GetNetworkFilePermis
- // TODO(tsepez): remove universal permission under filesystem root.
- return {BrokerFilePermission::ReadWriteCreateRecursive("/")};
+@@ -102,9 +105,11 @@ void LoadNetworkLibraries() {
+ }
}
+ #endif // BUILDFLAG(IS_CHROMEOS)
+#endif
- bool NetworkPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+#if !defined(OS_BSD)
- auto* instance = sandbox::policy::SandboxLinux::GetInstance();
-
- instance->StartBrokerProcess(
-@@ -39,6 +44,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin
+ bool NetworkPreSandboxHook(std::vector<std::string> network_context_parent_dirs,
+ sandbox::policy::SandboxLinux::Options options) {
++#if !BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS)
+ LoadNetworkLibraries();
+ #endif
+@@ -117,6 +122,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne
+ GetNetworkBrokerCommandSet(),
+ GetNetworkFilePermissions(std::move(network_context_parent_dirs)),
sandbox::policy::SandboxLinux::PreSandboxHook(), options);
-
- instance->EngageNamespaceSandboxIfPossible();
+#endif
+
return true;
}
-
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index b7f4a0ce1a04..e85a4ce7c8c1 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig 2023-04-28 17:01:32 UTC
+--- services/network/network_service.cc.orig 2023-05-31 08:12:17 UTC
+++ services/network/network_service.cc
-@@ -89,7 +89,7 @@
+@@ -88,7 +88,7 @@
#include "third_party/boringssl/src/include/openssl/cpu.h"
#endif
diff --git a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
new file mode 100644
index 000000000000..b80b2eab62a7
--- /dev/null
+++ b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
@@ -0,0 +1,11 @@
+--- services/network/public/cpp/BUILD.gn.orig 2023-05-31 08:12:17 UTC
++++ services/network/public/cpp/BUILD.gn
+@@ -469,7 +469,7 @@ component("cpp_base") {
+ sources += [ "transferable_directory_fuchsia.cc" ]
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ sources += [
+ "network_interface_change_listener_mojom_traits.cc",
+ "network_interface_change_listener_mojom_traits.h",
diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
new file mode 100644
index 000000000000..258f7e9b1f27
--- /dev/null
+++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
@@ -0,0 +1,25 @@
+--- services/network/public/mojom/BUILD.gn.orig 2023-05-31 08:12:17 UTC
++++ services/network/public/mojom/BUILD.gn
+@@ -460,11 +460,11 @@ mojom("url_loader_base") {
+ }
+
+ enabled_features = []
+- if (is_android || is_chromeos || is_linux) {
++ if (!is_bsd && (is_android || is_chromeos || is_linux)) {
+ enabled_features += [ "network_change_notifier_in_browser" ]
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+ # not include lacros.
+ enabled_features += [ "use_network_interface_change_listener" ]
+@@ -1377,7 +1377,7 @@ mojom("mojom") {
+ }
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+ # not include lacros.
+ enabled_features += [ "use_network_interface_change_listener" ]
diff --git a/www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
new file mode 100644
index 000000000000..ced9210eb2e0
--- /dev/null
+++ b/www/chromium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
@@ -0,0 +1,11 @@
+--- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig 2023-05-31 08:12:17 UTC
++++ services/network/shared_dictionary/shared_dictionary_writer_in_memory.h
+@@ -5,6 +5,8 @@
+ #ifndef SERVICES_NETWORK_SHARED_DICTIONARY_SHARED_DICTIONARY_WRITER_IN_MEMORY_H_
+ #define SERVICES_NETWORK_SHARED_DICTIONARY_SHARED_DICTIONARY_WRITER_IN_MEMORY_H_
+
++#include <vector>
++
+ #include "base/component_export.h"
+ #include "base/functional/callback.h"
+ #include "crypto/secure_hash.h"
diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
index 5fc37c18e102..7186abe305de 100644
--- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
+++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
@@ -1,6 +1,6 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2023-04-05 11:05:06 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn
-@@ -33,8 +33,12 @@ component("memory_instrumentation") {
+@@ -29,8 +29,12 @@ component("memory_instrumentation") {
sources += [ "os_metrics_win.cc" ]
}
diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc
new file mode 100644
index 000000000000..fec4820ffbf8
--- /dev/null
+++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc
@@ -0,0 +1,38 @@
+--- services/video_capture/video_capture_service_impl.cc.orig 2023-05-31 08:12:17 UTC
++++ services/video_capture/video_capture_service_impl.cc
+@@ -43,7 +43,7 @@
+ #include "services/video_capture/lacros/device_factory_adapter_lacros.h"
+ #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
+ #endif // BUILDFLAG(IS_LINUX)
+@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext
+ this};
+ };
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Intended usage of this class is to create viz::Gpu in utility process and
+ // connect to viz::GpuClient of browser process, which will call to Gpu service.
+ // Also, this class holds the viz::ContextProvider to listen and monitor Gpu
+@@ -256,7 +256,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende
+ if (!gpu_dependencies_context_)
+ gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>();
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
+ if (!viz_gpu_context_provider_) {
+ viz_gpu_context_provider_ =
+@@ -344,7 +344,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH
+ }
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) {
+ viz_gpu_ = std::move(viz_gpu);
+ }
diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h
new file mode 100644
index 000000000000..2fd0fa6fab75
--- /dev/null
+++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h
@@ -0,0 +1,29 @@
+--- services/video_capture/video_capture_service_impl.h.orig 2023-05-31 08:12:17 UTC
++++ services/video_capture/video_capture_service_impl.h
+@@ -24,7 +24,7 @@
+ #include "services/video_capture/ash/video_capture_device_factory_ash.h"
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/viz/public/cpp/gpu/gpu.h"
+ #endif // BUILDFLAG(IS_LINUX)
+
+@@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+ #if BUILDFLAG(IS_WIN)
+ void OnGpuInfoUpdate(const CHROME_LUID& luid) override;
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu);
+ #endif // BUILDFLAG(IS_LINUX)
+ private:
+@@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+ factory_receivers_ash_;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ class VizGpuContextProvider;
+ std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_;
+ std::unique_ptr<viz::Gpu> viz_gpu_;
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 8e7d1285e87a..435fb9c032e0 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- third_party/angle/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ third_party/angle/BUILD.gn
-@@ -286,7 +286,6 @@ config("extra_warnings") {
+@@ -292,7 +292,6 @@ config("extra_warnings") {
"-Wtautological-type-limit-compare",
"-Wundefined-reinterpret-cast",
"-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
"-Wsuggest-destructor-override",
"-Wsuggest-override",
-@@ -457,7 +456,7 @@ template("angle_common_lib") {
+@@ -463,7 +462,7 @@ template("angle_common_lib") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
@@ -17,7 +17,7 @@
libs = [ "dl" ]
}
-@@ -612,6 +611,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -618,6 +617,9 @@ angle_static_library("angle_gpu_info_util") {
"Xi",
"Xext",
]
diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
index db6b7e57c3e7..2efc21546a2f 100644
--- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
+++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2022-02-23 19:25:59 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2023-05-31 08:12:17 UTC
+++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h
-@@ -14,6 +14,13 @@
+@@ -15,6 +15,13 @@
namespace angle
{
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index cb318b43f5f5..f76f7109af85 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,16 +1,16 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-04-05 11:05:06 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-05-31 08:12:17 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
-@@ -55,7 +55,7 @@
- # include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
- # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS)
- # include "libANGLE/renderer/gl/apple/DisplayApple_api.h"
+@@ -57,7 +57,7 @@
+ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
+ # elif ANGLE_ENABLE_EAGL
+ # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
-# elif defined(ANGLE_PLATFORM_LINUX)
+# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
# include "libANGLE/renderer/gl/egl/DisplayEGL.h"
# if defined(ANGLE_USE_X11)
# include "libANGLE/renderer/gl/glx/DisplayGLX.h"
-@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
- impl = rx::CreateDisplayCGLOrEAGL(state);
+@@ -352,7 +352,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+ impl = new rx::DisplayEAGL(state);
break;
-# elif defined(ANGLE_PLATFORM_LINUX)
@@ -18,7 +18,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0)
{
-@@ -387,7 +387,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -393,7 +393,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
#if defined(ANGLE_ENABLE_OPENGL)
# if defined(ANGLE_PLATFORM_WINDOWS)
impl = new rx::DisplayWGL(state);
@@ -27,7 +27,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0 ||
platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE)
-@@ -436,7 +436,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -442,7 +442,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateVulkanWin32Display(state);
}
break;
@@ -36,7 +36,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
{
-@@ -2046,7 +2046,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2050,7 +2050,7 @@ static ClientExtensions GenerateClientExtensions()
extensions.x11Visual = true;
#endif
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
index b5bcd9053d9c..0b32884488af 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
@@ -1,6 +1,6 @@
---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-04-28 17:01:32 UTC
+--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-05-31 08:12:17 UTC
+++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1485,7 +1485,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1473,7 +1473,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported);
AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported);
diff --git a/www/chromium/files/patch-third__party_angle_util_BUILD.gn b/www/chromium/files/patch-third__party_angle_util_BUILD.gn
index a69114328eef..462c887bf52b 100644
--- a/www/chromium/files/patch-third__party_angle_util_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_util_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/util/BUILD.gn.orig 2023-02-08 09:03:45 UTC
+--- third_party/angle/util/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ third_party/angle/util/BUILD.gn
-@@ -292,7 +292,7 @@ foreach(is_shared_library,
+@@ -302,7 +302,7 @@ foreach(is_shared_library,
]
libs = []
diff --git a/www/chromium/files/patch-third__party_blink_public_platform_platform.h b/www/chromium/files/patch-third__party_blink_public_platform_platform.h
index 6df5f56af54a..3a8dbcc69007 100644
--- a/www/chromium/files/patch-third__party_blink_public_platform_platform.h
+++ b/www/chromium/files/patch-third__party_blink_public_platform_platform.h
@@ -1,6 +1,6 @@
---- third_party/blink/public/platform/platform.h.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/public/platform/platform.h.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/public/platform/platform.h
-@@ -343,7 +343,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -344,7 +344,7 @@ class BLINK_PLATFORM_EXPORT Platform {
return nullptr;
}
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index 11ba30c051bb..d56bedde88dc 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/controller/blink_initializer.cc
@@ -78,12 +78,12 @@
#include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
@@ -10,8 +10,8 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
-- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
#include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
#endif
@@ -28,8 +28,8 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
-- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
// Start reporting the highest private memory footprint after the first
// navigation.
HighestPmfReporter::Initialize(main_thread_task_runner);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
index 9baa51da8b0a..7098656708f6 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6458,7 +6458,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6455,7 +6455,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
}
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
// TODO(crbug.com/1317375): Build these tests on all platforms.
#define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
-@@ -6866,7 +6866,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
+@@ -6864,7 +6864,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
RunTest("composited_selection_bounds_large_selection_noscroll.html");
}
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
index e3f53f951af8..03d0f17975ba 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2022-06-17 14:20:10 UTC
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
+@@ -189,7 +189,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
Vector<String> InspectorMemoryAgent::Symbolize(
const WebVector<void*>& addresses) {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index 590da8214e11..847ee024e568 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-04-05 11:05:06 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -67,7 +67,7 @@
+@@ -66,7 +66,7 @@
#include "ui/display/screen_info.h"
#include "ui/gfx/geometry/quad_f.h"
@@ -9,9 +9,9 @@
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
#endif
-@@ -365,7 +365,7 @@ void LayoutView::UpdateLayout() {
- DCHECK(!layout_state_);
- LayoutState root_layout_state(*this);
+@@ -305,7 +305,7 @@ void LayoutView::UpdateLayout() {
+ fragmentation_context_.Clear();
+ }
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc
index 9a8bd82426e7..f3ec67adea28 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_ng_grid_ng__grid__layout__algorithm.cc
@@ -1,14 +1,14 @@
---- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
-@@ -516,8 +516,15 @@ wtf_size_t NGGridLayoutAlgorithm::BuildGridSizingSubtr
+@@ -520,8 +520,15 @@ wtf_size_t NGGridLayoutAlgorithm::BuildGridSizingSubtr
row_auto_repetitions);
bool has_nested_subgrid = false;
+#if defined(__clang__) && (__clang_major__ >= 16)
auto& [grid_items, layout_data, subtree_size] =
- sizing_tree->CreateSizingData();
+ sizing_tree->CreateSizingData(opt_subgrid_data);
+#else
-+ auto& sizing_data = sizing_tree->CreateSizingData();
++ auto& sizing_data = sizing_tree->CreateSizingData(opt_subgrid_data);
+ auto& layout_data = sizing_data.layout_data;
+ auto& grid_items = sizing_data.grid_items;
+ auto& subtree_size = sizing_data.subtree_size;
@@ -16,15 +16,30 @@
if (!must_ignore_children) {
// Construct grid items that are not subgridded.
-@@ -1540,8 +1547,15 @@ void NGGridLayoutAlgorithm::InitializeTrackSizes(
- NGGridSizingTree* sizing_tree) const {
- DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
+@@ -650,8 +657,14 @@ NGGridSizingTree NGGridLayoutAlgorithm::BuildGridSizin
+ NGGridSizingTree sizing_tree;
+
+ if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
++#if defined(__clang__) && (__clang_major__ >= 16)
+ auto& [grid_items, layout_data, subtree_size] =
+ sizing_tree.CreateSizingData();
++#else
++ auto& sizing_data = sizing_tree.CreateSizingData();
++ auto& layout_data = sizing_data.layout_data;
++ auto& grid_items = sizing_data.grid_items;
++#endif
+
+ const auto& node = Node();
+ grid_items =
+@@ -1640,8 +1653,15 @@ void NGGridLayoutAlgorithm::InitializeTrackSizes(
+ const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+ DCHECK(sizing_subtree);
+#if defined(__clang__) && (__clang_major__ >= 16)
auto& [grid_items, layout_data, subtree_size] =
- sizing_tree->At(current_grid_index);
+ sizing_subtree.SubtreeRootData();
+#else
-+ auto& sizing_data = sizing_tree->At(current_grid_index);
++ auto& sizing_data = sizing_subtree.SubtreeRootData();
+ auto& layout_data = sizing_data.layout_data;
+ auto& grid_items = sizing_data.grid_items;
+ auto& subtree_size = sizing_data.subtree_size;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
index efabc8c335ca..ffc96fac5c0b 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
@@ -1,9 +1,11 @@
---- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/modules/ml/webnn/features.gni
-@@ -7,5 +7,5 @@ declare_args() {
+@@ -7,7 +7,7 @@ declare_args() {
# This enables building WebNN with XNNPACK. Currently only available for
# Windows and Linux on x64 or x86.
build_webnn_with_xnnpack =
- (is_linux || is_win) && (current_cpu == "x64" || current_cpu == "x86")
+ !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86"))
- }
+
+ # This build flag enables WebNN on ChromeOS platform to access hardware
+ # acceleration by using ModelLoader mojo interface.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
index 2fca50c5a8fc..d886e10f1111 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc
-@@ -180,7 +180,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
+@@ -183,7 +183,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
~SharedXnnpackContext() {
base::AutoLock auto_lock(SharedXnnpackContextLock());
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index bb35fd658a4c..9d4792f24ac4 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6235,7 +6235,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6228,7 +6228,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
constexpr bool kAllowZeroCopyImages = true;
#endif
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index 23e9357ca9d0..809cea0606de 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,11 +1,11 @@
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -676,7 +676,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+@@ -679,7 +679,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+ // platform requires interop supported. According to the bug, this change will
+ // be a long time task. So disable using webgpu mailbox texture uploading path
// on linux platform.
- // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
- // backend is failing for unknown reasons.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool forceReadback = true;
- #else
- bool forceReadback =
+ use_webgpu_mailbox_texture = false;
+ unaccelerated_image = image->MakeUnaccelerated();
+ image = unaccelerated_image.get();
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 42ea62c6f1d3..4631ae4ce5be 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig 2023-04-28 17:01:32 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1930,7 +1930,7 @@ static_library("test_support") {
+@@ -1919,7 +1919,7 @@ static_library("test_support") {
]
# fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index 7c3d2b505ef9..4a74c0181d86 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-04-05 11:05:06 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -358,7 +358,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -363,7 +363,7 @@ void VideoFrameSubmitter::OnBeginFrame(
continue;
auto& feedback =
timing_details.find(frame_token)->value.presentation_feedback;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index 0c71abfbcca0..65ef29a48b3f 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-05-17 10:17:13 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-05-31 08:12:17 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1320,7 +1320,7 @@
+@@ -1381,7 +1381,7 @@
{
name: "DocumentPictureInPictureAPI",
origin_trial_feature_name: "DocumentPictureInPictureAPI",
@@ -9,16 +9,7 @@
status: {
"Android": "",
"ChromeOS_Lacros": "",
-@@ -1578,7 +1578,7 @@
- depends_on: ["FileSystemAccessLocal"],
- status: {"Android": "test", "default": "stable"},
- origin_trial_feature_name: "FileHandling",
-- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
-+ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
- base_feature: "FileHandlingAPI",
- },
- {
-@@ -2515,7 +2515,7 @@
+@@ -2590,7 +2590,7 @@
name: "PaymentHandlerMinimalHeaderUX",
origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
origin_trial_allows_third_party: true,
@@ -27,7 +18,7 @@
},
{
name: "PaymentInstruments",
-@@ -3427,7 +3427,7 @@
+@@ -3478,7 +3478,7 @@
name: "UnrestrictedSharedArrayBuffer",
base_feature: "none",
origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -36,7 +27,7 @@
},
{
// A kill switch for crbug.com/1410332.
-@@ -3453,7 +3453,7 @@
+@@ -3509,7 +3509,7 @@
origin_trial_feature_name: "UserAgentReduction",
origin_trial_allows_third_party: true,
// iOS not included as it should not send a reduced User-Agent string.
@@ -45,7 +36,7 @@
base_feature: "ReduceUserAgent",
},
{
-@@ -3621,12 +3621,12 @@
+@@ -3660,12 +3660,12 @@
status: "experimental",
base_feature: "none",
origin_trial_feature_name: "WebAppUrlHandling",
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
new file mode 100644
index 000000000000..c46f97eb268f
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-05-31 08:12:17 UTC
++++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
+@@ -572,7 +572,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV
+ }
+
+ const unsigned texture_target =
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Explicitly set GL_TEXTURE_EXTERNAL_OES as the
+ // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12
+ // format, while the `ImageTextureTarget()` will return GL_TEXTURE_2D.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
new file mode 100644
index 000000000000..3bb5fae960f1
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig 2023-05-31 08:12:17 UTC
++++ third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc
+@@ -27,7 +27,7 @@ BlinkCategorizedWorkerPoolDelegate& BlinkCategorizedWo
+
+ void BlinkCategorizedWorkerPoolDelegate::NotifyThreadWillRun(
+ base::PlatformThreadId tid) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ scoped_refptr<base::TaskRunner> task_runner =
+ Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted());
+ task_runner->PostTask(FROM_HERE, base::BindOnce(
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc
deleted file mode 100644
index 117d8b626ddd..000000000000
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2023-03-09 06:31:50 UTC
-+++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc
-@@ -242,7 +242,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre
- "CompositorTileWorkerBackground", thread_options, this,
- background_thread_prio_categories,
- &has_task_for_background_priority_thread_cv_);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- thread->SetBackgroundingCallback(
- Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted()),
- base::BindOnce([](base::PlatformThreadId thread_id) {
diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn
index 990e5f02025e..de74a4734fbb 100644
--- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn
+++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/boringssl/BUILD.gn.orig 2022-03-25 21:59:56 UTC
+--- third_party/boringssl/BUILD.gn.orig 2023-05-31 08:12:17 UTC
+++ third_party/boringssl/BUILD.gn
-@@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+@@ -139,7 +139,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "arm64") {
diff --git a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
index 8e543960dbed..1556cb096659 100644
--- a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
+++ b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
@@ -1,6 +1,6 @@
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-11-30 08:12:58 UTC
+--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-05-31 08:12:17 UTC
+++ third_party/dawn/include/dawn/native/VulkanBackend.h
-@@ -82,7 +82,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
+@@ -76,7 +76,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
};
// Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
deleted file mode 100644
index 8cdd78c8fb18..000000000000
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
+++ /dev/null
@@ -1,751 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2023-04-28 17:01:32 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h
-@@ -0,0 +1,748 @@
-+/* Automatically generated by configure - do not modify! */
-+#ifndef FFMPEG_CONFIG_H
-+#define FFMPEG_CONFIG_H
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+#define CONFIG_THIS_YEAR 2022
-+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+#define CC_IDENT "OpenBSD clang version 13.0.0"
-+#define OS_NAME openbsd
-+#define av_restrict restrict
-+#define EXTERN_PREFIX ""
-+#define EXTERN_ASM
-+#define BUILDSUF ""
-+#define SLIBSUF ".so"
-+#define HAVE_MMX2 HAVE_MMXEXT
-+#define SWS_MAX_FILTER_SIZE 256
-+#define ARCH_AARCH64 1
-+#define ARCH_ALPHA 0
-+#define ARCH_ARM 0
-+#define ARCH_AVR32 0
-+#define ARCH_AVR32_AP 0
-+#define ARCH_AVR32_UC 0
-+#define ARCH_BFIN 0
-+#define ARCH_IA64 0
-+#define ARCH_LOONGARCH 0
-+#define ARCH_LOONGARCH32 0
-+#define ARCH_LOONGARCH64 0
-+#define ARCH_M68K 0
-+#define ARCH_MIPS 0
-+#define ARCH_MIPS64 0
-+#define ARCH_PARISC 0
-+#define ARCH_PPC 0
-+#define ARCH_PPC64 0
-+#define ARCH_RISCV 0
-+#define ARCH_S390 0
-+#define ARCH_SH4 0
-+#define ARCH_SPARC 0
-+#define ARCH_SPARC64 0
-+#define ARCH_TILEGX 0
-+#define ARCH_TILEPRO 0
-+#define ARCH_TOMI 0
-+#define ARCH_X86 0
-+#define ARCH_X86_32 0
-+#define ARCH_X86_64 0
-+#define HAVE_ARMV5TE 0
-+#define HAVE_ARMV6 0
-+#define HAVE_ARMV6T2 0
-+#define HAVE_ARMV8 1
-+#define HAVE_NEON 1
-+#define HAVE_VFP 1
-+#define HAVE_VFPV3 0
-+#define HAVE_SETEND 0
-+#define HAVE_ALTIVEC 0
-+#define HAVE_DCBZL 0
-+#define HAVE_LDBRX 0
-+#define HAVE_POWER8 0
-+#define HAVE_PPC4XX 0
-+#define HAVE_VSX 0
-+#define HAVE_RVV 0
-+#define HAVE_AESNI 0
-+#define HAVE_AMD3DNOW 0
-+#define HAVE_AMD3DNOWEXT 0
-+#define HAVE_AVX 0
-+#define HAVE_AVX2 0
-+#define HAVE_AVX512 0
-+#define HAVE_AVX512ICL 0
-+#define HAVE_FMA3 0
-+#define HAVE_FMA4 0
-+#define HAVE_MMX 0
-+#define HAVE_MMXEXT 0
-+#define HAVE_SSE 0
-+#define HAVE_SSE2 0
-+#define HAVE_SSE3 0
-+#define HAVE_SSE4 0
-+#define HAVE_SSE42 0
-+#define HAVE_SSSE3 0
-+#define HAVE_XOP 0
-+#define HAVE_CPUNOP 0
-+#define HAVE_I686 0
-+#define HAVE_MIPSFPU 0
-+#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R5 0
-+#define HAVE_MIPS64R2 0
-+#define HAVE_MIPS32R6 0
-+#define HAVE_MIPS64R6 0
-+#define HAVE_MIPSDSP 0
-+#define HAVE_MIPSDSPR2 0
-+#define HAVE_MSA 0
-+#define HAVE_LOONGSON2 0
-+#define HAVE_LOONGSON3 0
-+#define HAVE_MMI 0
-+#define HAVE_LSX 0
-+#define HAVE_LASX 0
-+#define HAVE_ARMV5TE_EXTERNAL 0
-+#define HAVE_ARMV6_EXTERNAL 0
-+#define HAVE_ARMV6T2_EXTERNAL 0
-+#define HAVE_ARMV8_EXTERNAL 1
-+#define HAVE_NEON_EXTERNAL 1
-+#define HAVE_VFP_EXTERNAL 1
-+#define HAVE_VFPV3_EXTERNAL 0
-+#define HAVE_SETEND_EXTERNAL 0
-+#define HAVE_ALTIVEC_EXTERNAL 0
-+#define HAVE_DCBZL_EXTERNAL 0
-+#define HAVE_LDBRX_EXTERNAL 0
-+#define HAVE_POWER8_EXTERNAL 0
-+#define HAVE_PPC4XX_EXTERNAL 0
-+#define HAVE_VSX_EXTERNAL 0
-+#define HAVE_RVV_EXTERNAL 0
-+#define HAVE_AESNI_EXTERNAL 0
-+#define HAVE_AMD3DNOW_EXTERNAL 0
-+#define HAVE_AMD3DNOWEXT_EXTERNAL 0
-+#define HAVE_AVX_EXTERNAL 0
-+#define HAVE_AVX2_EXTERNAL 0
-+#define HAVE_AVX512_EXTERNAL 0
-+#define HAVE_AVX512ICL_EXTERNAL 0
-+#define HAVE_FMA3_EXTERNAL 0
-+#define HAVE_FMA4_EXTERNAL 0
-+#define HAVE_MMX_EXTERNAL 0
-+#define HAVE_MMXEXT_EXTERNAL 0
-+#define HAVE_SSE_EXTERNAL 0
-+#define HAVE_SSE2_EXTERNAL 0
-+#define HAVE_SSE3_EXTERNAL 0
-+#define HAVE_SSE4_EXTERNAL 0
-+#define HAVE_SSE42_EXTERNAL 0
-+#define HAVE_SSSE3_EXTERNAL 0
-+#define HAVE_XOP_EXTERNAL 0
-+#define HAVE_CPUNOP_EXTERNAL 0
-+#define HAVE_I686_EXTERNAL 0
-+#define HAVE_MIPSFPU_EXTERNAL 0
-+#define HAVE_MIPS32R2_EXTERNAL 0
-+#define HAVE_MIPS32R5_EXTERNAL 0
-+#define HAVE_MIPS64R2_EXTERNAL 0
-+#define HAVE_MIPS32R6_EXTERNAL 0
-+#define HAVE_MIPS64R6_EXTERNAL 0
-+#define HAVE_MIPSDSP_EXTERNAL 0
-+#define HAVE_MIPSDSPR2_EXTERNAL 0
-+#define HAVE_MSA_EXTERNAL 0
-+#define HAVE_LOONGSON2_EXTERNAL 0
-+#define HAVE_LOONGSON3_EXTERNAL 0
-+#define HAVE_MMI_EXTERNAL 0
-+#define HAVE_LSX_EXTERNAL 0
-+#define HAVE_LASX_EXTERNAL 0
-+#define HAVE_ARMV5TE_INLINE 0
-+#define HAVE_ARMV6_INLINE 0
-+#define HAVE_ARMV6T2_INLINE 0
-+#define HAVE_ARMV8_INLINE 1
-+#define HAVE_NEON_INLINE 1
-+#define HAVE_VFP_INLINE 1
-+#define HAVE_VFPV3_INLINE 0
-+#define HAVE_SETEND_INLINE 0
-+#define HAVE_ALTIVEC_INLINE 0
-+#define HAVE_DCBZL_INLINE 0
-+#define HAVE_LDBRX_INLINE 0
-+#define HAVE_POWER8_INLINE 0
-+#define HAVE_PPC4XX_INLINE 0
-+#define HAVE_VSX_INLINE 0
-+#define HAVE_RVV_INLINE 0
-+#define HAVE_AESNI_INLINE 0
-+#define HAVE_AMD3DNOW_INLINE 0
-+#define HAVE_AMD3DNOWEXT_INLINE 0
-+#define HAVE_AVX_INLINE 0
-+#define HAVE_AVX2_INLINE 0
-+#define HAVE_AVX512_INLINE 0
-+#define HAVE_AVX512ICL_INLINE 0
-+#define HAVE_FMA3_INLINE 0
-+#define HAVE_FMA4_INLINE 0
-+#define HAVE_MMX_INLINE 0
-+#define HAVE_MMXEXT_INLINE 0
-+#define HAVE_SSE_INLINE 0
-+#define HAVE_SSE2_INLINE 0
-+#define HAVE_SSE3_INLINE 0
-+#define HAVE_SSE4_INLINE 0
-+#define HAVE_SSE42_INLINE 0
-+#define HAVE_SSSE3_INLINE 0
-+#define HAVE_XOP_INLINE 0
-+#define HAVE_CPUNOP_INLINE 0
-+#define HAVE_I686_INLINE 0
-+#define HAVE_MIPSFPU_INLINE 0
-+#define HAVE_MIPS32R2_INLINE 0
-+#define HAVE_MIPS32R5_INLINE 0
-+#define HAVE_MIPS64R2_INLINE 0
-+#define HAVE_MIPS32R6_INLINE 0
-+#define HAVE_MIPS64R6_INLINE 0
-+#define HAVE_MIPSDSP_INLINE 0
-+#define HAVE_MIPSDSPR2_INLINE 0
-+#define HAVE_MSA_INLINE 0
-+#define HAVE_LOONGSON2_INLINE 0
-+#define HAVE_LOONGSON3_INLINE 0
-+#define HAVE_MMI_INLINE 0
-+#define HAVE_LSX_INLINE 0
-+#define HAVE_LASX_INLINE 0
-+#define HAVE_ALIGNED_STACK 1
-+#define HAVE_FAST_64BIT 1
-+#define HAVE_FAST_CLZ 1
-+#define HAVE_FAST_CMOV 0
-+#define HAVE_FAST_FLOAT16 1
-+#define HAVE_LOCAL_ALIGNED 0
-+#define HAVE_SIMD_ALIGN_16 1
-+#define HAVE_SIMD_ALIGN_32 0
-+#define HAVE_SIMD_ALIGN_64 0
-+#define HAVE_ATOMIC_CAS_PTR 0
-+#define HAVE_MACHINE_RW_BARRIER 0
-+#define HAVE_MEMORYBARRIER 0
-+#define HAVE_MM_EMPTY 0
-+#define HAVE_RDTSC 0
-+#define HAVE_SEM_TIMEDWAIT 1
-+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+#define HAVE_CABS 0
-+#define HAVE_CEXP 0
-+#define HAVE_INLINE_ASM 1
-+#define HAVE_SYMVER 0
-+#define HAVE_X86ASM 0
-+#define HAVE_BIGENDIAN 0
-+#define HAVE_FAST_UNALIGNED 1
-+#define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_TYPES_H 0
-+#define HAVE_CDIO_PARANOIA_H 0
-+#define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+#define HAVE_CUDA_H 0
-+#define HAVE_DISPATCH_DISPATCH_H 0
-+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
-+#define HAVE_DEV_IC_BT8XX_H 1
-+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
-+#define HAVE_DIRECT_H 0
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DXGIDEBUG_H 0
-+#define HAVE_DXVA_H 0
-+#define HAVE_ES2_GL_H 0
-+#define HAVE_GSM_H 0
-+#define HAVE_IO_H 0
-+#define HAVE_LINUX_DMA_BUF_H 0
-+#define HAVE_LINUX_PERF_EVENT_H 0
-+#define HAVE_MACHINE_IOCTL_BT848_H 0
-+#define HAVE_MACHINE_IOCTL_METEOR_H 0
-+#define HAVE_MALLOC_H 0
-+#define HAVE_OPENCV2_CORE_CORE_C_H 0
-+#define HAVE_OPENGL_GL3_H 0
-+#define HAVE_POLL_H 1
-+#define HAVE_SYS_PARAM_H 1
-+#define HAVE_SYS_RESOURCE_H 1
-+#define HAVE_SYS_SELECT_H 1
-+#define HAVE_SYS_SOUNDCARD_H 0
-+#define HAVE_SYS_TIME_H 1
-+#define HAVE_SYS_UN_H 1
-+#define HAVE_SYS_VIDEOIO_H 1
-+#define HAVE_TERMIOS_H 1
-+#define HAVE_UDPLITE_H 0
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */
-+#define HAVE_WINDOWS_H 0
-+#define HAVE_WINSOCK2_H 0
-+#define HAVE_INTRINSICS_NEON 1
-+#define HAVE_ATANF 1
-+#define HAVE_ATAN2F 1
-+#define HAVE_CBRT 1
-+#define HAVE_CBRTF 1
-+#define HAVE_COPYSIGN 1
-+#define HAVE_COSF 1
-+#define HAVE_ERF 1
-+#define HAVE_EXP2 1
-+#define HAVE_EXP2F 1
-+#define HAVE_EXPF 1
-+#define HAVE_HYPOT 1
-+#define HAVE_ISFINITE 1
-+#define HAVE_ISINF 1
-+#define HAVE_ISNAN 1
-+#define HAVE_LDEXPF 1
-+#define HAVE_LLRINT 1
-+#define HAVE_LLRINTF 1
-+#define HAVE_LOG2 1
-+#define HAVE_LOG2F 1
-+#define HAVE_LOG10F 1
-+#define HAVE_LRINT 1
-+#define HAVE_LRINTF 1
-+#define HAVE_POWF 1
-+#define HAVE_RINT 1
-+#define HAVE_ROUND 1
-+#define HAVE_ROUNDF 1
-+#define HAVE_SINF 1
-+#define HAVE_TRUNC 1
-+#define HAVE_TRUNCF 1
-+#define HAVE_DOS_PATHS 0
-+#define HAVE_LIBC_MSVCRT 0
-+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
-+#define HAVE_SECTION_DATA_REL_RO 1
-+#define HAVE_THREADS 1
-+#define HAVE_UWP 0
-+#define HAVE_WINRT 0
-+#define HAVE_ACCESS 1
-+#define HAVE_ALIGNED_MALLOC 0
-+#define HAVE_ARC4RANDOM 1
-+#define HAVE_CLOCK_GETTIME 1
-+#define HAVE_CLOSESOCKET 0
-+#define HAVE_COMMANDLINETOARGVW 0
-+#define HAVE_FCNTL 1
-+#define HAVE_GETADDRINFO 0
-+#define HAVE_GETAUXVAL 0
-+#define HAVE_GETENV 1
-+#define HAVE_GETHRTIME 0
-+#define HAVE_GETOPT 1
-+#define HAVE_GETMODULEHANDLE 0
-+#define HAVE_GETPROCESSAFFINITYMASK 0
-+#define HAVE_GETPROCESSMEMORYINFO 0
-+#define HAVE_GETPROCESSTIMES 0
-+#define HAVE_GETRUSAGE 1
-+#define HAVE_GETSTDHANDLE 0
-+#define HAVE_GETSYSTEMTIMEASFILETIME 0
-+#define HAVE_GETTIMEOFDAY 1
-+#define HAVE_GLOB 1
-+#define HAVE_GLXGETPROCADDRESS 0
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INET_ATON 0
-+#define HAVE_ISATTY 1
-+#define HAVE_KBHIT 0
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LSTAT 1
-+#define HAVE_LZO1X_999_COMPRESS 0
-+#define HAVE_MACH_ABSOLUTE_TIME 0
-+#define HAVE_MAPVIEWOFFILE 0
-+#define HAVE_MEMALIGN 0
-+#define HAVE_MKSTEMP 1
-+#define HAVE_MMAP 1
-+#define HAVE_MPROTECT 1
-+#define HAVE_NANOSLEEP 1
-+#define HAVE_PEEKNAMEDPIPE 0
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */
-+#define HAVE_PTHREAD_CANCEL 1
-+#define HAVE_SCHED_GETAFFINITY 0
-+#define HAVE_SECITEMIMPORT 0
-+#define HAVE_SETCONSOLETEXTATTRIBUTE 0
-+#define HAVE_SETCONSOLECTRLHANDLER 0
-+#define HAVE_SETDLLDIRECTORY 0
-+#define HAVE_SETMODE 0
-+#define HAVE_SETRLIMIT 1
-+#define HAVE_SLEEP 0
-+#define HAVE_STRERROR_R 1
-+#define HAVE_SYSCONF 1
-+#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 1 -- forced to 0 for Fuchsia */
-+#define HAVE_USLEEP 1
-+#define HAVE_UTGETOSTYPEFROMSTRING 0
-+#define HAVE_VIRTUALALLOC 0
-+#define HAVE_WGLGETPROCADDRESS 0
-+#define HAVE_BCRYPT 0
-+#define HAVE_VAAPI_DRM 0
-+#define HAVE_VAAPI_X11 0
-+#define HAVE_VDPAU_X11 0
-+#define HAVE_PTHREADS 1
-+#define HAVE_OS2THREADS 0
-+#define HAVE_W32THREADS 0
-+#define HAVE_AS_ARCH_DIRECTIVE 0
-+#define HAVE_AS_DN_DIRECTIVE 0
-+#define HAVE_AS_FPU_DIRECTIVE 0
-+#define HAVE_AS_FUNC 0
-+#define HAVE_AS_OBJECT_ARCH 0
-+#define HAVE_ASM_MOD_Q 0
-+#define HAVE_BLOCKS_EXTENSION 0
-+#define HAVE_EBP_AVAILABLE 0
-+#define HAVE_EBX_AVAILABLE 0
-+#define HAVE_GNU_AS 0
-+#define HAVE_GNU_WINDRES 0
-+#define HAVE_IBM_ASM 0
-+#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
-+#define HAVE_INLINE_ASM_LABELS 1
-+#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-+#define HAVE_PRAGMA_DEPRECATED 1
-+#define HAVE_RSYNC_CONTIMEOUT 0
-+#define HAVE_SYMVER_ASM_LABEL 1
-+#define HAVE_SYMVER_GNU_ASM 1
-+/* #define HAVE_VFP_ARGS 0 -- softfp/hardfp selection is done by the chrome build */
-+#define HAVE_XFORM_ASM 0
-+#define HAVE_XMM_CLOBBERS 0
-+#define HAVE_DPI_AWARENESS_CONTEXT 0
-+#define HAVE_IDXGIOUTPUT5 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVC 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
-+#define HAVE_KCMVIDEOCODECTYPE_VP9 0
-+#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0
-+#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0
-+#define HAVE_SOCKLEN_T 0
-+#define HAVE_STRUCT_ADDRINFO 0
-+#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-+#define HAVE_STRUCT_IP_MREQ_SOURCE 0
-+#define HAVE_STRUCT_IPV6_MREQ 0
-+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-+#define HAVE_STRUCT_POLLFD 0
-+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-+#define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
-+#define HAVE_STRUCT_SOCKADDR_IN6 0
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
-+#define HAVE_GZIP 1
-+#define HAVE_LIBDRM_GETFB2 0
-+#define HAVE_MAKEINFO 1
-+#define HAVE_MAKEINFO_HTML 0
-+#define HAVE_OPENCL_D3D11 0
-+#define HAVE_OPENCL_DRM_ARM 0
-+#define HAVE_OPENCL_DRM_BEIGNET 0
-+#define HAVE_OPENCL_DXVA2 0
-+#define HAVE_OPENCL_VAAPI_BEIGNET 0
-+#define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_PERL 1
-+#define HAVE_POD2MAN 1
-+#define HAVE_TEXI2HTML 0
-+#define HAVE_XMLLINT 1
-+#define HAVE_ZLIB_GZIP 0
-+#define CONFIG_DOC 0
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
-+#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
-+#define CONFIG_AVIO_READING_EXAMPLE 1
-+#define CONFIG_DECODE_AUDIO_EXAMPLE 1
-+#define CONFIG_DECODE_VIDEO_EXAMPLE 1
-+#define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-+#define CONFIG_ENCODE_AUDIO_EXAMPLE 1
-+#define CONFIG_ENCODE_VIDEO_EXAMPLE 1
-+#define CONFIG_EXTRACT_MVS_EXAMPLE 1
-+#define CONFIG_FILTER_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-+#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 1
-+#define CONFIG_HW_DECODE_EXAMPLE 1
-+#define CONFIG_METADATA_EXAMPLE 1
-+#define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
-+#define CONFIG_REMUXING_EXAMPLE 1
-+#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-+#define CONFIG_SCALING_VIDEO_EXAMPLE 0
-+#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-+#define CONFIG_TRANSCODING_EXAMPLE 0
-+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
-+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-+#define CONFIG_AVISYNTH 0
-+#define CONFIG_FREI0R 0
-+#define CONFIG_LIBCDIO 0
-+#define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBRUBBERBAND 0
-+#define CONFIG_LIBVIDSTAB 0
-+#define CONFIG_LIBX264 0
-+#define CONFIG_LIBX265 0
-+#define CONFIG_LIBXAVS 0
-+#define CONFIG_LIBXAVS2 0
-+#define CONFIG_LIBXVID 0
-+#define CONFIG_DECKLINK 0
-+#define CONFIG_LIBFDK_AAC 0
-+#define CONFIG_LIBTLS 0
-+#define CONFIG_GMP 0
-+#define CONFIG_LIBARIBB24 0
-+#define CONFIG_LIBLENSFUN 0
-+#define CONFIG_LIBOPENCORE_AMRNB 0
-+#define CONFIG_LIBOPENCORE_AMRWB 0
-+#define CONFIG_LIBVO_AMRWBENC 0
-+#define CONFIG_MBEDTLS 0
-+#define CONFIG_RKMPP 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_CHROMAPRINT 0
-+#define CONFIG_GCRYPT 0
-+#define CONFIG_GNUTLS 0
-+#define CONFIG_JNI 0
-+#define CONFIG_LADSPA 0
-+#define CONFIG_LCMS2 0
-+#define CONFIG_LIBAOM 0
-+#define CONFIG_LIBASS 0
-+#define CONFIG_LIBBLURAY 0
-+#define CONFIG_LIBBS2B 0
-+#define CONFIG_LIBCACA 0
-+#define CONFIG_LIBCELT 0
-+#define CONFIG_LIBCODEC2 0
-+#define CONFIG_LIBDAV1D 0
-+#define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDRM 0
-+#define CONFIG_LIBFLITE 0
-+#define CONFIG_LIBFONTCONFIG 0
-+#define CONFIG_LIBFREETYPE 0
-+#define CONFIG_LIBFRIBIDI 0
-+#define CONFIG_LIBGLSLANG 0
-+#define CONFIG_LIBGME 0
-+#define CONFIG_LIBGSM 0
-+#define CONFIG_LIBIEC61883 0
-+#define CONFIG_LIBILBC 0
-+#define CONFIG_LIBJACK 0
-+#define CONFIG_LIBJXL 0
-+#define CONFIG_LIBKLVANC 0
-+#define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBMODPLUG 0
-+#define CONFIG_LIBMP3LAME 0
-+#define CONFIG_LIBMYSOFA 0
-+#define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
-+#define CONFIG_LIBOPENJPEG 0
-+#define CONFIG_LIBOPENMPT 0
-+#define CONFIG_LIBOPENVINO 0
-+#define CONFIG_LIBOPUS 1
-+#define CONFIG_LIBPLACEBO 0
-+#define CONFIG_LIBPULSE 0
-+#define CONFIG_LIBRABBITMQ 0
-+#define CONFIG_LIBRAV1E 0
-+#define CONFIG_LIBRIST 0
-+#define CONFIG_LIBRSVG 0
-+#define CONFIG_LIBRTMP 0
-+#define CONFIG_LIBSHADERC 0
-+#define CONFIG_LIBSHINE 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_LIBSNAPPY 0
-+#define CONFIG_LIBSOXR 0
-+#define CONFIG_LIBSPEEX 0
-+#define CONFIG_LIBSRT 0
-+#define CONFIG_LIBSSH 0
-+#define CONFIG_LIBSVTAV1 0
-+#define CONFIG_LIBTENSORFLOW 0
-+#define CONFIG_LIBTESSERACT 0
-+#define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTWOLAME 0
-+#define CONFIG_LIBUAVS3D 0
-+#define CONFIG_LIBV4L2 0
-+#define CONFIG_LIBVMAF 0
-+#define CONFIG_LIBVORBIS 0
-+#define CONFIG_LIBVPX 0
-+#define CONFIG_LIBWEBP 0
-+#define CONFIG_LIBXML2 0
-+#define CONFIG_LIBZIMG 0
-+#define CONFIG_LIBZMQ 0
-+#define CONFIG_LIBZVBI 0
-+#define CONFIG_LV2 0
-+#define CONFIG_MEDIACODEC 0
-+#define CONFIG_OPENAL 0
-+#define CONFIG_OPENGL 0
-+#define CONFIG_OPENSSL 0
-+#define CONFIG_POCKETSPHINX 0
-+#define CONFIG_VAPOURSYNTH 0
-+#define CONFIG_ALSA 0
-+#define CONFIG_APPKIT 0
-+#define CONFIG_AVFOUNDATION 0
-+#define CONFIG_BZLIB 0
-+#define CONFIG_COREIMAGE 0
-+#define CONFIG_ICONV 0
-+#define CONFIG_LIBXCB 0
-+#define CONFIG_LIBXCB_SHM 0
-+#define CONFIG_LIBXCB_SHAPE 0
-+#define CONFIG_LIBXCB_XFIXES 0
-+#define CONFIG_LZMA 0
-+#define CONFIG_MEDIAFOUNDATION 0
-+#define CONFIG_METAL 0
-+#define CONFIG_SCHANNEL 0
-+#define CONFIG_SDL2 0
-+#define CONFIG_SECURETRANSPORT 0
-+#define CONFIG_SNDIO 0
-+#define CONFIG_XLIB 0
-+#define CONFIG_ZLIB 0
-+#define CONFIG_CUDA_NVCC 0
-+#define CONFIG_CUDA_SDK 0
-+#define CONFIG_LIBNPP 0
-+#define CONFIG_LIBMFX 0
-+#define CONFIG_LIBVPL 0
-+#define CONFIG_MMAL 0
-+#define CONFIG_OMX 0
-+#define CONFIG_OPENCL 0
-+#define CONFIG_AMF 0
-+#define CONFIG_AUDIOTOOLBOX 0
-+#define CONFIG_CRYSTALHD 0
-+#define CONFIG_CUDA 0
-+#define CONFIG_CUDA_LLVM 0
-+#define CONFIG_CUVID 0
-+#define CONFIG_D3D11VA 0
-+#define CONFIG_DXVA2 0
-+#define CONFIG_FFNVCODEC 0
-+#define CONFIG_NVDEC 0
-+#define CONFIG_NVENC 0
-+#define CONFIG_VAAPI 0
-+#define CONFIG_VDPAU 0
-+#define CONFIG_VIDEOTOOLBOX 0
-+#define CONFIG_VULKAN 0
-+#define CONFIG_V4L2_M2M 0
-+#define CONFIG_FTRAPV 0
-+#define CONFIG_GRAY 0
-+#define CONFIG_HARDCODED_TABLES 0
-+#define CONFIG_OMX_RPI 0
-+#define CONFIG_RUNTIME_CPUDETECT 1
-+#define CONFIG_SAFE_BITSTREAM_READER 1
-+#define CONFIG_SHARED 0
-+#define CONFIG_SMALL 0
-+#define CONFIG_STATIC 1
-+#define CONFIG_SWSCALE_ALPHA 1
-+#define CONFIG_GPL 0
-+#define CONFIG_NONFREE 0
-+#define CONFIG_VERSION3 0
-+#define CONFIG_AVDEVICE 0
-+#define CONFIG_AVFILTER 0
-+#define CONFIG_SWSCALE 0
-+#define CONFIG_POSTPROC 0
-+#define CONFIG_AVFORMAT 1
-+#define CONFIG_AVCODEC 1
-+#define CONFIG_SWRESAMPLE 0
-+#define CONFIG_AVUTIL 1
-+#define CONFIG_FFPLAY 0
-+#define CONFIG_FFPROBE 0
-+#define CONFIG_FFMPEG 0
-+#define CONFIG_DCT 1
-+#define CONFIG_DWT 0
-+#define CONFIG_ERROR_RESILIENCE 0
-+#define CONFIG_FAAN 0
-+#define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_FFT 1
-+#define CONFIG_LSP 0
-+#define CONFIG_MDCT 0
-+#define CONFIG_PIXELUTILS 0
-+#define CONFIG_NETWORK 0
-+#define CONFIG_RDFT 1
-+#define CONFIG_AUTODETECT 0
-+#define CONFIG_FONTCONFIG 0
-+#define CONFIG_LARGE_TESTS 1
-+#define CONFIG_LINUX_PERF 0
-+#define CONFIG_MACOS_KPERF 0
-+#define CONFIG_MEMORY_POISONING 0
-+#define CONFIG_NEON_CLOBBER_TEST 0
-+#define CONFIG_OSSFUZZ 0
-+#define CONFIG_PIC 1
-+#define CONFIG_PTX_COMPRESSION 0
-+#define CONFIG_THUMB 0
-+#define CONFIG_VALGRIND_BACKTRACE 0
-+#define CONFIG_XMM_CLOBBER_TEST 0
-+#define CONFIG_BSFS 0
-+#define CONFIG_DECODERS 1
-+#define CONFIG_ENCODERS 0
-+#define CONFIG_HWACCELS 0
-+#define CONFIG_PARSERS 1
-+#define CONFIG_INDEVS 0
-+#define CONFIG_OUTDEVS 0
-+#define CONFIG_FILTERS 0
-+#define CONFIG_DEMUXERS 1
-+#define CONFIG_MUXERS 0
-+#define CONFIG_PROTOCOLS 0
-+#define CONFIG_AANDCTTABLES 0
-+#define CONFIG_AC3DSP 0
-+#define CONFIG_ADTS_HEADER 1
-+#define CONFIG_ATSC_A53 1
-+#define CONFIG_AUDIO_FRAME_QUEUE 0
-+#define CONFIG_AUDIODSP 0
-+#define CONFIG_BLOCKDSP 0
-+#define CONFIG_BSWAPDSP 0
-+#define CONFIG_CABAC 1
-+#define CONFIG_CBS 0
-+#define CONFIG_CBS_AV1 0
-+#define CONFIG_CBS_H264 0
-+#define CONFIG_CBS_H265 0
-+#define CONFIG_CBS_JPEG 0
-+#define CONFIG_CBS_MPEG2 0
-+#define CONFIG_CBS_VP9 0
-+#define CONFIG_DEFLATE_WRAPPER 0
-+#define CONFIG_DIRAC_PARSE 1
-+#define CONFIG_DNN 0
-+#define CONFIG_DOVI_RPU 0
-+#define CONFIG_DVPROFILE 0
-+#define CONFIG_EXIF 0
-+#define CONFIG_FAANDCT 0
-+#define CONFIG_FAANIDCT 0
-+#define CONFIG_FDCTDSP 0
-+#define CONFIG_FMTCONVERT 0
-+#define CONFIG_FRAME_THREAD_ENCODER 0
-+#define CONFIG_G722DSP 0
-+#define CONFIG_GOLOMB 1
-+#define CONFIG_GPLV3 0
-+#define CONFIG_H263DSP 0
-+#define CONFIG_H264CHROMA 1
-+#define CONFIG_H264DSP 1
-+#define CONFIG_H264PARSE 1
-+#define CONFIG_H264PRED 1
-+#define CONFIG_H264QPEL 1
-+#define CONFIG_HEVCPARSE 0
-+#define CONFIG_HPELDSP 1
-+#define CONFIG_HUFFMAN 0
-+#define CONFIG_HUFFYUVDSP 0
-+#define CONFIG_HUFFYUVENCDSP 0
-+#define CONFIG_IDCTDSP 0
-+#define CONFIG_IIRFILTER 0
-+#define CONFIG_INFLATE_WRAPPER 0
-+#define CONFIG_INTRAX8 0
-+#define CONFIG_ISO_MEDIA 1
-+#define CONFIG_IVIDSP 0
-+#define CONFIG_JPEGTABLES 0
-+#define CONFIG_LGPLV3 0
-+#define CONFIG_LIBX262 0
-+#define CONFIG_LLAUDDSP 0
-+#define CONFIG_LLVIDDSP 0
-+#define CONFIG_LLVIDENCDSP 0
-+#define CONFIG_LPC 0
-+#define CONFIG_LZF 0
-+#define CONFIG_ME_CMP 0
-+#define CONFIG_MPEG_ER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
-+#define CONFIG_MPEG4AUDIO 1
-+#define CONFIG_MPEGVIDEO 0
-+#define CONFIG_MPEGVIDEODEC 0
-+#define CONFIG_MPEGVIDEOENC 0
-+#define CONFIG_MSMPEG4DEC 0
-+#define CONFIG_MSMPEG4ENC 0
-+#define CONFIG_MSS34DSP 0
-+#define CONFIG_PIXBLOCKDSP 0
-+#define CONFIG_QPELDSP 0
-+#define CONFIG_QSV 0
-+#define CONFIG_QSVDEC 0
-+#define CONFIG_QSVENC 0
-+#define CONFIG_QSVVPP 0
-+#define CONFIG_RANGECODER 0
-+#define CONFIG_RIFFDEC 1
-+#define CONFIG_RIFFENC 0
-+#define CONFIG_RTPDEC 0
-+#define CONFIG_RTPENC_CHAIN 0
-+#define CONFIG_RV34DSP 0
-+#define CONFIG_SCENE_SAD 0
-+#define CONFIG_SINEWIN 1
-+#define CONFIG_SNAPPY 0
-+#define CONFIG_SRTP 0
-+#define CONFIG_STARTCODE 1
-+#define CONFIG_TEXTUREDSP 0
-+#define CONFIG_TEXTUREDSPENC 0
-+#define CONFIG_TPELDSP 0
-+#define CONFIG_VAAPI_1 0
-+#define CONFIG_VAAPI_ENCODE 0
-+#define CONFIG_VC1DSP 0
-+#define CONFIG_VIDEODSP 1
-+#define CONFIG_VP3DSP 1
-+#define CONFIG_VP56DSP 0
-+#define CONFIG_VP8DSP 1
-+#define CONFIG_WMA_FREQS 0
-+#define CONFIG_WMV2DSP 0
-+#endif /* FFMPEG_CONFIG_H */
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
deleted file mode 100644
index 1129c55f1742..000000000000
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
+++ /dev/null
@@ -1,2128 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2023-04-28 17:01:32 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h
-@@ -0,0 +1,2125 @@
-+/* Automatically generated by configure - do not modify! */
-+#ifndef FFMPEG_CONFIG_COMPONENTS_H
-+#define FFMPEG_CONFIG_COMPONENTS_H
-+#define CONFIG_AAC_ADTSTOASC_BSF 0
-+#define CONFIG_AV1_FRAME_MERGE_BSF 0
-+#define CONFIG_AV1_FRAME_SPLIT_BSF 0
-+#define CONFIG_AV1_METADATA_BSF 0
-+#define CONFIG_CHOMP_BSF 0
-+#define CONFIG_DUMP_EXTRADATA_BSF 0
-+#define CONFIG_DCA_CORE_BSF 0
-+#define CONFIG_DTS2PTS_BSF 0
-+#define CONFIG_DV_ERROR_MARKER_BSF 0
-+#define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+#define CONFIG_FILTER_UNITS_BSF 0
-+#define CONFIG_H264_METADATA_BSF 0
-+#define CONFIG_H264_MP4TOANNEXB_BSF 0
-+#define CONFIG_H264_REDUNDANT_PPS_BSF 0
-+#define CONFIG_HAPQA_EXTRACT_BSF 0
-+#define CONFIG_HEVC_METADATA_BSF 0
-+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
-+#define CONFIG_IMX_DUMP_HEADER_BSF 0
-+#define CONFIG_MJPEG2JPEG_BSF 0
-+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+#define CONFIG_MPEG2_METADATA_BSF 0
-+#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+#define CONFIG_MOV2TEXTSUB_BSF 0
-+#define CONFIG_NOISE_BSF 0
-+#define CONFIG_NULL_BSF 0
-+#define CONFIG_OPUS_METADATA_BSF 0
-+#define CONFIG_PCM_RECHUNK_BSF 0
-+#define CONFIG_PGS_FRAME_MERGE_BSF 0
-+#define CONFIG_PRORES_METADATA_BSF 0
-+#define CONFIG_REMOVE_EXTRADATA_BSF 0
-+#define CONFIG_SETTS_BSF 0
-+#define CONFIG_TEXT2MOVSUB_BSF 0
-+#define CONFIG_TRACE_HEADERS_BSF 0
-+#define CONFIG_TRUEHD_CORE_BSF 0
-+#define CONFIG_VP9_METADATA_BSF 0
-+#define CONFIG_VP9_RAW_REORDER_BSF 0
-+#define CONFIG_VP9_SUPERFRAME_BSF 0
-+#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+#define CONFIG_AASC_DECODER 0
-+#define CONFIG_AIC_DECODER 0
-+#define CONFIG_ALIAS_PIX_DECODER 0
-+#define CONFIG_AGM_DECODER 0
-+#define CONFIG_AMV_DECODER 0
-+#define CONFIG_ANM_DECODER 0
-+#define CONFIG_ANSI_DECODER 0
-+#define CONFIG_APNG_DECODER 0
-+#define CONFIG_ARBC_DECODER 0
-+#define CONFIG_ARGO_DECODER 0
-+#define CONFIG_ASV1_DECODER 0
-+#define CONFIG_ASV2_DECODER 0
-+#define CONFIG_AURA_DECODER 0
-+#define CONFIG_AURA2_DECODER 0
-+#define CONFIG_AVRP_DECODER 0
-+#define CONFIG_AVRN_DECODER 0
-+#define CONFIG_AVS_DECODER 0
-+#define CONFIG_AVUI_DECODER 0
-+#define CONFIG_AYUV_DECODER 0
-+#define CONFIG_BETHSOFTVID_DECODER 0
-+#define CONFIG_BFI_DECODER 0
-+#define CONFIG_BINK_DECODER 0
-+#define CONFIG_BITPACKED_DECODER 0
-+#define CONFIG_BMP_DECODER 0
-+#define CONFIG_BMV_VIDEO_DECODER 0
-+#define CONFIG_BRENDER_PIX_DECODER 0
-+#define CONFIG_C93_DECODER 0
-+#define CONFIG_CAVS_DECODER 0
-+#define CONFIG_CDGRAPHICS_DECODER 0
-+#define CONFIG_CDTOONS_DECODER 0
-+#define CONFIG_CDXL_DECODER 0
-+#define CONFIG_CFHD_DECODER 0
-+#define CONFIG_CINEPAK_DECODER 0
-+#define CONFIG_CLEARVIDEO_DECODER 0
-+#define CONFIG_CLJR_DECODER 0
-+#define CONFIG_CLLC_DECODER 0
-+#define CONFIG_COMFORTNOISE_DECODER 0
-+#define CONFIG_CPIA_DECODER 0
-+#define CONFIG_CRI_DECODER 0
-+#define CONFIG_CSCD_DECODER 0
-+#define CONFIG_CYUV_DECODER 0
-+#define CONFIG_DDS_DECODER 0
-+#define CONFIG_DFA_DECODER 0
-+#define CONFIG_DIRAC_DECODER 0
-+#define CONFIG_DNXHD_DECODER 0
-+#define CONFIG_DPX_DECODER 0
-+#define CONFIG_DSICINVIDEO_DECODER 0
-+#define CONFIG_DVAUDIO_DECODER 0
-+#define CONFIG_DVVIDEO_DECODER 0
-+#define CONFIG_DXA_DECODER 0
-+#define CONFIG_DXTORY_DECODER 0
-+#define CONFIG_DXV_DECODER 0
-+#define CONFIG_EACMV_DECODER 0
-+#define CONFIG_EAMAD_DECODER 0
-+#define CONFIG_EATGQ_DECODER 0
-+#define CONFIG_EATGV_DECODER 0
-+#define CONFIG_EATQI_DECODER 0
-+#define CONFIG_EIGHTBPS_DECODER 0
-+#define CONFIG_EIGHTSVX_EXP_DECODER 0
-+#define CONFIG_EIGHTSVX_FIB_DECODER 0
-+#define CONFIG_ESCAPE124_DECODER 0
-+#define CONFIG_ESCAPE130_DECODER 0
-+#define CONFIG_EXR_DECODER 0
-+#define CONFIG_FFV1_DECODER 0
-+#define CONFIG_FFVHUFF_DECODER 0
-+#define CONFIG_FIC_DECODER 0
-+#define CONFIG_FITS_DECODER 0
-+#define CONFIG_FLASHSV_DECODER 0
-+#define CONFIG_FLASHSV2_DECODER 0
-+#define CONFIG_FLIC_DECODER 0
-+#define CONFIG_FLV_DECODER 0
-+#define CONFIG_FMVC_DECODER 0
-+#define CONFIG_FOURXM_DECODER 0
-+#define CONFIG_FRAPS_DECODER 0
-+#define CONFIG_FRWU_DECODER 0
-+#define CONFIG_G2M_DECODER 0
-+#define CONFIG_GDV_DECODER 0
-+#define CONFIG_GEM_DECODER 0
-+#define CONFIG_GIF_DECODER 0
-+#define CONFIG_H261_DECODER 0
-+#define CONFIG_H263_DECODER 0
-+#define CONFIG_H263I_DECODER 0
-+#define CONFIG_H263P_DECODER 0
-+#define CONFIG_H263_V4L2M2M_DECODER 0
-+#define CONFIG_H264_DECODER 1
-+#define CONFIG_H264_CRYSTALHD_DECODER 0
-+#define CONFIG_H264_V4L2M2M_DECODER 0
-+#define CONFIG_H264_MEDIACODEC_DECODER 0
-+#define CONFIG_H264_MMAL_DECODER 0
-+#define CONFIG_H264_QSV_DECODER 0
-+#define CONFIG_H264_RKMPP_DECODER 0
-+#define CONFIG_HAP_DECODER 0
-+#define CONFIG_HEVC_DECODER 0
-+#define CONFIG_HEVC_QSV_DECODER 0
-+#define CONFIG_HEVC_RKMPP_DECODER 0
-+#define CONFIG_HEVC_V4L2M2M_DECODER 0
-+#define CONFIG_HNM4_VIDEO_DECODER 0
-+#define CONFIG_HQ_HQA_DECODER 0
-+#define CONFIG_HQX_DECODER 0
-+#define CONFIG_HUFFYUV_DECODER 0
-+#define CONFIG_HYMT_DECODER 0
-+#define CONFIG_IDCIN_DECODER 0
-+#define CONFIG_IFF_ILBM_DECODER 0
-+#define CONFIG_IMM4_DECODER 0
-+#define CONFIG_IMM5_DECODER 0
-+#define CONFIG_INDEO2_DECODER 0
-+#define CONFIG_INDEO3_DECODER 0
-+#define CONFIG_INDEO4_DECODER 0
-+#define CONFIG_INDEO5_DECODER 0
-+#define CONFIG_INTERPLAY_VIDEO_DECODER 0
-+#define CONFIG_IPU_DECODER 0
-+#define CONFIG_JPEG2000_DECODER 0
-+#define CONFIG_JPEGLS_DECODER 0
-+#define CONFIG_JV_DECODER 0
-+#define CONFIG_KGV1_DECODER 0
-+#define CONFIG_KMVC_DECODER 0
-+#define CONFIG_LAGARITH_DECODER 0
-+#define CONFIG_LOCO_DECODER 0
-+#define CONFIG_LSCR_DECODER 0
-+#define CONFIG_M101_DECODER 0
-+#define CONFIG_MAGICYUV_DECODER 0
-+#define CONFIG_MDEC_DECODER 0
-+#define CONFIG_MEDIA100_DECODER 0
-+#define CONFIG_MIMIC_DECODER 0
-+#define CONFIG_MJPEG_DECODER 0
-+#define CONFIG_MJPEGB_DECODER 0
-+#define CONFIG_MMVIDEO_DECODER 0
-+#define CONFIG_MOBICLIP_DECODER 0
-+#define CONFIG_MOTIONPIXELS_DECODER 0
-+#define CONFIG_MPEG1VIDEO_DECODER 0
-+#define CONFIG_MPEG2VIDEO_DECODER 0
-+#define CONFIG_MPEG4_DECODER 0
-+#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+#define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG4_MMAL_DECODER 0
-+#define CONFIG_MPEGVIDEO_DECODER 0
-+#define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG2_MMAL_DECODER 0
-+#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+#define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG2_QSV_DECODER 0
-+#define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+#define CONFIG_MSA1_DECODER 0
-+#define CONFIG_MSCC_DECODER 0
-+#define CONFIG_MSMPEG4V1_DECODER 0
-+#define CONFIG_MSMPEG4V2_DECODER 0
-+#define CONFIG_MSMPEG4V3_DECODER 0
-+#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+#define CONFIG_MSP2_DECODER 0
-+#define CONFIG_MSRLE_DECODER 0
-+#define CONFIG_MSS1_DECODER 0
-+#define CONFIG_MSS2_DECODER 0
-+#define CONFIG_MSVIDEO1_DECODER 0
-+#define CONFIG_MSZH_DECODER 0
-+#define CONFIG_MTS2_DECODER 0
-+#define CONFIG_MV30_DECODER 0
-+#define CONFIG_MVC1_DECODER 0
-+#define CONFIG_MVC2_DECODER 0
-+#define CONFIG_MVDV_DECODER 0
-+#define CONFIG_MVHA_DECODER 0
-+#define CONFIG_MWSC_DECODER 0
-+#define CONFIG_MXPEG_DECODER 0
-+#define CONFIG_NOTCHLC_DECODER 0
-+#define CONFIG_NUV_DECODER 0
-+#define CONFIG_PAF_VIDEO_DECODER 0
-+#define CONFIG_PAM_DECODER 0
-+#define CONFIG_PBM_DECODER 0
-+#define CONFIG_PCX_DECODER 0
-+#define CONFIG_PFM_DECODER 0
-+#define CONFIG_PGM_DECODER 0
-+#define CONFIG_PGMYUV_DECODER 0
-+#define CONFIG_PGX_DECODER 0
-+#define CONFIG_PHM_DECODER 0
-+#define CONFIG_PHOTOCD_DECODER 0
-+#define CONFIG_PICTOR_DECODER 0
-+#define CONFIG_PIXLET_DECODER 0
-+#define CONFIG_PNG_DECODER 0
-+#define CONFIG_PPM_DECODER 0
-+#define CONFIG_PRORES_DECODER 0
-+#define CONFIG_PROSUMER_DECODER 0
-+#define CONFIG_PSD_DECODER 0
-+#define CONFIG_PTX_DECODER 0
-+#define CONFIG_QDRAW_DECODER 0
-+#define CONFIG_QOI_DECODER 0
-+#define CONFIG_QPEG_DECODER 0
-+#define CONFIG_QTRLE_DECODER 0
-+#define CONFIG_R10K_DECODER 0
-+#define CONFIG_R210_DECODER 0
-+#define CONFIG_RASC_DECODER 0
-+#define CONFIG_RAWVIDEO_DECODER 0
-+#define CONFIG_RL2_DECODER 0
-+#define CONFIG_ROQ_DECODER 0
-+#define CONFIG_RPZA_DECODER 0
-+#define CONFIG_RSCC_DECODER 0
-+#define CONFIG_RV10_DECODER 0
-+#define CONFIG_RV20_DECODER 0
-+#define CONFIG_RV30_DECODER 0
-+#define CONFIG_RV40_DECODER 0
-+#define CONFIG_S302M_DECODER 0
-+#define CONFIG_SANM_DECODER 0
-+#define CONFIG_SCPR_DECODER 0
-+#define CONFIG_SCREENPRESSO_DECODER 0
-+#define CONFIG_SGA_DECODER 0
-+#define CONFIG_SGI_DECODER 0
-+#define CONFIG_SGIRLE_DECODER 0
-+#define CONFIG_SHEERVIDEO_DECODER 0
-+#define CONFIG_SIMBIOSIS_IMX_DECODER 0
-+#define CONFIG_SMACKER_DECODER 0
-+#define CONFIG_SMC_DECODER 0
-+#define CONFIG_SMVJPEG_DECODER 0
-+#define CONFIG_SNOW_DECODER 0
-+#define CONFIG_SP5X_DECODER 0
-+#define CONFIG_SPEEDHQ_DECODER 0
-+#define CONFIG_SPEEX_DECODER 0
-+#define CONFIG_SRGC_DECODER 0
-+#define CONFIG_SUNRAST_DECODER 0
-+#define CONFIG_SVQ1_DECODER 0
-+#define CONFIG_SVQ3_DECODER 0
-+#define CONFIG_TARGA_DECODER 0
-+#define CONFIG_TARGA_Y216_DECODER 0
-+#define CONFIG_TDSC_DECODER 0
-+#define CONFIG_THEORA_DECODER 1
-+#define CONFIG_THP_DECODER 0
-+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-+#define CONFIG_TIFF_DECODER 0
-+#define CONFIG_TMV_DECODER 0
-+#define CONFIG_TRUEMOTION1_DECODER 0
-+#define CONFIG_TRUEMOTION2_DECODER 0
-+#define CONFIG_TRUEMOTION2RT_DECODER 0
-+#define CONFIG_TSCC_DECODER 0
-+#define CONFIG_TSCC2_DECODER 0
-+#define CONFIG_TXD_DECODER 0
-+#define CONFIG_ULTI_DECODER 0
-+#define CONFIG_UTVIDEO_DECODER 0
-+#define CONFIG_V210_DECODER 0
-+#define CONFIG_V210X_DECODER 0
-+#define CONFIG_V308_DECODER 0
-+#define CONFIG_V408_DECODER 0
-+#define CONFIG_V410_DECODER 0
-+#define CONFIG_VB_DECODER 0
-+#define CONFIG_VBN_DECODER 0
-+#define CONFIG_VBLE_DECODER 0
-+#define CONFIG_VC1_DECODER 0
-+#define CONFIG_VC1_CRYSTALHD_DECODER 0
-+#define CONFIG_VC1IMAGE_DECODER 0
-+#define CONFIG_VC1_MMAL_DECODER 0
-+#define CONFIG_VC1_QSV_DECODER 0
-+#define CONFIG_VC1_V4L2M2M_DECODER 0
-+#define CONFIG_VCR1_DECODER 0
-+#define CONFIG_VMDVIDEO_DECODER 0
-+#define CONFIG_VMNC_DECODER 0
-+#define CONFIG_VP3_DECODER 1
-+#define CONFIG_VP4_DECODER 0
-+#define CONFIG_VP5_DECODER 0
-+#define CONFIG_VP6_DECODER 0
-+#define CONFIG_VP6A_DECODER 0
-+#define CONFIG_VP6F_DECODER 0
-+#define CONFIG_VP7_DECODER 0
-+#define CONFIG_VP8_DECODER 1
-+#define CONFIG_VP8_RKMPP_DECODER 0
-+#define CONFIG_VP8_V4L2M2M_DECODER 0
-+#define CONFIG_VP9_DECODER 0
-+#define CONFIG_VP9_RKMPP_DECODER 0
-+#define CONFIG_VP9_V4L2M2M_DECODER 0
-+#define CONFIG_VQA_DECODER 0
-+#define CONFIG_VQC_DECODER 0
-+#define CONFIG_WBMP_DECODER 0
-+#define CONFIG_WEBP_DECODER 0
-+#define CONFIG_WCMV_DECODER 0
-+#define CONFIG_WRAPPED_AVFRAME_DECODER 0
-+#define CONFIG_WMV1_DECODER 0
-+#define CONFIG_WMV2_DECODER 0
-+#define CONFIG_WMV3_DECODER 0
-+#define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+#define CONFIG_WMV3IMAGE_DECODER 0
-+#define CONFIG_WNV1_DECODER 0
-+#define CONFIG_XAN_WC3_DECODER 0
-+#define CONFIG_XAN_WC4_DECODER 0
-+#define CONFIG_XBM_DECODER 0
-+#define CONFIG_XFACE_DECODER 0
-+#define CONFIG_XL_DECODER 0
-+#define CONFIG_XPM_DECODER 0
-+#define CONFIG_XWD_DECODER 0
-+#define CONFIG_Y41P_DECODER 0
-+#define CONFIG_YLC_DECODER 0
-+#define CONFIG_YOP_DECODER 0
-+#define CONFIG_YUV4_DECODER 0
-+#define CONFIG_ZERO12V_DECODER 0
-+#define CONFIG_ZEROCODEC_DECODER 0
-+#define CONFIG_ZLIB_DECODER 0
-+#define CONFIG_ZMBV_DECODER 0
-+#define CONFIG_AAC_DECODER 1
-+#define CONFIG_AAC_FIXED_DECODER 0
-+#define CONFIG_AAC_LATM_DECODER 0
-+#define CONFIG_AC3_DECODER 0
-+#define CONFIG_AC3_FIXED_DECODER 0
-+#define CONFIG_ACELP_KELVIN_DECODER 0
-+#define CONFIG_ALAC_DECODER 0
-+#define CONFIG_ALS_DECODER 0
-+#define CONFIG_AMRNB_DECODER 0
-+#define CONFIG_AMRWB_DECODER 0
-+#define CONFIG_APAC_DECODER 0
-+#define CONFIG_APE_DECODER 0
-+#define CONFIG_APTX_DECODER 0
-+#define CONFIG_APTX_HD_DECODER 0
-+#define CONFIG_ATRAC1_DECODER 0
-+#define CONFIG_ATRAC3_DECODER 0
-+#define CONFIG_ATRAC3AL_DECODER 0
-+#define CONFIG_ATRAC3P_DECODER 0
-+#define CONFIG_ATRAC3PAL_DECODER 0
-+#define CONFIG_ATRAC9_DECODER 0
-+#define CONFIG_BINKAUDIO_DCT_DECODER 0
-+#define CONFIG_BINKAUDIO_RDFT_DECODER 0
-+#define CONFIG_BMV_AUDIO_DECODER 0
-+#define CONFIG_BONK_DECODER 0
-+#define CONFIG_COOK_DECODER 0
-+#define CONFIG_DCA_DECODER 0
-+#define CONFIG_DFPWM_DECODER 0
-+#define CONFIG_DOLBY_E_DECODER 0
-+#define CONFIG_DSD_LSBF_DECODER 0
-+#define CONFIG_DSD_MSBF_DECODER 0
-+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
-+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
-+#define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
-+#define CONFIG_DST_DECODER 0
-+#define CONFIG_EAC3_DECODER 0
-+#define CONFIG_EVRC_DECODER 0
-+#define CONFIG_FASTAUDIO_DECODER 0
-+#define CONFIG_FFWAVESYNTH_DECODER 0
-+#define CONFIG_FLAC_DECODER 1
-+#define CONFIG_FTR_DECODER 0
-+#define CONFIG_G723_1_DECODER 0
-+#define CONFIG_G729_DECODER 0
-+#define CONFIG_GSM_DECODER 0
-+#define CONFIG_GSM_MS_DECODER 0
-+#define CONFIG_HCA_DECODER 0
-+#define CONFIG_HCOM_DECODER 0
-+#define CONFIG_HDR_DECODER 0
-+#define CONFIG_IAC_DECODER 0
-+#define CONFIG_ILBC_DECODER 0
-+#define CONFIG_IMC_DECODER 0
-+#define CONFIG_INTERPLAY_ACM_DECODER 0
-+#define CONFIG_MACE3_DECODER 0
-+#define CONFIG_MACE6_DECODER 0
-+#define CONFIG_METASOUND_DECODER 0
-+#define CONFIG_MISC4_DECODER 0
-+#define CONFIG_MLP_DECODER 0
-+#define CONFIG_MP1_DECODER 0
-+#define CONFIG_MP1FLOAT_DECODER 0
-+#define CONFIG_MP2_DECODER 0
-+#define CONFIG_MP2FLOAT_DECODER 0
-+#define CONFIG_MP3FLOAT_DECODER 0
-+#define CONFIG_MP3_DECODER 1
-+#define CONFIG_MP3ADUFLOAT_DECODER 0
-+#define CONFIG_MP3ADU_DECODER 0
-+#define CONFIG_MP3ON4FLOAT_DECODER 0
-+#define CONFIG_MP3ON4_DECODER 0
-+#define CONFIG_MPC7_DECODER 0
-+#define CONFIG_MPC8_DECODER 0
-+#define CONFIG_MSNSIREN_DECODER 0
-+#define CONFIG_NELLYMOSER_DECODER 0
-+#define CONFIG_ON2AVC_DECODER 0
-+#define CONFIG_OPUS_DECODER 0
-+#define CONFIG_PAF_AUDIO_DECODER 0
-+#define CONFIG_QCELP_DECODER 0
-+#define CONFIG_QDM2_DECODER 0
-+#define CONFIG_QDMC_DECODER 0
-+#define CONFIG_RA_144_DECODER 0
-+#define CONFIG_RA_288_DECODER 0
-+#define CONFIG_RALF_DECODER 0
-+#define CONFIG_SBC_DECODER 0
-+#define CONFIG_SHORTEN_DECODER 0
-+#define CONFIG_SIPR_DECODER 0
-+#define CONFIG_SIREN_DECODER 0
-+#define CONFIG_SMACKAUD_DECODER 0
-+#define CONFIG_SONIC_DECODER 0
-+#define CONFIG_TAK_DECODER 0
-+#define CONFIG_TRUEHD_DECODER 0
-+#define CONFIG_TRUESPEECH_DECODER 0
-+#define CONFIG_TTA_DECODER 0
-+#define CONFIG_TWINVQ_DECODER 0
-+#define CONFIG_VMDAUDIO_DECODER 0
-+#define CONFIG_VORBIS_DECODER 1
-+#define CONFIG_WAVPACK_DECODER 0
-+#define CONFIG_WMALOSSLESS_DECODER 0
-+#define CONFIG_WMAPRO_DECODER 0
-+#define CONFIG_WMAV1_DECODER 0
-+#define CONFIG_WMAV2_DECODER 0
-+#define CONFIG_WMAVOICE_DECODER 0
-+#define CONFIG_WS_SND1_DECODER 0
-+#define CONFIG_XMA1_DECODER 0
-+#define CONFIG_XMA2_DECODER 0
-+#define CONFIG_PCM_ALAW_DECODER 1
-+#define CONFIG_PCM_BLURAY_DECODER 0
-+#define CONFIG_PCM_DVD_DECODER 0
-+#define CONFIG_PCM_F16LE_DECODER 0
-+#define CONFIG_PCM_F24LE_DECODER 0
-+#define CONFIG_PCM_F32BE_DECODER 0
-+#define CONFIG_PCM_F32LE_DECODER 1
-+#define CONFIG_PCM_F64BE_DECODER 0
-+#define CONFIG_PCM_F64LE_DECODER 0
-+#define CONFIG_PCM_LXF_DECODER 0
-+#define CONFIG_PCM_MULAW_DECODER 1
-+#define CONFIG_PCM_S8_DECODER 0
-+#define CONFIG_PCM_S8_PLANAR_DECODER 0
-+#define CONFIG_PCM_S16BE_DECODER 1
-+#define CONFIG_PCM_S16BE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S16LE_DECODER 1
-+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S24BE_DECODER 1
-+#define CONFIG_PCM_S24DAUD_DECODER 0
-+#define CONFIG_PCM_S24LE_DECODER 1
-+#define CONFIG_PCM_S24LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S32BE_DECODER 0
-+#define CONFIG_PCM_S32LE_DECODER 1
-+#define CONFIG_PCM_S32LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S64BE_DECODER 0
-+#define CONFIG_PCM_S64LE_DECODER 0
-+#define CONFIG_PCM_SGA_DECODER 0
-+#define CONFIG_PCM_U8_DECODER 1
-+#define CONFIG_PCM_U16BE_DECODER 0
-+#define CONFIG_PCM_U16LE_DECODER 0
-+#define CONFIG_PCM_U24BE_DECODER 0
-+#define CONFIG_PCM_U24LE_DECODER 0
-+#define CONFIG_PCM_U32BE_DECODER 0
-+#define CONFIG_PCM_U32LE_DECODER 0
-+#define CONFIG_PCM_VIDC_DECODER 0
-+#define CONFIG_DERF_DPCM_DECODER 0
-+#define CONFIG_GREMLIN_DPCM_DECODER 0
-+#define CONFIG_INTERPLAY_DPCM_DECODER 0
-+#define CONFIG_ROQ_DPCM_DECODER 0
-+#define CONFIG_SDX2_DPCM_DECODER 0
-+#define CONFIG_SOL_DPCM_DECODER 0
-+#define CONFIG_XAN_DPCM_DECODER 0
-+#define CONFIG_ADPCM_4XM_DECODER 0
-+#define CONFIG_ADPCM_ADX_DECODER 0
-+#define CONFIG_ADPCM_AFC_DECODER 0
-+#define CONFIG_ADPCM_AGM_DECODER 0
-+#define CONFIG_ADPCM_AICA_DECODER 0
-+#define CONFIG_ADPCM_ARGO_DECODER 0
-+#define CONFIG_ADPCM_CT_DECODER 0
-+#define CONFIG_ADPCM_DTK_DECODER 0
-+#define CONFIG_ADPCM_EA_DECODER 0
-+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
-+#define CONFIG_ADPCM_EA_R1_DECODER 0
-+#define CONFIG_ADPCM_EA_R2_DECODER 0
-+#define CONFIG_ADPCM_EA_R3_DECODER 0
-+#define CONFIG_ADPCM_EA_XAS_DECODER 0
-+#define CONFIG_ADPCM_G722_DECODER 0
-+#define CONFIG_ADPCM_G726_DECODER 0
-+#define CONFIG_ADPCM_G726LE_DECODER 0
-+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
-+#define CONFIG_ADPCM_IMA_AMV_DECODER 0
-+#define CONFIG_ADPCM_IMA_ALP_DECODER 0
-+#define CONFIG_ADPCM_IMA_APC_DECODER 0
-+#define CONFIG_ADPCM_IMA_APM_DECODER 0
-+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
-+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK3_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK4_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_ISS_DECODER 0
-+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
-+#define CONFIG_ADPCM_IMA_MTF_DECODER 0
-+#define CONFIG_ADPCM_IMA_OKI_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_DECODER 0
-+#define CONFIG_ADPCM_IMA_RAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_SSI_DECODER 0
-+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
-+#define CONFIG_ADPCM_IMA_WAV_DECODER 0
-+#define CONFIG_ADPCM_IMA_WS_DECODER 0
-+#define CONFIG_ADPCM_MS_DECODER 0
-+#define CONFIG_ADPCM_MTAF_DECODER 0
-+#define CONFIG_ADPCM_PSX_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_2_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_3_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_4_DECODER 0
-+#define CONFIG_ADPCM_SWF_DECODER 0
-+#define CONFIG_ADPCM_THP_DECODER 0
-+#define CONFIG_ADPCM_THP_LE_DECODER 0
-+#define CONFIG_ADPCM_VIMA_DECODER 0
-+#define CONFIG_ADPCM_XA_DECODER 0
-+#define CONFIG_ADPCM_YAMAHA_DECODER 0
-+#define CONFIG_ADPCM_ZORK_DECODER 0
-+#define CONFIG_SSA_DECODER 0
-+#define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
-+#define CONFIG_DVBSUB_DECODER 0
-+#define CONFIG_DVDSUB_DECODER 0
-+#define CONFIG_JACOSUB_DECODER 0
-+#define CONFIG_MICRODVD_DECODER 0
-+#define CONFIG_MOVTEXT_DECODER 0
-+#define CONFIG_MPL2_DECODER 0
-+#define CONFIG_PGSSUB_DECODER 0
-+#define CONFIG_PJS_DECODER 0
-+#define CONFIG_REALTEXT_DECODER 0
-+#define CONFIG_SAMI_DECODER 0
-+#define CONFIG_SRT_DECODER 0
-+#define CONFIG_STL_DECODER 0
-+#define CONFIG_SUBRIP_DECODER 0
-+#define CONFIG_SUBVIEWER_DECODER 0
-+#define CONFIG_SUBVIEWER1_DECODER 0
-+#define CONFIG_TEXT_DECODER 0
-+#define CONFIG_VPLAYER_DECODER 0
-+#define CONFIG_WEBVTT_DECODER 0
-+#define CONFIG_XSUB_DECODER 0
-+#define CONFIG_AAC_AT_DECODER 0
-+#define CONFIG_AC3_AT_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
-+#define CONFIG_ALAC_AT_DECODER 0
-+#define CONFIG_AMR_NB_AT_DECODER 0
-+#define CONFIG_EAC3_AT_DECODER 0
-+#define CONFIG_GSM_MS_AT_DECODER 0
-+#define CONFIG_ILBC_AT_DECODER 0
-+#define CONFIG_MP1_AT_DECODER 0
-+#define CONFIG_MP2_AT_DECODER 0
-+#define CONFIG_MP3_AT_DECODER 0
-+#define CONFIG_PCM_ALAW_AT_DECODER 0
-+#define CONFIG_PCM_MULAW_AT_DECODER 0
-+#define CONFIG_QDMC_AT_DECODER 0
-+#define CONFIG_QDM2_AT_DECODER 0
-+#define CONFIG_LIBARIBB24_DECODER 0
-+#define CONFIG_LIBCELT_DECODER 0
-+#define CONFIG_LIBCODEC2_DECODER 0
-+#define CONFIG_LIBDAV1D_DECODER 0
-+#define CONFIG_LIBDAVS2_DECODER 0
-+#define CONFIG_LIBFDK_AAC_DECODER 0
-+#define CONFIG_LIBGSM_DECODER 0
-+#define CONFIG_LIBGSM_MS_DECODER 0
-+#define CONFIG_LIBILBC_DECODER 0
-+#define CONFIG_LIBJXL_DECODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+#define CONFIG_LIBOPENJPEG_DECODER 0
-+#define CONFIG_LIBOPUS_DECODER 1
-+#define CONFIG_LIBRSVG_DECODER 0
-+#define CONFIG_LIBSPEEX_DECODER 0
-+#define CONFIG_LIBUAVS3D_DECODER 0
-+#define CONFIG_LIBVORBIS_DECODER 0
-+#define CONFIG_LIBVPX_VP8_DECODER 0
-+#define CONFIG_LIBVPX_VP9_DECODER 0
-+#define CONFIG_LIBZVBI_TELETEXT_DECODER 0
-+#define CONFIG_BINTEXT_DECODER 0
-+#define CONFIG_XBIN_DECODER 0
-+#define CONFIG_IDF_DECODER 0
-+#define CONFIG_LIBAOM_AV1_DECODER 0
-+#define CONFIG_AV1_DECODER 0
-+#define CONFIG_AV1_CUVID_DECODER 0
-+#define CONFIG_AV1_QSV_DECODER 0
-+#define CONFIG_LIBOPENH264_DECODER 0
-+#define CONFIG_H264_CUVID_DECODER 0
-+#define CONFIG_HEVC_CUVID_DECODER 0
-+#define CONFIG_HEVC_MEDIACODEC_DECODER 0
-+#define CONFIG_MJPEG_CUVID_DECODER 0
-+#define CONFIG_MJPEG_QSV_DECODER 0
-+#define CONFIG_MPEG1_CUVID_DECODER 0
-+#define CONFIG_MPEG2_CUVID_DECODER 0
-+#define CONFIG_MPEG4_CUVID_DECODER 0
-+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-+#define CONFIG_VC1_CUVID_DECODER 0
-+#define CONFIG_VP8_CUVID_DECODER 0
-+#define CONFIG_VP8_MEDIACODEC_DECODER 0
-+#define CONFIG_VP8_QSV_DECODER 0
-+#define CONFIG_VP9_CUVID_DECODER 0
-+#define CONFIG_VP9_MEDIACODEC_DECODER 0
-+#define CONFIG_VP9_QSV_DECODER 0
-+#define CONFIG_A64MULTI_ENCODER 0
-+#define CONFIG_A64MULTI5_ENCODER 0
-+#define CONFIG_ALIAS_PIX_ENCODER 0
-+#define CONFIG_AMV_ENCODER 0
-+#define CONFIG_APNG_ENCODER 0
-+#define CONFIG_ASV1_ENCODER 0
-+#define CONFIG_ASV2_ENCODER 0
-+#define CONFIG_AVRP_ENCODER 0
-+#define CONFIG_AVUI_ENCODER 0
-+#define CONFIG_AYUV_ENCODER 0
-+#define CONFIG_BITPACKED_ENCODER 0
-+#define CONFIG_BMP_ENCODER 0
-+#define CONFIG_CFHD_ENCODER 0
-+#define CONFIG_CINEPAK_ENCODER 0
-+#define CONFIG_CLJR_ENCODER 0
-+#define CONFIG_COMFORTNOISE_ENCODER 0
-+#define CONFIG_DNXHD_ENCODER 0
-+#define CONFIG_DPX_ENCODER 0
-+#define CONFIG_DVVIDEO_ENCODER 0
-+#define CONFIG_EXR_ENCODER 0
-+#define CONFIG_FFV1_ENCODER 0
-+#define CONFIG_FFVHUFF_ENCODER 0
-+#define CONFIG_FITS_ENCODER 0
-+#define CONFIG_FLASHSV_ENCODER 0
-+#define CONFIG_FLASHSV2_ENCODER 0
-+#define CONFIG_FLV_ENCODER 0
-+#define CONFIG_GIF_ENCODER 0
-+#define CONFIG_H261_ENCODER 0
-+#define CONFIG_H263_ENCODER 0
-+#define CONFIG_H263P_ENCODER 0
-+#define CONFIG_H264_MEDIACODEC_ENCODER 0
-+#define CONFIG_HAP_ENCODER 0
-+#define CONFIG_HUFFYUV_ENCODER 0
-+#define CONFIG_JPEG2000_ENCODER 0
-+#define CONFIG_JPEGLS_ENCODER 0
-+#define CONFIG_LJPEG_ENCODER 0
-+#define CONFIG_MAGICYUV_ENCODER 0
-+#define CONFIG_MJPEG_ENCODER 0
-+#define CONFIG_MPEG1VIDEO_ENCODER 0
-+#define CONFIG_MPEG2VIDEO_ENCODER 0
-+#define CONFIG_MPEG4_ENCODER 0
-+#define CONFIG_MSMPEG4V2_ENCODER 0
-+#define CONFIG_MSMPEG4V3_ENCODER 0
-+#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_PAM_ENCODER 0
-+#define CONFIG_PBM_ENCODER 0
-+#define CONFIG_PCX_ENCODER 0
-+#define CONFIG_PFM_ENCODER 0
-+#define CONFIG_PGM_ENCODER 0
-+#define CONFIG_PGMYUV_ENCODER 0
-+#define CONFIG_PHM_ENCODER 0
-+#define CONFIG_PNG_ENCODER 0
-+#define CONFIG_PPM_ENCODER 0
-+#define CONFIG_PRORES_ENCODER 0
-+#define CONFIG_PRORES_AW_ENCODER 0
-+#define CONFIG_PRORES_KS_ENCODER 0
-+#define CONFIG_QOI_ENCODER 0
-+#define CONFIG_QTRLE_ENCODER 0
-+#define CONFIG_R10K_ENCODER 0
-+#define CONFIG_R210_ENCODER 0
-+#define CONFIG_RAWVIDEO_ENCODER 0
-+#define CONFIG_ROQ_ENCODER 0
-+#define CONFIG_RPZA_ENCODER 0
-+#define CONFIG_RV10_ENCODER 0
-+#define CONFIG_RV20_ENCODER 0
-+#define CONFIG_S302M_ENCODER 0
-+#define CONFIG_SGI_ENCODER 0
-+#define CONFIG_SMC_ENCODER 0
-+#define CONFIG_SNOW_ENCODER 0
-+#define CONFIG_SPEEDHQ_ENCODER 0
-+#define CONFIG_SUNRAST_ENCODER 0
-+#define CONFIG_SVQ1_ENCODER 0
-+#define CONFIG_TARGA_ENCODER 0
-+#define CONFIG_TIFF_ENCODER 0
-+#define CONFIG_UTVIDEO_ENCODER 0
-+#define CONFIG_V210_ENCODER 0
-+#define CONFIG_V308_ENCODER 0
-+#define CONFIG_V408_ENCODER 0
-+#define CONFIG_V410_ENCODER 0
-+#define CONFIG_VBN_ENCODER 0
-+#define CONFIG_VC2_ENCODER 0
-+#define CONFIG_WBMP_ENCODER 0
-+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
-+#define CONFIG_WMV1_ENCODER 0
-+#define CONFIG_WMV2_ENCODER 0
-+#define CONFIG_XBM_ENCODER 0
-+#define CONFIG_XFACE_ENCODER 0
-+#define CONFIG_XWD_ENCODER 0
-+#define CONFIG_Y41P_ENCODER 0
-+#define CONFIG_YUV4_ENCODER 0
-+#define CONFIG_ZLIB_ENCODER 0
-+#define CONFIG_ZMBV_ENCODER 0
-+#define CONFIG_AAC_ENCODER 0
-+#define CONFIG_AC3_ENCODER 0
-+#define CONFIG_AC3_FIXED_ENCODER 0
-+#define CONFIG_ALAC_ENCODER 0
-+#define CONFIG_APTX_ENCODER 0
-+#define CONFIG_APTX_HD_ENCODER 0
-+#define CONFIG_DCA_ENCODER 0
-+#define CONFIG_DFPWM_ENCODER 0
-+#define CONFIG_EAC3_ENCODER 0
-+#define CONFIG_FLAC_ENCODER 0
-+#define CONFIG_G723_1_ENCODER 0
-+#define CONFIG_HDR_ENCODER 0
-+#define CONFIG_MLP_ENCODER 0
-+#define CONFIG_MP2_ENCODER 0
-+#define CONFIG_MP2FIXED_ENCODER 0
-+#define CONFIG_NELLYMOSER_ENCODER 0
-+#define CONFIG_OPUS_ENCODER 0
-+#define CONFIG_RA_144_ENCODER 0
-+#define CONFIG_SBC_ENCODER 0
-+#define CONFIG_SONIC_ENCODER 0
-+#define CONFIG_SONIC_LS_ENCODER 0
-+#define CONFIG_TRUEHD_ENCODER 0
-+#define CONFIG_TTA_ENCODER 0
-+#define CONFIG_VORBIS_ENCODER 0
-+#define CONFIG_WAVPACK_ENCODER 0
-+#define CONFIG_WMAV1_ENCODER 0
-+#define CONFIG_WMAV2_ENCODER 0
-+#define CONFIG_PCM_ALAW_ENCODER 0
-+#define CONFIG_PCM_BLURAY_ENCODER 0
-+#define CONFIG_PCM_DVD_ENCODER 0
-+#define CONFIG_PCM_F32BE_ENCODER 0
-+#define CONFIG_PCM_F32LE_ENCODER 0
-+#define CONFIG_PCM_F64BE_ENCODER 0
-+#define CONFIG_PCM_F64LE_ENCODER 0
-+#define CONFIG_PCM_MULAW_ENCODER 0
-+#define CONFIG_PCM_S8_ENCODER 0
-+#define CONFIG_PCM_S8_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16BE_ENCODER 0
-+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16LE_ENCODER 0
-+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S24BE_ENCODER 0
-+#define CONFIG_PCM_S24DAUD_ENCODER 0
-+#define CONFIG_PCM_S24LE_ENCODER 0
-+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S32BE_ENCODER 0
-+#define CONFIG_PCM_S32LE_ENCODER 0
-+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S64BE_ENCODER 0
-+#define CONFIG_PCM_S64LE_ENCODER 0
-+#define CONFIG_PCM_U8_ENCODER 0
-+#define CONFIG_PCM_U16BE_ENCODER 0
-+#define CONFIG_PCM_U16LE_ENCODER 0
-+#define CONFIG_PCM_U24BE_ENCODER 0
-+#define CONFIG_PCM_U24LE_ENCODER 0
-+#define CONFIG_PCM_U32BE_ENCODER 0
-+#define CONFIG_PCM_U32LE_ENCODER 0
-+#define CONFIG_PCM_VIDC_ENCODER 0
-+#define CONFIG_ROQ_DPCM_ENCODER 0
-+#define CONFIG_ADPCM_ADX_ENCODER 0
-+#define CONFIG_ADPCM_ARGO_ENCODER 0
-+#define CONFIG_ADPCM_G722_ENCODER 0
-+#define CONFIG_ADPCM_G726_ENCODER 0
-+#define CONFIG_ADPCM_G726LE_ENCODER 0
-+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
-+#define CONFIG_ADPCM_IMA_APM_ENCODER 0
-+#define CONFIG_ADPCM_IMA_QT_ENCODER 0
-+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WS_ENCODER 0
-+#define CONFIG_ADPCM_MS_ENCODER 0
-+#define CONFIG_ADPCM_SWF_ENCODER 0
-+#define CONFIG_ADPCM_YAMAHA_ENCODER 0
-+#define CONFIG_SSA_ENCODER 0
-+#define CONFIG_ASS_ENCODER 0
-+#define CONFIG_DVBSUB_ENCODER 0
-+#define CONFIG_DVDSUB_ENCODER 0
-+#define CONFIG_MOVTEXT_ENCODER 0
-+#define CONFIG_SRT_ENCODER 0
-+#define CONFIG_SUBRIP_ENCODER 0
-+#define CONFIG_TEXT_ENCODER 0
-+#define CONFIG_TTML_ENCODER 0
-+#define CONFIG_WEBVTT_ENCODER 0
-+#define CONFIG_XSUB_ENCODER 0
-+#define CONFIG_AAC_AT_ENCODER 0
-+#define CONFIG_ALAC_AT_ENCODER 0
-+#define CONFIG_ILBC_AT_ENCODER 0
-+#define CONFIG_PCM_ALAW_AT_ENCODER 0
-+#define CONFIG_PCM_MULAW_AT_ENCODER 0
-+#define CONFIG_LIBAOM_AV1_ENCODER 0
-+#define CONFIG_LIBCODEC2_ENCODER 0
-+#define CONFIG_LIBFDK_AAC_ENCODER 0
-+#define CONFIG_LIBGSM_ENCODER 0
-+#define CONFIG_LIBGSM_MS_ENCODER 0
-+#define CONFIG_LIBILBC_ENCODER 0
-+#define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBMP3LAME_ENCODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+#define CONFIG_LIBOPENJPEG_ENCODER 0
-+#define CONFIG_LIBOPUS_ENCODER 0
-+#define CONFIG_LIBRAV1E_ENCODER 0
-+#define CONFIG_LIBSHINE_ENCODER 0
-+#define CONFIG_LIBSPEEX_ENCODER 0
-+#define CONFIG_LIBSVTAV1_ENCODER 0
-+#define CONFIG_LIBTHEORA_ENCODER 0
-+#define CONFIG_LIBTWOLAME_ENCODER 0
-+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-+#define CONFIG_LIBVORBIS_ENCODER 0
-+#define CONFIG_LIBVPX_VP8_ENCODER 0
-+#define CONFIG_LIBVPX_VP9_ENCODER 0
-+#define CONFIG_LIBWEBP_ANIM_ENCODER 0
-+#define CONFIG_LIBWEBP_ENCODER 0
-+#define CONFIG_LIBX262_ENCODER 0
-+#define CONFIG_LIBX264_ENCODER 0
-+#define CONFIG_LIBX264RGB_ENCODER 0
-+#define CONFIG_LIBX265_ENCODER 0
-+#define CONFIG_LIBXAVS_ENCODER 0
-+#define CONFIG_LIBXAVS2_ENCODER 0
-+#define CONFIG_LIBXVID_ENCODER 0
-+#define CONFIG_AAC_MF_ENCODER 0
-+#define CONFIG_AC3_MF_ENCODER 0
-+#define CONFIG_H263_V4L2M2M_ENCODER 0
-+#define CONFIG_AV1_NVENC_ENCODER 0
-+#define CONFIG_AV1_QSV_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
-+#define CONFIG_H264_AMF_ENCODER 0
-+#define CONFIG_H264_MF_ENCODER 0
-+#define CONFIG_H264_NVENC_ENCODER 0
-+#define CONFIG_H264_OMX_ENCODER 0
-+#define CONFIG_H264_QSV_ENCODER 0
-+#define CONFIG_H264_V4L2M2M_ENCODER 0
-+#define CONFIG_H264_VAAPI_ENCODER 0
-+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_HEVC_AMF_ENCODER 0
-+#define CONFIG_HEVC_MEDIACODEC_ENCODER 0
-+#define CONFIG_HEVC_MF_ENCODER 0
-+#define CONFIG_HEVC_NVENC_ENCODER 0
-+#define CONFIG_HEVC_QSV_ENCODER 0
-+#define CONFIG_HEVC_V4L2M2M_ENCODER 0
-+#define CONFIG_HEVC_VAAPI_ENCODER 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_LIBKVAZAAR_ENCODER 0
-+#define CONFIG_MJPEG_QSV_ENCODER 0
-+#define CONFIG_MJPEG_VAAPI_ENCODER 0
-+#define CONFIG_MP3_MF_ENCODER 0
-+#define CONFIG_MPEG2_QSV_ENCODER 0
-+#define CONFIG_MPEG2_VAAPI_ENCODER 0
-+#define CONFIG_MPEG4_OMX_ENCODER 0
-+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
-+#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_VP8_V4L2M2M_ENCODER 0
-+#define CONFIG_VP8_VAAPI_ENCODER 0
-+#define CONFIG_VP9_VAAPI_ENCODER 0
-+#define CONFIG_VP9_QSV_ENCODER 0
-+#define CONFIG_AV1_D3D11VA_HWACCEL 0
-+#define CONFIG_AV1_D3D11VA2_HWACCEL 0
-+#define CONFIG_AV1_DXVA2_HWACCEL 0
-+#define CONFIG_AV1_NVDEC_HWACCEL 0
-+#define CONFIG_AV1_VAAPI_HWACCEL 0
-+#define CONFIG_AV1_VDPAU_HWACCEL 0
-+#define CONFIG_H263_VAAPI_HWACCEL 0
-+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_H264_D3D11VA_HWACCEL 0
-+#define CONFIG_H264_D3D11VA2_HWACCEL 0
-+#define CONFIG_H264_DXVA2_HWACCEL 0
-+#define CONFIG_H264_NVDEC_HWACCEL 0
-+#define CONFIG_H264_VAAPI_HWACCEL 0
-+#define CONFIG_H264_VDPAU_HWACCEL 0
-+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_HEVC_D3D11VA_HWACCEL 0
-+#define CONFIG_HEVC_D3D11VA2_HWACCEL 0
-+#define CONFIG_HEVC_DXVA2_HWACCEL 0
-+#define CONFIG_HEVC_NVDEC_HWACCEL 0
-+#define CONFIG_HEVC_VAAPI_HWACCEL 0
-+#define CONFIG_HEVC_VDPAU_HWACCEL 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MJPEG_NVDEC_HWACCEL 0
-+#define CONFIG_MJPEG_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG1_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG1_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MPEG2_D3D11VA_HWACCEL 0
-+#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
-+#define CONFIG_MPEG2_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG2_DXVA2_HWACCEL 0
-+#define CONFIG_MPEG2_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG2_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MPEG4_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG4_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG4_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_VC1_D3D11VA_HWACCEL 0
-+#define CONFIG_VC1_D3D11VA2_HWACCEL 0
-+#define CONFIG_VC1_DXVA2_HWACCEL 0
-+#define CONFIG_VC1_NVDEC_HWACCEL 0
-+#define CONFIG_VC1_VAAPI_HWACCEL 0
-+#define CONFIG_VC1_VDPAU_HWACCEL 0
-+#define CONFIG_VP8_NVDEC_HWACCEL 0
-+#define CONFIG_VP8_VAAPI_HWACCEL 0
-+#define CONFIG_VP9_D3D11VA_HWACCEL 0
-+#define CONFIG_VP9_D3D11VA2_HWACCEL 0
-+#define CONFIG_VP9_DXVA2_HWACCEL 0
-+#define CONFIG_VP9_NVDEC_HWACCEL 0
-+#define CONFIG_VP9_VAAPI_HWACCEL 0
-+#define CONFIG_VP9_VDPAU_HWACCEL 0
-+#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_WMV3_D3D11VA_HWACCEL 0
-+#define CONFIG_WMV3_D3D11VA2_HWACCEL 0
-+#define CONFIG_WMV3_DXVA2_HWACCEL 0
-+#define CONFIG_WMV3_NVDEC_HWACCEL 0
-+#define CONFIG_WMV3_VAAPI_HWACCEL 0
-+#define CONFIG_WMV3_VDPAU_HWACCEL 0
-+#define CONFIG_AAC_PARSER 1
-+#define CONFIG_AAC_LATM_PARSER 0
-+#define CONFIG_AC3_PARSER 0
-+#define CONFIG_ADX_PARSER 0
-+#define CONFIG_AMR_PARSER 0
-+#define CONFIG_AV1_PARSER 0
-+#define CONFIG_AVS2_PARSER 0
-+#define CONFIG_AVS3_PARSER 0
-+#define CONFIG_BMP_PARSER 0
-+#define CONFIG_CAVSVIDEO_PARSER 0
-+#define CONFIG_COOK_PARSER 0
-+#define CONFIG_CRI_PARSER 0
-+#define CONFIG_DCA_PARSER 0
-+#define CONFIG_DIRAC_PARSER 0
-+#define CONFIG_DNXHD_PARSER 0
-+#define CONFIG_DOLBY_E_PARSER 0
-+#define CONFIG_DPX_PARSER 0
-+#define CONFIG_DVAUDIO_PARSER 0
-+#define CONFIG_DVBSUB_PARSER 0
-+#define CONFIG_DVDSUB_PARSER 0
-+#define CONFIG_DVD_NAV_PARSER 0
-+#define CONFIG_FLAC_PARSER 1
-+#define CONFIG_FTR_PARSER 0
-+#define CONFIG_G723_1_PARSER 0
-+#define CONFIG_G729_PARSER 0
-+#define CONFIG_GIF_PARSER 0
-+#define CONFIG_GSM_PARSER 0
-+#define CONFIG_H261_PARSER 0
-+#define CONFIG_H263_PARSER 0
-+#define CONFIG_H264_PARSER 1
-+#define CONFIG_HEVC_PARSER 0
-+#define CONFIG_HDR_PARSER 0
-+#define CONFIG_IPU_PARSER 0
-+#define CONFIG_JPEG2000_PARSER 0
-+#define CONFIG_MISC4_PARSER 0
-+#define CONFIG_MJPEG_PARSER 0
-+#define CONFIG_MLP_PARSER 0
-+#define CONFIG_MPEG4VIDEO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
-+#define CONFIG_MPEGVIDEO_PARSER 0
-+#define CONFIG_OPUS_PARSER 1
-+#define CONFIG_PNG_PARSER 0
-+#define CONFIG_PNM_PARSER 0
-+#define CONFIG_QOI_PARSER 0
-+#define CONFIG_RV30_PARSER 0
-+#define CONFIG_RV40_PARSER 0
-+#define CONFIG_SBC_PARSER 0
-+#define CONFIG_SIPR_PARSER 0
-+#define CONFIG_TAK_PARSER 0
-+#define CONFIG_VC1_PARSER 0
-+#define CONFIG_VORBIS_PARSER 1
-+#define CONFIG_VP3_PARSER 1
-+#define CONFIG_VP8_PARSER 1
-+#define CONFIG_VP9_PARSER 1
-+#define CONFIG_WEBP_PARSER 0
-+#define CONFIG_XBM_PARSER 0
-+#define CONFIG_XMA_PARSER 0
-+#define CONFIG_XWD_PARSER 0
-+#define CONFIG_ALSA_INDEV 0
-+#define CONFIG_ANDROID_CAMERA_INDEV 0
-+#define CONFIG_AVFOUNDATION_INDEV 0
-+#define CONFIG_BKTR_INDEV 0
-+#define CONFIG_DECKLINK_INDEV 0
-+#define CONFIG_DSHOW_INDEV 0
-+#define CONFIG_FBDEV_INDEV 0
-+#define CONFIG_GDIGRAB_INDEV 0
-+#define CONFIG_IEC61883_INDEV 0
-+#define CONFIG_JACK_INDEV 0
-+#define CONFIG_KMSGRAB_INDEV 0
-+#define CONFIG_LAVFI_INDEV 0
-+#define CONFIG_OPENAL_INDEV 0
-+#define CONFIG_OSS_INDEV 0
-+#define CONFIG_PULSE_INDEV 0
-+#define CONFIG_SNDIO_INDEV 0
-+#define CONFIG_V4L2_INDEV 0
-+#define CONFIG_VFWCAP_INDEV 0
-+#define CONFIG_XCBGRAB_INDEV 0
-+#define CONFIG_LIBCDIO_INDEV 0
-+#define CONFIG_LIBDC1394_INDEV 0
-+#define CONFIG_ALSA_OUTDEV 0
-+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
-+#define CONFIG_CACA_OUTDEV 0
-+#define CONFIG_DECKLINK_OUTDEV 0
-+#define CONFIG_FBDEV_OUTDEV 0
-+#define CONFIG_OPENGL_OUTDEV 0
-+#define CONFIG_OSS_OUTDEV 0
-+#define CONFIG_PULSE_OUTDEV 0
-+#define CONFIG_SDL2_OUTDEV 0
-+#define CONFIG_SNDIO_OUTDEV 0
-+#define CONFIG_V4L2_OUTDEV 0
-+#define CONFIG_XV_OUTDEV 0
-+#define CONFIG_ABENCH_FILTER 0
-+#define CONFIG_ACOMPRESSOR_FILTER 0
-+#define CONFIG_ACONTRAST_FILTER 0
-+#define CONFIG_ACOPY_FILTER 0
-+#define CONFIG_ACUE_FILTER 0
-+#define CONFIG_ACROSSFADE_FILTER 0
-+#define CONFIG_ACROSSOVER_FILTER 0
-+#define CONFIG_ACRUSHER_FILTER 0
-+#define CONFIG_ADECLICK_FILTER 0
-+#define CONFIG_ADECLIP_FILTER 0
-+#define CONFIG_ADECORRELATE_FILTER 0
-+#define CONFIG_ADELAY_FILTER 0
-+#define CONFIG_ADENORM_FILTER 0
-+#define CONFIG_ADERIVATIVE_FILTER 0
-+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
-+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
-+#define CONFIG_AECHO_FILTER 0
-+#define CONFIG_AEMPHASIS_FILTER 0
-+#define CONFIG_AEVAL_FILTER 0
-+#define CONFIG_AEXCITER_FILTER 0
-+#define CONFIG_AFADE_FILTER 0
-+#define CONFIG_AFFTDN_FILTER 0
-+#define CONFIG_AFFTFILT_FILTER 0
-+#define CONFIG_AFIR_FILTER 0
-+#define CONFIG_AFORMAT_FILTER 0
-+#define CONFIG_AFREQSHIFT_FILTER 0
-+#define CONFIG_AFWTDN_FILTER 0
-+#define CONFIG_AGATE_FILTER 0
-+#define CONFIG_AIIR_FILTER 0
-+#define CONFIG_AINTEGRAL_FILTER 0
-+#define CONFIG_AINTERLEAVE_FILTER 0
-+#define CONFIG_ALATENCY_FILTER 0
-+#define CONFIG_ALIMITER_FILTER 0
-+#define CONFIG_ALLPASS_FILTER 0
-+#define CONFIG_ALOOP_FILTER 0
-+#define CONFIG_AMERGE_FILTER 0
-+#define CONFIG_AMETADATA_FILTER 0
-+#define CONFIG_AMIX_FILTER 0
-+#define CONFIG_AMULTIPLY_FILTER 0
-+#define CONFIG_ANEQUALIZER_FILTER 0
-+#define CONFIG_ANLMDN_FILTER 0
-+#define CONFIG_ANLMF_FILTER 0
-+#define CONFIG_ANLMS_FILTER 0
-+#define CONFIG_ANULL_FILTER 0
-+#define CONFIG_APAD_FILTER 0
-+#define CONFIG_APERMS_FILTER 0
-+#define CONFIG_APHASER_FILTER 0
-+#define CONFIG_APHASESHIFT_FILTER 0
-+#define CONFIG_APSYCLIP_FILTER 0
-+#define CONFIG_APULSATOR_FILTER 0
-+#define CONFIG_AREALTIME_FILTER 0
-+#define CONFIG_ARESAMPLE_FILTER 0
-+#define CONFIG_AREVERSE_FILTER 0
-+#define CONFIG_ARNNDN_FILTER 0
-+#define CONFIG_ASDR_FILTER 0
-+#define CONFIG_ASEGMENT_FILTER 0
-+#define CONFIG_ASELECT_FILTER 0
-+#define CONFIG_ASENDCMD_FILTER 0
-+#define CONFIG_ASETNSAMPLES_FILTER 0
-+#define CONFIG_ASETPTS_FILTER 0
-+#define CONFIG_ASETRATE_FILTER 0
-+#define CONFIG_ASETTB_FILTER 0
-+#define CONFIG_ASHOWINFO_FILTER 0
-+#define CONFIG_ASIDEDATA_FILTER 0
-+#define CONFIG_ASOFTCLIP_FILTER 0
-+#define CONFIG_ASPECTRALSTATS_FILTER 0
-+#define CONFIG_ASPLIT_FILTER 0
-+#define CONFIG_ASR_FILTER 0
-+#define CONFIG_ASTATS_FILTER 0
-+#define CONFIG_ASTREAMSELECT_FILTER 0
-+#define CONFIG_ASUBBOOST_FILTER 0
-+#define CONFIG_ASUBCUT_FILTER 0
-+#define CONFIG_ASUPERCUT_FILTER 0
-+#define CONFIG_ASUPERPASS_FILTER 0
-+#define CONFIG_ASUPERSTOP_FILTER 0
-+#define CONFIG_ATEMPO_FILTER 0
-+#define CONFIG_ATILT_FILTER 0
-+#define CONFIG_ATRIM_FILTER 0
-+#define CONFIG_AXCORRELATE_FILTER 0
-+#define CONFIG_AZMQ_FILTER 0
-+#define CONFIG_BANDPASS_FILTER 0
-+#define CONFIG_BANDREJECT_FILTER 0
-+#define CONFIG_BASS_FILTER 0
-+#define CONFIG_BIQUAD_FILTER 0
-+#define CONFIG_BS2B_FILTER 0
-+#define CONFIG_CHANNELMAP_FILTER 0
-+#define CONFIG_CHANNELSPLIT_FILTER 0
-+#define CONFIG_CHORUS_FILTER 0
-+#define CONFIG_COMPAND_FILTER 0
-+#define CONFIG_COMPENSATIONDELAY_FILTER 0
-+#define CONFIG_CROSSFEED_FILTER 0
-+#define CONFIG_CRYSTALIZER_FILTER 0
-+#define CONFIG_DCSHIFT_FILTER 0
-+#define CONFIG_DEESSER_FILTER 0
-+#define CONFIG_DIALOGUENHANCE_FILTER 0
-+#define CONFIG_DRMETER_FILTER 0
-+#define CONFIG_DYNAUDNORM_FILTER 0
-+#define CONFIG_EARWAX_FILTER 0
-+#define CONFIG_EBUR128_FILTER 0
-+#define CONFIG_EQUALIZER_FILTER 0
-+#define CONFIG_EXTRASTEREO_FILTER 0
-+#define CONFIG_FIREQUALIZER_FILTER 0
-+#define CONFIG_FLANGER_FILTER 0
-+#define CONFIG_HAAS_FILTER 0
-+#define CONFIG_HDCD_FILTER 0
-+#define CONFIG_HEADPHONE_FILTER 0
-+#define CONFIG_HIGHPASS_FILTER 0
-+#define CONFIG_HIGHSHELF_FILTER 0
-+#define CONFIG_JOIN_FILTER 0
-+#define CONFIG_LADSPA_FILTER 0
-+#define CONFIG_LOUDNORM_FILTER 0
-+#define CONFIG_LOWPASS_FILTER 0
-+#define CONFIG_LOWSHELF_FILTER 0
-+#define CONFIG_LV2_FILTER 0
-+#define CONFIG_MCOMPAND_FILTER 0
-+#define CONFIG_PAN_FILTER 0
-+#define CONFIG_REPLAYGAIN_FILTER 0
-+#define CONFIG_RUBBERBAND_FILTER 0
-+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
-+#define CONFIG_SIDECHAINGATE_FILTER 0
-+#define CONFIG_SILENCEDETECT_FILTER 0
-+#define CONFIG_SILENCEREMOVE_FILTER 0
-+#define CONFIG_SOFALIZER_FILTER 0
-+#define CONFIG_SPEECHNORM_FILTER 0
-+#define CONFIG_STEREOTOOLS_FILTER 0
-+#define CONFIG_STEREOWIDEN_FILTER 0
-+#define CONFIG_SUPEREQUALIZER_FILTER 0
-+#define CONFIG_SURROUND_FILTER 0
-+#define CONFIG_TILTSHELF_FILTER 0
-+#define CONFIG_TREBLE_FILTER 0
-+#define CONFIG_TREMOLO_FILTER 0
-+#define CONFIG_VIBRATO_FILTER 0
-+#define CONFIG_VIRTUALBASS_FILTER 0
-+#define CONFIG_VOLUME_FILTER 0
-+#define CONFIG_VOLUMEDETECT_FILTER 0
-+#define CONFIG_AEVALSRC_FILTER 0
-+#define CONFIG_AFIRSRC_FILTER 0
-+#define CONFIG_ANOISESRC_FILTER 0
-+#define CONFIG_ANULLSRC_FILTER 0
-+#define CONFIG_FLITE_FILTER 0
-+#define CONFIG_HILBERT_FILTER 0
-+#define CONFIG_SINC_FILTER 0
-+#define CONFIG_SINE_FILTER 0
-+#define CONFIG_ANULLSINK_FILTER 0
-+#define CONFIG_ADDROI_FILTER 0
-+#define CONFIG_ALPHAEXTRACT_FILTER 0
-+#define CONFIG_ALPHAMERGE_FILTER 0
-+#define CONFIG_AMPLIFY_FILTER 0
-+#define CONFIG_ASS_FILTER 0
-+#define CONFIG_ATADENOISE_FILTER 0
-+#define CONFIG_AVGBLUR_FILTER 0
-+#define CONFIG_AVGBLUR_OPENCL_FILTER 0
-+#define CONFIG_AVGBLUR_VULKAN_FILTER 0
-+#define CONFIG_BACKGROUNDKEY_FILTER 0
-+#define CONFIG_BBOX_FILTER 0
-+#define CONFIG_BENCH_FILTER 0
-+#define CONFIG_BILATERAL_FILTER 0
-+#define CONFIG_BILATERAL_CUDA_FILTER 0
-+#define CONFIG_BITPLANENOISE_FILTER 0
-+#define CONFIG_BLACKDETECT_FILTER 0
-+#define CONFIG_BLACKFRAME_FILTER 0
-+#define CONFIG_BLEND_FILTER 0
-+#define CONFIG_BLEND_VULKAN_FILTER 0
-+#define CONFIG_BLOCKDETECT_FILTER 0
-+#define CONFIG_BLURDETECT_FILTER 0
-+#define CONFIG_BM3D_FILTER 0
-+#define CONFIG_BOXBLUR_FILTER 0
-+#define CONFIG_BOXBLUR_OPENCL_FILTER 0
-+#define CONFIG_BWDIF_FILTER 0
-+#define CONFIG_CAS_FILTER 0
-+#define CONFIG_CHROMABER_VULKAN_FILTER 0
-+#define CONFIG_CHROMAHOLD_FILTER 0
-+#define CONFIG_CHROMAKEY_FILTER 0
-+#define CONFIG_CHROMAKEY_CUDA_FILTER 0
-+#define CONFIG_CHROMANR_FILTER 0
-+#define CONFIG_CHROMASHIFT_FILTER 0
-+#define CONFIG_CIESCOPE_FILTER 0
-+#define CONFIG_CODECVIEW_FILTER 0
-+#define CONFIG_COLORBALANCE_FILTER 0
-+#define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORCONTRAST_FILTER 0
-+#define CONFIG_COLORCORRECT_FILTER 0
-+#define CONFIG_COLORIZE_FILTER 0
-+#define CONFIG_COLORKEY_FILTER 0
-+#define CONFIG_COLORKEY_OPENCL_FILTER 0
-+#define CONFIG_COLORHOLD_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
-+#define CONFIG_COLORMAP_FILTER 0
-+#define CONFIG_COLORMATRIX_FILTER 0
-+#define CONFIG_COLORSPACE_FILTER 0
-+#define CONFIG_COLORSPACE_CUDA_FILTER 0
-+#define CONFIG_COLORTEMPERATURE_FILTER 0
-+#define CONFIG_CONVOLUTION_FILTER 0
-+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
-+#define CONFIG_CONVOLVE_FILTER 0
-+#define CONFIG_COPY_FILTER 0
-+#define CONFIG_COREIMAGE_FILTER 0
-+#define CONFIG_COVER_RECT_FILTER 0
-+#define CONFIG_CROP_FILTER 0
-+#define CONFIG_CROPDETECT_FILTER 0
-+#define CONFIG_CUE_FILTER 0
-+#define CONFIG_CURVES_FILTER 0
-+#define CONFIG_DATASCOPE_FILTER 0
-+#define CONFIG_DBLUR_FILTER 0
-+#define CONFIG_DCTDNOIZ_FILTER 0
-+#define CONFIG_DEBAND_FILTER 0
-+#define CONFIG_DEBLOCK_FILTER 0
-+#define CONFIG_DECIMATE_FILTER 0
-+#define CONFIG_DECONVOLVE_FILTER 0
-+#define CONFIG_DEDOT_FILTER 0
-+#define CONFIG_DEFLATE_FILTER 0
-+#define CONFIG_DEFLICKER_FILTER 0
-+#define CONFIG_DEINTERLACE_QSV_FILTER 0
-+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
-+#define CONFIG_DEJUDDER_FILTER 0
-+#define CONFIG_DELOGO_FILTER 0
-+#define CONFIG_DENOISE_VAAPI_FILTER 0
-+#define CONFIG_DERAIN_FILTER 0
-+#define CONFIG_DESHAKE_FILTER 0
-+#define CONFIG_DESHAKE_OPENCL_FILTER 0
-+#define CONFIG_DESPILL_FILTER 0
-+#define CONFIG_DETELECINE_FILTER 0
-+#define CONFIG_DILATION_FILTER 0
-+#define CONFIG_DILATION_OPENCL_FILTER 0
-+#define CONFIG_DISPLACE_FILTER 0
-+#define CONFIG_DNN_CLASSIFY_FILTER 0
-+#define CONFIG_DNN_DETECT_FILTER 0
-+#define CONFIG_DNN_PROCESSING_FILTER 0
-+#define CONFIG_DOUBLEWEAVE_FILTER 0
-+#define CONFIG_DRAWBOX_FILTER 0
-+#define CONFIG_DRAWGRAPH_FILTER 0
-+#define CONFIG_DRAWGRID_FILTER 0
-+#define CONFIG_DRAWTEXT_FILTER 0
-+#define CONFIG_EDGEDETECT_FILTER 0
-+#define CONFIG_ELBG_FILTER 0
-+#define CONFIG_ENTROPY_FILTER 0
-+#define CONFIG_EPX_FILTER 0
-+#define CONFIG_EQ_FILTER 0
-+#define CONFIG_EROSION_FILTER 0
-+#define CONFIG_EROSION_OPENCL_FILTER 0
-+#define CONFIG_ESTDIF_FILTER 0
-+#define CONFIG_EXPOSURE_FILTER 0
-+#define CONFIG_EXTRACTPLANES_FILTER 0
-+#define CONFIG_FADE_FILTER 0
-+#define CONFIG_FEEDBACK_FILTER 0
-+#define CONFIG_FFTDNOIZ_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
-+#define CONFIG_FIELD_FILTER 0
-+#define CONFIG_FIELDHINT_FILTER 0
-+#define CONFIG_FIELDMATCH_FILTER 0
-+#define CONFIG_FIELDORDER_FILTER 0
-+#define CONFIG_FILLBORDERS_FILTER 0
-+#define CONFIG_FIND_RECT_FILTER 0
-+#define CONFIG_FLIP_VULKAN_FILTER 0
-+#define CONFIG_FLOODFILL_FILTER 0
-+#define CONFIG_FORMAT_FILTER 0
-+#define CONFIG_FPS_FILTER 0
-+#define CONFIG_FRAMEPACK_FILTER 0
-+#define CONFIG_FRAMERATE_FILTER 0
-+#define CONFIG_FRAMESTEP_FILTER 0
-+#define CONFIG_FREEZEDETECT_FILTER 0
-+#define CONFIG_FREEZEFRAMES_FILTER 0
-+#define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
-+#define CONFIG_GBLUR_FILTER 0
-+#define CONFIG_GBLUR_VULKAN_FILTER 0
-+#define CONFIG_GEQ_FILTER 0
-+#define CONFIG_GRADFUN_FILTER 0
-+#define CONFIG_GRAPHMONITOR_FILTER 0
-+#define CONFIG_GRAYWORLD_FILTER 0
-+#define CONFIG_GREYEDGE_FILTER 0
-+#define CONFIG_GUIDED_FILTER 0
-+#define CONFIG_HALDCLUT_FILTER 0
-+#define CONFIG_HFLIP_FILTER 0
-+#define CONFIG_HFLIP_VULKAN_FILTER 0
-+#define CONFIG_HISTEQ_FILTER 0
-+#define CONFIG_HISTOGRAM_FILTER 0
-+#define CONFIG_HQDN3D_FILTER 0
-+#define CONFIG_HQX_FILTER 0
-+#define CONFIG_HSTACK_FILTER 0
-+#define CONFIG_HSVHOLD_FILTER 0
-+#define CONFIG_HSVKEY_FILTER 0
-+#define CONFIG_HUE_FILTER 0
-+#define CONFIG_HUESATURATION_FILTER 0
-+#define CONFIG_HWDOWNLOAD_FILTER 0
-+#define CONFIG_HWMAP_FILTER 0
-+#define CONFIG_HWUPLOAD_FILTER 0
-+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
-+#define CONFIG_HYSTERESIS_FILTER 0
-+#define CONFIG_ICCDETECT_FILTER 0
-+#define CONFIG_ICCGEN_FILTER 0
-+#define CONFIG_IDENTITY_FILTER 0
-+#define CONFIG_IDET_FILTER 0
-+#define CONFIG_IL_FILTER 0
-+#define CONFIG_INFLATE_FILTER 0
-+#define CONFIG_INTERLACE_FILTER 0
-+#define CONFIG_INTERLEAVE_FILTER 0
-+#define CONFIG_KERNDEINT_FILTER 0
-+#define CONFIG_KIRSCH_FILTER 0
-+#define CONFIG_LAGFUN_FILTER 0
-+#define CONFIG_LATENCY_FILTER 0
-+#define CONFIG_LENSCORRECTION_FILTER 0
-+#define CONFIG_LENSFUN_FILTER 0
-+#define CONFIG_LIBPLACEBO_FILTER 0
-+#define CONFIG_LIBVMAF_FILTER 0
-+#define CONFIG_LIMITDIFF_FILTER 0
-+#define CONFIG_LIMITER_FILTER 0
-+#define CONFIG_LOOP_FILTER 0
-+#define CONFIG_LUMAKEY_FILTER 0
-+#define CONFIG_LUT_FILTER 0
-+#define CONFIG_LUT1D_FILTER 0
-+#define CONFIG_LUT2_FILTER 0
-+#define CONFIG_LUT3D_FILTER 0
-+#define CONFIG_LUTRGB_FILTER 0
-+#define CONFIG_LUTYUV_FILTER 0
-+#define CONFIG_MASKEDCLAMP_FILTER 0
-+#define CONFIG_MASKEDMAX_FILTER 0
-+#define CONFIG_MASKEDMERGE_FILTER 0
-+#define CONFIG_MASKEDMIN_FILTER 0
-+#define CONFIG_MASKEDTHRESHOLD_FILTER 0
-+#define CONFIG_MASKFUN_FILTER 0
-+#define CONFIG_MCDEINT_FILTER 0
-+#define CONFIG_MEDIAN_FILTER 0
-+#define CONFIG_MERGEPLANES_FILTER 0
-+#define CONFIG_MESTIMATE_FILTER 0
-+#define CONFIG_METADATA_FILTER 0
-+#define CONFIG_MIDEQUALIZER_FILTER 0
-+#define CONFIG_MINTERPOLATE_FILTER 0
-+#define CONFIG_MIX_FILTER 0
-+#define CONFIG_MONOCHROME_FILTER 0
-+#define CONFIG_MORPHO_FILTER 0
-+#define CONFIG_MPDECIMATE_FILTER 0
-+#define CONFIG_MSAD_FILTER 0
-+#define CONFIG_MULTIPLY_FILTER 0
-+#define CONFIG_NEGATE_FILTER 0
-+#define CONFIG_NLMEANS_FILTER 0
-+#define CONFIG_NLMEANS_OPENCL_FILTER 0
-+#define CONFIG_NNEDI_FILTER 0
-+#define CONFIG_NOFORMAT_FILTER 0
-+#define CONFIG_NOISE_FILTER 0
-+#define CONFIG_NORMALIZE_FILTER 0
-+#define CONFIG_NULL_FILTER 0
-+#define CONFIG_OCR_FILTER 0
-+#define CONFIG_OCV_FILTER 0
-+#define CONFIG_OSCILLOSCOPE_FILTER 0
-+#define CONFIG_OVERLAY_FILTER 0
-+#define CONFIG_OVERLAY_OPENCL_FILTER 0
-+#define CONFIG_OVERLAY_QSV_FILTER 0
-+#define CONFIG_OVERLAY_VAAPI_FILTER 0
-+#define CONFIG_OVERLAY_VULKAN_FILTER 0
-+#define CONFIG_OVERLAY_CUDA_FILTER 0
-+#define CONFIG_OWDENOISE_FILTER 0
-+#define CONFIG_PAD_FILTER 0
-+#define CONFIG_PAD_OPENCL_FILTER 0
-+#define CONFIG_PALETTEGEN_FILTER 0
-+#define CONFIG_PALETTEUSE_FILTER 0
-+#define CONFIG_PERMS_FILTER 0
-+#define CONFIG_PERSPECTIVE_FILTER 0
-+#define CONFIG_PHASE_FILTER 0
-+#define CONFIG_PHOTOSENSITIVITY_FILTER 0
-+#define CONFIG_PIXDESCTEST_FILTER 0
-+#define CONFIG_PIXELIZE_FILTER 0
-+#define CONFIG_PIXSCOPE_FILTER 0
-+#define CONFIG_PP_FILTER 0
-+#define CONFIG_PP7_FILTER 0
-+#define CONFIG_PREMULTIPLY_FILTER 0
-+#define CONFIG_PREWITT_FILTER 0
-+#define CONFIG_PREWITT_OPENCL_FILTER 0
-+#define CONFIG_PROCAMP_VAAPI_FILTER 0
-+#define CONFIG_PROGRAM_OPENCL_FILTER 0
-+#define CONFIG_PSEUDOCOLOR_FILTER 0
-+#define CONFIG_PSNR_FILTER 0
-+#define CONFIG_PULLUP_FILTER 0
-+#define CONFIG_QP_FILTER 0
-+#define CONFIG_RANDOM_FILTER 0
-+#define CONFIG_READEIA608_FILTER 0
-+#define CONFIG_READVITC_FILTER 0
-+#define CONFIG_REALTIME_FILTER 0
-+#define CONFIG_REMAP_FILTER 0
-+#define CONFIG_REMAP_OPENCL_FILTER 0
-+#define CONFIG_REMOVEGRAIN_FILTER 0
-+#define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
-+#define CONFIG_REVERSE_FILTER 0
-+#define CONFIG_RGBASHIFT_FILTER 0
-+#define CONFIG_ROBERTS_FILTER 0
-+#define CONFIG_ROBERTS_OPENCL_FILTER 0
-+#define CONFIG_ROTATE_FILTER 0
-+#define CONFIG_SAB_FILTER 0
-+#define CONFIG_SCALE_FILTER 0
-+#define CONFIG_SCALE_CUDA_FILTER 0
-+#define CONFIG_SCALE_NPP_FILTER 0
-+#define CONFIG_SCALE_QSV_FILTER 0
-+#define CONFIG_SCALE_VAAPI_FILTER 0
-+#define CONFIG_SCALE_VULKAN_FILTER 0
-+#define CONFIG_SCALE2REF_FILTER 0
-+#define CONFIG_SCALE2REF_NPP_FILTER 0
-+#define CONFIG_SCDET_FILTER 0
-+#define CONFIG_SCHARR_FILTER 0
-+#define CONFIG_SCROLL_FILTER 0
-+#define CONFIG_SEGMENT_FILTER 0
-+#define CONFIG_SELECT_FILTER 0
-+#define CONFIG_SELECTIVECOLOR_FILTER 0
-+#define CONFIG_SENDCMD_FILTER 0
-+#define CONFIG_SEPARATEFIELDS_FILTER 0
-+#define CONFIG_SETDAR_FILTER 0
-+#define CONFIG_SETFIELD_FILTER 0
-+#define CONFIG_SETPARAMS_FILTER 0
-+#define CONFIG_SETPTS_FILTER 0
-+#define CONFIG_SETRANGE_FILTER 0
-+#define CONFIG_SETSAR_FILTER 0
-+#define CONFIG_SETTB_FILTER 0
-+#define CONFIG_SHARPEN_NPP_FILTER 0
-+#define CONFIG_SHARPNESS_VAAPI_FILTER 0
-+#define CONFIG_SHEAR_FILTER 0
-+#define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
-+#define CONFIG_SHUFFLEFRAMES_FILTER 0
-+#define CONFIG_SHUFFLEPIXELS_FILTER 0
-+#define CONFIG_SHUFFLEPLANES_FILTER 0
-+#define CONFIG_SIDEDATA_FILTER 0
-+#define CONFIG_SIGNALSTATS_FILTER 0
-+#define CONFIG_SIGNATURE_FILTER 0
-+#define CONFIG_SITI_FILTER 0
-+#define CONFIG_SMARTBLUR_FILTER 0
-+#define CONFIG_SOBEL_FILTER 0
-+#define CONFIG_SOBEL_OPENCL_FILTER 0
-+#define CONFIG_SPLIT_FILTER 0
-+#define CONFIG_SPP_FILTER 0
-+#define CONFIG_SR_FILTER 0
-+#define CONFIG_SSIM_FILTER 0
-+#define CONFIG_STEREO3D_FILTER 0
-+#define CONFIG_STREAMSELECT_FILTER 0
-+#define CONFIG_SUBTITLES_FILTER 0
-+#define CONFIG_SUPER2XSAI_FILTER 0
-+#define CONFIG_SWAPRECT_FILTER 0
-+#define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
-+#define CONFIG_TELECINE_FILTER 0
-+#define CONFIG_THISTOGRAM_FILTER 0
-+#define CONFIG_THRESHOLD_FILTER 0
-+#define CONFIG_THUMBNAIL_FILTER 0
-+#define CONFIG_THUMBNAIL_CUDA_FILTER 0
-+#define CONFIG_TILE_FILTER 0
-+#define CONFIG_TINTERLACE_FILTER 0
-+#define CONFIG_TLUT2_FILTER 0
-+#define CONFIG_TMEDIAN_FILTER 0
-+#define CONFIG_TMIDEQUALIZER_FILTER 0
-+#define CONFIG_TMIX_FILTER 0
-+#define CONFIG_TONEMAP_FILTER 0
-+#define CONFIG_TONEMAP_OPENCL_FILTER 0
-+#define CONFIG_TONEMAP_VAAPI_FILTER 0
-+#define CONFIG_TPAD_FILTER 0
-+#define CONFIG_TRANSPOSE_FILTER 0
-+#define CONFIG_TRANSPOSE_NPP_FILTER 0
-+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
-+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0
-+#define CONFIG_TRANSPOSE_VULKAN_FILTER 0
-+#define CONFIG_TRIM_FILTER 0
-+#define CONFIG_UNPREMULTIPLY_FILTER 0
-+#define CONFIG_UNSHARP_FILTER 0
-+#define CONFIG_UNSHARP_OPENCL_FILTER 0
-+#define CONFIG_UNTILE_FILTER 0
-+#define CONFIG_USPP_FILTER 0
-+#define CONFIG_V360_FILTER 0
-+#define CONFIG_VAGUEDENOISER_FILTER 0
-+#define CONFIG_VARBLUR_FILTER 0
-+#define CONFIG_VECTORSCOPE_FILTER 0
-+#define CONFIG_VFLIP_FILTER 0
-+#define CONFIG_VFLIP_VULKAN_FILTER 0
-+#define CONFIG_VFRDET_FILTER 0
-+#define CONFIG_VIBRANCE_FILTER 0
-+#define CONFIG_VIDSTABDETECT_FILTER 0
-+#define CONFIG_VIDSTABTRANSFORM_FILTER 0
-+#define CONFIG_VIF_FILTER 0
-+#define CONFIG_VIGNETTE_FILTER 0
-+#define CONFIG_VMAFMOTION_FILTER 0
-+#define CONFIG_VPP_QSV_FILTER 0
-+#define CONFIG_VSTACK_FILTER 0
-+#define CONFIG_W3FDIF_FILTER 0
-+#define CONFIG_WAVEFORM_FILTER 0
-+#define CONFIG_WEAVE_FILTER 0
-+#define CONFIG_XBR_FILTER 0
-+#define CONFIG_XCORRELATE_FILTER 0
-+#define CONFIG_XFADE_FILTER 0
-+#define CONFIG_XFADE_OPENCL_FILTER 0
-+#define CONFIG_XMEDIAN_FILTER 0
-+#define CONFIG_XSTACK_FILTER 0
-+#define CONFIG_YADIF_FILTER 0
-+#define CONFIG_YADIF_CUDA_FILTER 0
-+#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0
-+#define CONFIG_YAEPBLUR_FILTER 0
-+#define CONFIG_ZMQ_FILTER 0
-+#define CONFIG_ZOOMPAN_FILTER 0
-+#define CONFIG_ZSCALE_FILTER 0
-+#define CONFIG_ALLRGB_FILTER 0
-+#define CONFIG_ALLYUV_FILTER 0
-+#define CONFIG_CELLAUTO_FILTER 0
-+#define CONFIG_COLOR_FILTER 0
-+#define CONFIG_COLORCHART_FILTER 0
-+#define CONFIG_COLORSPECTRUM_FILTER 0
-+#define CONFIG_COREIMAGESRC_FILTER 0
-+#define CONFIG_DDAGRAB_FILTER 0
-+#define CONFIG_FREI0R_SRC_FILTER 0
-+#define CONFIG_GRADIENTS_FILTER 0
-+#define CONFIG_HALDCLUTSRC_FILTER 0
-+#define CONFIG_LIFE_FILTER 0
-+#define CONFIG_MANDELBROT_FILTER 0
-+#define CONFIG_MPTESTSRC_FILTER 0
-+#define CONFIG_NULLSRC_FILTER 0
-+#define CONFIG_OPENCLSRC_FILTER 0
-+#define CONFIG_PAL75BARS_FILTER 0
-+#define CONFIG_PAL100BARS_FILTER 0
-+#define CONFIG_RGBTESTSRC_FILTER 0
-+#define CONFIG_SIERPINSKI_FILTER 0
-+#define CONFIG_SMPTEBARS_FILTER 0
-+#define CONFIG_SMPTEHDBARS_FILTER 0
-+#define CONFIG_TESTSRC_FILTER 0
-+#define CONFIG_TESTSRC2_FILTER 0
-+#define CONFIG_YUVTESTSRC_FILTER 0
-+#define CONFIG_NULLSINK_FILTER 0
-+#define CONFIG_A3DSCOPE_FILTER 0
-+#define CONFIG_ABITSCOPE_FILTER 0
-+#define CONFIG_ADRAWGRAPH_FILTER 0
-+#define CONFIG_AGRAPHMONITOR_FILTER 0
-+#define CONFIG_AHISTOGRAM_FILTER 0
-+#define CONFIG_APHASEMETER_FILTER 0
-+#define CONFIG_AVECTORSCOPE_FILTER 0
-+#define CONFIG_CONCAT_FILTER 0
-+#define CONFIG_SHOWCQT_FILTER 0
-+#define CONFIG_SHOWFREQS_FILTER 0
-+#define CONFIG_SHOWSPATIAL_FILTER 0
-+#define CONFIG_SHOWSPECTRUM_FILTER 0
-+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
-+#define CONFIG_SHOWVOLUME_FILTER 0
-+#define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
-+#define CONFIG_SPECTRUMSYNTH_FILTER 0
-+#define CONFIG_AVSYNCTEST_FILTER 0
-+#define CONFIG_AMOVIE_FILTER 0
-+#define CONFIG_MOVIE_FILTER 0
-+#define CONFIG_AFIFO_FILTER 0
-+#define CONFIG_FIFO_FILTER 0
-+#define CONFIG_AA_DEMUXER 0
-+#define CONFIG_AAC_DEMUXER 1
-+#define CONFIG_AAX_DEMUXER 0
-+#define CONFIG_AC3_DEMUXER 0
-+#define CONFIG_ACE_DEMUXER 0
-+#define CONFIG_ACM_DEMUXER 0
-+#define CONFIG_ACT_DEMUXER 0
-+#define CONFIG_ADF_DEMUXER 0
-+#define CONFIG_ADP_DEMUXER 0
-+#define CONFIG_ADS_DEMUXER 0
-+#define CONFIG_ADX_DEMUXER 0
-+#define CONFIG_AEA_DEMUXER 0
-+#define CONFIG_AFC_DEMUXER 0
-+#define CONFIG_AIFF_DEMUXER 0
-+#define CONFIG_AIX_DEMUXER 0
-+#define CONFIG_ALP_DEMUXER 0
-+#define CONFIG_AMR_DEMUXER 0
-+#define CONFIG_AMRNB_DEMUXER 0
-+#define CONFIG_AMRWB_DEMUXER 0
-+#define CONFIG_ANM_DEMUXER 0
-+#define CONFIG_APAC_DEMUXER 0
-+#define CONFIG_APC_DEMUXER 0
-+#define CONFIG_APE_DEMUXER 0
-+#define CONFIG_APM_DEMUXER 0
-+#define CONFIG_APNG_DEMUXER 0
-+#define CONFIG_APTX_DEMUXER 0
-+#define CONFIG_APTX_HD_DEMUXER 0
-+#define CONFIG_AQTITLE_DEMUXER 0
-+#define CONFIG_ARGO_ASF_DEMUXER 0
-+#define CONFIG_ARGO_BRP_DEMUXER 0
-+#define CONFIG_ARGO_CVG_DEMUXER 0
-+#define CONFIG_ASF_DEMUXER 0
-+#define CONFIG_ASF_O_DEMUXER 0
-+#define CONFIG_ASS_DEMUXER 0
-+#define CONFIG_AST_DEMUXER 0
-+#define CONFIG_AU_DEMUXER 0
-+#define CONFIG_AV1_DEMUXER 0
-+#define CONFIG_AVI_DEMUXER 0
-+#define CONFIG_AVISYNTH_DEMUXER 0
-+#define CONFIG_AVR_DEMUXER 0
-+#define CONFIG_AVS_DEMUXER 0
-+#define CONFIG_AVS2_DEMUXER 0
-+#define CONFIG_AVS3_DEMUXER 0
-+#define CONFIG_BETHSOFTVID_DEMUXER 0
-+#define CONFIG_BFI_DEMUXER 0
-+#define CONFIG_BINTEXT_DEMUXER 0
-+#define CONFIG_BINK_DEMUXER 0
-+#define CONFIG_BINKA_DEMUXER 0
-+#define CONFIG_BIT_DEMUXER 0
-+#define CONFIG_BITPACKED_DEMUXER 0
-+#define CONFIG_BMV_DEMUXER 0
-+#define CONFIG_BFSTM_DEMUXER 0
-+#define CONFIG_BRSTM_DEMUXER 0
-+#define CONFIG_BOA_DEMUXER 0
-+#define CONFIG_BONK_DEMUXER 0
-+#define CONFIG_C93_DEMUXER 0
-+#define CONFIG_CAF_DEMUXER 0
-+#define CONFIG_CAVSVIDEO_DEMUXER 0
-+#define CONFIG_CDG_DEMUXER 0
-+#define CONFIG_CDXL_DEMUXER 0
-+#define CONFIG_CINE_DEMUXER 0
-+#define CONFIG_CODEC2_DEMUXER 0
-+#define CONFIG_CODEC2RAW_DEMUXER 0
-+#define CONFIG_CONCAT_DEMUXER 0
-+#define CONFIG_DASH_DEMUXER 0
-+#define CONFIG_DATA_DEMUXER 0
-+#define CONFIG_DAUD_DEMUXER 0
-+#define CONFIG_DCSTR_DEMUXER 0
-+#define CONFIG_DERF_DEMUXER 0
-+#define CONFIG_DFA_DEMUXER 0
-+#define CONFIG_DFPWM_DEMUXER 0
-+#define CONFIG_DHAV_DEMUXER 0
-+#define CONFIG_DIRAC_DEMUXER 0
-+#define CONFIG_DNXHD_DEMUXER 0
-+#define CONFIG_DSF_DEMUXER 0
-+#define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
-+#define CONFIG_DTS_DEMUXER 0
-+#define CONFIG_DTSHD_DEMUXER 0
-+#define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
-+#define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_DXA_DEMUXER 0
-+#define CONFIG_EA_DEMUXER 0
-+#define CONFIG_EA_CDATA_DEMUXER 0
-+#define CONFIG_EAC3_DEMUXER 0
-+#define CONFIG_EPAF_DEMUXER 0
-+#define CONFIG_FFMETADATA_DEMUXER 0
-+#define CONFIG_FILMSTRIP_DEMUXER 0
-+#define CONFIG_FITS_DEMUXER 0
-+#define CONFIG_FLAC_DEMUXER 1
-+#define CONFIG_FLIC_DEMUXER 0
-+#define CONFIG_FLV_DEMUXER 0
-+#define CONFIG_LIVE_FLV_DEMUXER 0
-+#define CONFIG_FOURXM_DEMUXER 0
-+#define CONFIG_FRM_DEMUXER 0
-+#define CONFIG_FSB_DEMUXER 0
-+#define CONFIG_FWSE_DEMUXER 0
-+#define CONFIG_G722_DEMUXER 0
-+#define CONFIG_G723_1_DEMUXER 0
-+#define CONFIG_G726_DEMUXER 0
-+#define CONFIG_G726LE_DEMUXER 0
-+#define CONFIG_G729_DEMUXER 0
-+#define CONFIG_GDV_DEMUXER 0
-+#define CONFIG_GENH_DEMUXER 0
-+#define CONFIG_GIF_DEMUXER 0
-+#define CONFIG_GSM_DEMUXER 0
-+#define CONFIG_GXF_DEMUXER 0
-+#define CONFIG_H261_DEMUXER 0
-+#define CONFIG_H263_DEMUXER 0
-+#define CONFIG_H264_DEMUXER 0
-+#define CONFIG_HCA_DEMUXER 0
-+#define CONFIG_HCOM_DEMUXER 0
-+#define CONFIG_HEVC_DEMUXER 0
-+#define CONFIG_HLS_DEMUXER 0
-+#define CONFIG_HNM_DEMUXER 0
-+#define CONFIG_ICO_DEMUXER 0
-+#define CONFIG_IDCIN_DEMUXER 0
-+#define CONFIG_IDF_DEMUXER 0
-+#define CONFIG_IFF_DEMUXER 0
-+#define CONFIG_IFV_DEMUXER 0
-+#define CONFIG_ILBC_DEMUXER 0
-+#define CONFIG_IMAGE2_DEMUXER 0
-+#define CONFIG_IMAGE2PIPE_DEMUXER 0
-+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0
-+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0
-+#define CONFIG_IMF_DEMUXER 0
-+#define CONFIG_INGENIENT_DEMUXER 0
-+#define CONFIG_IPMOVIE_DEMUXER 0
-+#define CONFIG_IPU_DEMUXER 0
-+#define CONFIG_IRCAM_DEMUXER 0
-+#define CONFIG_ISS_DEMUXER 0
-+#define CONFIG_IV8_DEMUXER 0
-+#define CONFIG_IVF_DEMUXER 0
-+#define CONFIG_IVR_DEMUXER 0
-+#define CONFIG_JACOSUB_DEMUXER 0
-+#define CONFIG_JV_DEMUXER 0
-+#define CONFIG_KUX_DEMUXER 0
-+#define CONFIG_KVAG_DEMUXER 0
-+#define CONFIG_LAF_DEMUXER 0
-+#define CONFIG_LMLM4_DEMUXER 0
-+#define CONFIG_LOAS_DEMUXER 0
-+#define CONFIG_LUODAT_DEMUXER 0
-+#define CONFIG_LRC_DEMUXER 0
-+#define CONFIG_LVF_DEMUXER 0
-+#define CONFIG_LXF_DEMUXER 0
-+#define CONFIG_M4V_DEMUXER 0
-+#define CONFIG_MCA_DEMUXER 0
-+#define CONFIG_MCC_DEMUXER 0
-+#define CONFIG_MATROSKA_DEMUXER 1
-+#define CONFIG_MGSTS_DEMUXER 0
-+#define CONFIG_MICRODVD_DEMUXER 0
-+#define CONFIG_MJPEG_DEMUXER 0
-+#define CONFIG_MJPEG_2000_DEMUXER 0
-+#define CONFIG_MLP_DEMUXER 0
-+#define CONFIG_MLV_DEMUXER 0
-+#define CONFIG_MM_DEMUXER 0
-+#define CONFIG_MMF_DEMUXER 0
-+#define CONFIG_MODS_DEMUXER 0
-+#define CONFIG_MOFLEX_DEMUXER 0
-+#define CONFIG_MOV_DEMUXER 1
-+#define CONFIG_MP3_DEMUXER 1
-+#define CONFIG_MPC_DEMUXER 0
-+#define CONFIG_MPC8_DEMUXER 0
-+#define CONFIG_MPEGPS_DEMUXER 0
-+#define CONFIG_MPEGTS_DEMUXER 0
-+#define CONFIG_MPEGTSRAW_DEMUXER 0
-+#define CONFIG_MPEGVIDEO_DEMUXER 0
-+#define CONFIG_MPJPEG_DEMUXER 0
-+#define CONFIG_MPL2_DEMUXER 0
-+#define CONFIG_MPSUB_DEMUXER 0
-+#define CONFIG_MSF_DEMUXER 0
-+#define CONFIG_MSNWC_TCP_DEMUXER 0
-+#define CONFIG_MSP_DEMUXER 0
-+#define CONFIG_MTAF_DEMUXER 0
-+#define CONFIG_MTV_DEMUXER 0
-+#define CONFIG_MUSX_DEMUXER 0
-+#define CONFIG_MV_DEMUXER 0
-+#define CONFIG_MVI_DEMUXER 0
-+#define CONFIG_MXF_DEMUXER 0
-+#define CONFIG_MXG_DEMUXER 0
-+#define CONFIG_NC_DEMUXER 0
-+#define CONFIG_NISTSPHERE_DEMUXER 0
-+#define CONFIG_NSP_DEMUXER 0
-+#define CONFIG_NSV_DEMUXER 0
-+#define CONFIG_NUT_DEMUXER 0
-+#define CONFIG_NUV_DEMUXER 0
-+#define CONFIG_OBU_DEMUXER 0
-+#define CONFIG_OGG_DEMUXER 1
-+#define CONFIG_OMA_DEMUXER 0
-+#define CONFIG_PAF_DEMUXER 0
-+#define CONFIG_PCM_ALAW_DEMUXER 0
-+#define CONFIG_PCM_MULAW_DEMUXER 0
-+#define CONFIG_PCM_VIDC_DEMUXER 0
-+#define CONFIG_PCM_F64BE_DEMUXER 0
-+#define CONFIG_PCM_F64LE_DEMUXER 0
-+#define CONFIG_PCM_F32BE_DEMUXER 0
-+#define CONFIG_PCM_F32LE_DEMUXER 0
-+#define CONFIG_PCM_S32BE_DEMUXER 0
-+#define CONFIG_PCM_S32LE_DEMUXER 0
-+#define CONFIG_PCM_S24BE_DEMUXER 0
-+#define CONFIG_PCM_S24LE_DEMUXER 0
-+#define CONFIG_PCM_S16BE_DEMUXER 0
-+#define CONFIG_PCM_S16LE_DEMUXER 0
-+#define CONFIG_PCM_S8_DEMUXER 0
-+#define CONFIG_PCM_U32BE_DEMUXER 0
-+#define CONFIG_PCM_U32LE_DEMUXER 0
-+#define CONFIG_PCM_U24BE_DEMUXER 0
-+#define CONFIG_PCM_U24LE_DEMUXER 0
-+#define CONFIG_PCM_U16BE_DEMUXER 0
-+#define CONFIG_PCM_U16LE_DEMUXER 0
-+#define CONFIG_PCM_U8_DEMUXER 0
-+#define CONFIG_PJS_DEMUXER 0
-+#define CONFIG_PMP_DEMUXER 0
-+#define CONFIG_PP_BNK_DEMUXER 0
-+#define CONFIG_PVA_DEMUXER 0
-+#define CONFIG_PVF_DEMUXER 0
-+#define CONFIG_QCP_DEMUXER 0
-+#define CONFIG_R3D_DEMUXER 0
-+#define CONFIG_RAWVIDEO_DEMUXER 0
-+#define CONFIG_REALTEXT_DEMUXER 0
-+#define CONFIG_REDSPARK_DEMUXER 0
-+#define CONFIG_RL2_DEMUXER 0
-+#define CONFIG_RM_DEMUXER 0
-+#define CONFIG_ROQ_DEMUXER 0
-+#define CONFIG_RPL_DEMUXER 0
-+#define CONFIG_RSD_DEMUXER 0
-+#define CONFIG_RSO_DEMUXER 0
-+#define CONFIG_RTP_DEMUXER 0
-+#define CONFIG_RTSP_DEMUXER 0
-+#define CONFIG_S337M_DEMUXER 0
-+#define CONFIG_SAMI_DEMUXER 0
-+#define CONFIG_SAP_DEMUXER 0
-+#define CONFIG_SBC_DEMUXER 0
-+#define CONFIG_SBG_DEMUXER 0
-+#define CONFIG_SCC_DEMUXER 0
-+#define CONFIG_SCD_DEMUXER 0
-+#define CONFIG_SDP_DEMUXER 0
-+#define CONFIG_SDR2_DEMUXER 0
-+#define CONFIG_SDS_DEMUXER 0
-+#define CONFIG_SDX_DEMUXER 0
-+#define CONFIG_SEGAFILM_DEMUXER 0
-+#define CONFIG_SER_DEMUXER 0
-+#define CONFIG_SGA_DEMUXER 0
-+#define CONFIG_SHORTEN_DEMUXER 0
-+#define CONFIG_SIFF_DEMUXER 0
-+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0
-+#define CONFIG_SLN_DEMUXER 0
-+#define CONFIG_SMACKER_DEMUXER 0
-+#define CONFIG_SMJPEG_DEMUXER 0
-+#define CONFIG_SMUSH_DEMUXER 0
-+#define CONFIG_SOL_DEMUXER 0
-+#define CONFIG_SOX_DEMUXER 0
-+#define CONFIG_SPDIF_DEMUXER 0
-+#define CONFIG_SRT_DEMUXER 0
-+#define CONFIG_STR_DEMUXER 0
-+#define CONFIG_STL_DEMUXER 0
-+#define CONFIG_SUBVIEWER1_DEMUXER 0
-+#define CONFIG_SUBVIEWER_DEMUXER 0
-+#define CONFIG_SUP_DEMUXER 0
-+#define CONFIG_SVAG_DEMUXER 0
-+#define CONFIG_SVS_DEMUXER 0
-+#define CONFIG_SWF_DEMUXER 0
-+#define CONFIG_TAK_DEMUXER 0
-+#define CONFIG_TEDCAPTIONS_DEMUXER 0
-+#define CONFIG_THP_DEMUXER 0
-+#define CONFIG_THREEDOSTR_DEMUXER 0
-+#define CONFIG_TIERTEXSEQ_DEMUXER 0
-+#define CONFIG_TMV_DEMUXER 0
-+#define CONFIG_TRUEHD_DEMUXER 0
-+#define CONFIG_TTA_DEMUXER 0
-+#define CONFIG_TXD_DEMUXER 0
-+#define CONFIG_TTY_DEMUXER 0
-+#define CONFIG_TY_DEMUXER 0
-+#define CONFIG_V210_DEMUXER 0
-+#define CONFIG_V210X_DEMUXER 0
-+#define CONFIG_VAG_DEMUXER 0
-+#define CONFIG_VC1_DEMUXER 0
-+#define CONFIG_VC1T_DEMUXER 0
-+#define CONFIG_VIVIDAS_DEMUXER 0
-+#define CONFIG_VIVO_DEMUXER 0
-+#define CONFIG_VMD_DEMUXER 0
-+#define CONFIG_VOBSUB_DEMUXER 0
-+#define CONFIG_VOC_DEMUXER 0
-+#define CONFIG_VPK_DEMUXER 0
-+#define CONFIG_VPLAYER_DEMUXER 0
-+#define CONFIG_VQF_DEMUXER 0
-+#define CONFIG_W64_DEMUXER 0
-+#define CONFIG_WAV_DEMUXER 1
-+#define CONFIG_WC3_DEMUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
-+#define CONFIG_WEBVTT_DEMUXER 0
-+#define CONFIG_WSAUD_DEMUXER 0
-+#define CONFIG_WSD_DEMUXER 0
-+#define CONFIG_WSVQA_DEMUXER 0
-+#define CONFIG_WTV_DEMUXER 0
-+#define CONFIG_WVE_DEMUXER 0
-+#define CONFIG_WV_DEMUXER 0
-+#define CONFIG_XA_DEMUXER 0
-+#define CONFIG_XBIN_DEMUXER 0
-+#define CONFIG_XMV_DEMUXER 0
-+#define CONFIG_XVAG_DEMUXER 0
-+#define CONFIG_XWMA_DEMUXER 0
-+#define CONFIG_YOP_DEMUXER 0
-+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
-+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
-+#define CONFIG_LIBGME_DEMUXER 0
-+#define CONFIG_LIBMODPLUG_DEMUXER 0
-+#define CONFIG_LIBOPENMPT_DEMUXER 0
-+#define CONFIG_VAPOURSYNTH_DEMUXER 0
-+#define CONFIG_A64_MUXER 0
-+#define CONFIG_AC3_MUXER 0
-+#define CONFIG_ADTS_MUXER 0
-+#define CONFIG_ADX_MUXER 0
-+#define CONFIG_AIFF_MUXER 0
-+#define CONFIG_ALP_MUXER 0
-+#define CONFIG_AMR_MUXER 0
-+#define CONFIG_AMV_MUXER 0
-+#define CONFIG_APM_MUXER 0
-+#define CONFIG_APNG_MUXER 0
-+#define CONFIG_APTX_MUXER 0
-+#define CONFIG_APTX_HD_MUXER 0
-+#define CONFIG_ARGO_ASF_MUXER 0
-+#define CONFIG_ARGO_CVG_MUXER 0
-+#define CONFIG_ASF_MUXER 0
-+#define CONFIG_ASS_MUXER 0
-+#define CONFIG_AST_MUXER 0
-+#define CONFIG_ASF_STREAM_MUXER 0
-+#define CONFIG_AU_MUXER 0
-+#define CONFIG_AVI_MUXER 0
-+#define CONFIG_AVIF_MUXER 0
-+#define CONFIG_AVM2_MUXER 0
-+#define CONFIG_AVS2_MUXER 0
-+#define CONFIG_AVS3_MUXER 0
-+#define CONFIG_BIT_MUXER 0
-+#define CONFIG_CAF_MUXER 0
-+#define CONFIG_CAVSVIDEO_MUXER 0
-+#define CONFIG_CODEC2_MUXER 0
-+#define CONFIG_CODEC2RAW_MUXER 0
-+#define CONFIG_CRC_MUXER 0
-+#define CONFIG_DASH_MUXER 0
-+#define CONFIG_DATA_MUXER 0
-+#define CONFIG_DAUD_MUXER 0
-+#define CONFIG_DFPWM_MUXER 0
-+#define CONFIG_DIRAC_MUXER 0
-+#define CONFIG_DNXHD_MUXER 0
-+#define CONFIG_DTS_MUXER 0
-+#define CONFIG_DV_MUXER 0
-+#define CONFIG_EAC3_MUXER 0
-+#define CONFIG_F4V_MUXER 0
-+#define CONFIG_FFMETADATA_MUXER 0
-+#define CONFIG_FIFO_MUXER 0
-+#define CONFIG_FIFO_TEST_MUXER 0
-+#define CONFIG_FILMSTRIP_MUXER 0
-+#define CONFIG_FITS_MUXER 0
-+#define CONFIG_FLAC_MUXER 0
-+#define CONFIG_FLV_MUXER 0
-+#define CONFIG_FRAMECRC_MUXER 0
-+#define CONFIG_FRAMEHASH_MUXER 0
-+#define CONFIG_FRAMEMD5_MUXER 0
-+#define CONFIG_G722_MUXER 0
-+#define CONFIG_G723_1_MUXER 0
-+#define CONFIG_G726_MUXER 0
-+#define CONFIG_G726LE_MUXER 0
-+#define CONFIG_GIF_MUXER 0
-+#define CONFIG_GSM_MUXER 0
-+#define CONFIG_GXF_MUXER 0
-+#define CONFIG_H261_MUXER 0
-+#define CONFIG_H263_MUXER 0
-+#define CONFIG_H264_MUXER 0
-+#define CONFIG_HASH_MUXER 0
-+#define CONFIG_HDS_MUXER 0
-+#define CONFIG_HEVC_MUXER 0
-+#define CONFIG_HLS_MUXER 0
-+#define CONFIG_ICO_MUXER 0
-+#define CONFIG_ILBC_MUXER 0
-+#define CONFIG_IMAGE2_MUXER 0
-+#define CONFIG_IMAGE2PIPE_MUXER 0
-+#define CONFIG_IPOD_MUXER 0
-+#define CONFIG_IRCAM_MUXER 0
-+#define CONFIG_ISMV_MUXER 0
-+#define CONFIG_IVF_MUXER 0
-+#define CONFIG_JACOSUB_MUXER 0
-+#define CONFIG_KVAG_MUXER 0
-+#define CONFIG_LATM_MUXER 0
-+#define CONFIG_LRC_MUXER 0
-+#define CONFIG_M4V_MUXER 0
-+#define CONFIG_MD5_MUXER 0
-+#define CONFIG_MATROSKA_MUXER 0
-+#define CONFIG_MATROSKA_AUDIO_MUXER 0
-+#define CONFIG_MICRODVD_MUXER 0
-+#define CONFIG_MJPEG_MUXER 0
-+#define CONFIG_MLP_MUXER 0
-+#define CONFIG_MMF_MUXER 0
-+#define CONFIG_MOV_MUXER 0
-+#define CONFIG_MP2_MUXER 0
-+#define CONFIG_MP3_MUXER 0
-+#define CONFIG_MP4_MUXER 0
-+#define CONFIG_MPEG1SYSTEM_MUXER 0
-+#define CONFIG_MPEG1VCD_MUXER 0
-+#define CONFIG_MPEG1VIDEO_MUXER 0
-+#define CONFIG_MPEG2DVD_MUXER 0
-+#define CONFIG_MPEG2SVCD_MUXER 0
-+#define CONFIG_MPEG2VIDEO_MUXER 0
-+#define CONFIG_MPEG2VOB_MUXER 0
-+#define CONFIG_MPEGTS_MUXER 0
-+#define CONFIG_MPJPEG_MUXER 0
-+#define CONFIG_MXF_MUXER 0
-+#define CONFIG_MXF_D10_MUXER 0
-+#define CONFIG_MXF_OPATOM_MUXER 0
-+#define CONFIG_NULL_MUXER 0
-+#define CONFIG_NUT_MUXER 0
-+#define CONFIG_OBU_MUXER 0
-+#define CONFIG_OGA_MUXER 0
-+#define CONFIG_OGG_MUXER 0
-+#define CONFIG_OGV_MUXER 0
-+#define CONFIG_OMA_MUXER 0
-+#define CONFIG_OPUS_MUXER 0
-+#define CONFIG_PCM_ALAW_MUXER 0
-+#define CONFIG_PCM_MULAW_MUXER 0
-+#define CONFIG_PCM_VIDC_MUXER 0
-+#define CONFIG_PCM_F64BE_MUXER 0
-+#define CONFIG_PCM_F64LE_MUXER 0
-+#define CONFIG_PCM_F32BE_MUXER 0
-+#define CONFIG_PCM_F32LE_MUXER 0
-+#define CONFIG_PCM_S32BE_MUXER 0
-+#define CONFIG_PCM_S32LE_MUXER 0
-+#define CONFIG_PCM_S24BE_MUXER 0
-+#define CONFIG_PCM_S24LE_MUXER 0
-+#define CONFIG_PCM_S16BE_MUXER 0
-+#define CONFIG_PCM_S16LE_MUXER 0
-+#define CONFIG_PCM_S8_MUXER 0
-+#define CONFIG_PCM_U32BE_MUXER 0
-+#define CONFIG_PCM_U32LE_MUXER 0
-+#define CONFIG_PCM_U24BE_MUXER 0
-+#define CONFIG_PCM_U24LE_MUXER 0
-+#define CONFIG_PCM_U16BE_MUXER 0
-+#define CONFIG_PCM_U16LE_MUXER 0
-+#define CONFIG_PCM_U8_MUXER 0
-+#define CONFIG_PSP_MUXER 0
-+#define CONFIG_RAWVIDEO_MUXER 0
-+#define CONFIG_RM_MUXER 0
-+#define CONFIG_ROQ_MUXER 0
-+#define CONFIG_RSO_MUXER 0
-+#define CONFIG_RTP_MUXER 0
-+#define CONFIG_RTP_MPEGTS_MUXER 0
-+#define CONFIG_RTSP_MUXER 0
-+#define CONFIG_SAP_MUXER 0
-+#define CONFIG_SBC_MUXER 0
-+#define CONFIG_SCC_MUXER 0
-+#define CONFIG_SEGAFILM_MUXER 0
-+#define CONFIG_SEGMENT_MUXER 0
-+#define CONFIG_STREAM_SEGMENT_MUXER 0
-+#define CONFIG_SMJPEG_MUXER 0
-+#define CONFIG_SMOOTHSTREAMING_MUXER 0
-+#define CONFIG_SOX_MUXER 0
-+#define CONFIG_SPX_MUXER 0
-+#define CONFIG_SPDIF_MUXER 0
-+#define CONFIG_SRT_MUXER 0
-+#define CONFIG_STREAMHASH_MUXER 0
-+#define CONFIG_SUP_MUXER 0
-+#define CONFIG_SWF_MUXER 0
-+#define CONFIG_TEE_MUXER 0
-+#define CONFIG_TG2_MUXER 0
-+#define CONFIG_TGP_MUXER 0
-+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0
-+#define CONFIG_TRUEHD_MUXER 0
-+#define CONFIG_TTA_MUXER 0
-+#define CONFIG_TTML_MUXER 0
-+#define CONFIG_UNCODEDFRAMECRC_MUXER 0
-+#define CONFIG_VC1_MUXER 0
-+#define CONFIG_VC1T_MUXER 0
-+#define CONFIG_VOC_MUXER 0
-+#define CONFIG_W64_MUXER 0
-+#define CONFIG_WAV_MUXER 0
-+#define CONFIG_WEBM_MUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
-+#define CONFIG_WEBM_CHUNK_MUXER 0
-+#define CONFIG_WEBP_MUXER 0
-+#define CONFIG_WEBVTT_MUXER 0
-+#define CONFIG_WSAUD_MUXER 0
-+#define CONFIG_WTV_MUXER 0
-+#define CONFIG_WV_MUXER 0
-+#define CONFIG_YUV4MPEGPIPE_MUXER 0
-+#define CONFIG_CHROMAPRINT_MUXER 0
-+#define CONFIG_ASYNC_PROTOCOL 0
-+#define CONFIG_BLURAY_PROTOCOL 0
-+#define CONFIG_CACHE_PROTOCOL 0
-+#define CONFIG_CONCAT_PROTOCOL 0
-+#define CONFIG_CONCATF_PROTOCOL 0
-+#define CONFIG_CRYPTO_PROTOCOL 0
-+#define CONFIG_DATA_PROTOCOL 0
-+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
-+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
-+#define CONFIG_FILE_PROTOCOL 0
-+#define CONFIG_FTP_PROTOCOL 0
-+#define CONFIG_GOPHER_PROTOCOL 0
-+#define CONFIG_GOPHERS_PROTOCOL 0
-+#define CONFIG_HLS_PROTOCOL 0
-+#define CONFIG_HTTP_PROTOCOL 0
-+#define CONFIG_HTTPPROXY_PROTOCOL 0
-+#define CONFIG_HTTPS_PROTOCOL 0
-+#define CONFIG_ICECAST_PROTOCOL 0
-+#define CONFIG_MMSH_PROTOCOL 0
-+#define CONFIG_MMST_PROTOCOL 0
-+#define CONFIG_MD5_PROTOCOL 0
-+#define CONFIG_PIPE_PROTOCOL 0
-+#define CONFIG_PROMPEG_PROTOCOL 0
-+#define CONFIG_RTMP_PROTOCOL 0
-+#define CONFIG_RTMPE_PROTOCOL 0
-+#define CONFIG_RTMPS_PROTOCOL 0
-+#define CONFIG_RTMPT_PROTOCOL 0
-+#define CONFIG_RTMPTE_PROTOCOL 0
-+#define CONFIG_RTMPTS_PROTOCOL 0
-+#define CONFIG_RTP_PROTOCOL 0
-+#define CONFIG_SCTP_PROTOCOL 0
-+#define CONFIG_SRTP_PROTOCOL 0
-+#define CONFIG_SUBFILE_PROTOCOL 0
-+#define CONFIG_TEE_PROTOCOL 0
-+#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
-+#define CONFIG_UDP_PROTOCOL 0
-+#define CONFIG_UDPLITE_PROTOCOL 0
-+#define CONFIG_UNIX_PROTOCOL 0
-+#define CONFIG_LIBAMQP_PROTOCOL 0
-+#define CONFIG_LIBRIST_PROTOCOL 0
-+#define CONFIG_LIBRTMP_PROTOCOL 0
-+#define CONFIG_LIBRTMPE_PROTOCOL 0
-+#define CONFIG_LIBRTMPS_PROTOCOL 0
-+#define CONFIG_LIBRTMPT_PROTOCOL 0
-+#define CONFIG_LIBRTMPTE_PROTOCOL 0
-+#define CONFIG_LIBSRT_PROTOCOL 0
-+#define CONFIG_LIBSSH_PROTOCOL 0
-+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-+#define CONFIG_LIBZMQ_PROTOCOL 0
-+#define CONFIG_IPFS_PROTOCOL 0
-+#define CONFIG_IPNS_PROTOCOL 0
-+#endif /* FFMPEG_CONFIG_COMPONENTS_H */
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
deleted file mode 100644
index c514822dabcb..000000000000
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
+++ /dev/null
@@ -1,735 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2023-04-05 11:05:06 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm
-@@ -0,0 +1,732 @@
-+; Automatically generated by configure - do not modify!
-+%define ARCH_AARCH64 0
-+%define ARCH_ALPHA 0
-+%define ARCH_ARM 0
-+%define ARCH_AVR32 0
-+%define ARCH_AVR32_AP 0
-+%define ARCH_AVR32_UC 0
-+%define ARCH_BFIN 0
-+%define ARCH_IA64 0
-+%define ARCH_LOONGARCH 0
-+%define ARCH_LOONGARCH32 0
-+%define ARCH_LOONGARCH64 0
-+%define ARCH_M68K 0
-+%define ARCH_MIPS 0
-+%define ARCH_MIPS64 0
-+%define ARCH_PARISC 0
-+%define ARCH_PPC 0
-+%define ARCH_PPC64 0
-+%define ARCH_RISCV 0
-+%define ARCH_S390 0
-+%define ARCH_SH4 0
-+%define ARCH_SPARC 0
-+%define ARCH_SPARC64 0
-+%define ARCH_TILEGX 0
-+%define ARCH_TILEPRO 0
-+%define ARCH_TOMI 0
-+%define ARCH_X86 1
-+%define ARCH_X86_32 1
-+%define ARCH_X86_64 0
-+%define HAVE_ARMV5TE 0
-+%define HAVE_ARMV6 0
-+%define HAVE_ARMV6T2 0
-+%define HAVE_ARMV8 0
-+%define HAVE_NEON 0
-+%define HAVE_VFP 0
-+%define HAVE_VFPV3 0
-+%define HAVE_SETEND 0
-+%define HAVE_ALTIVEC 0
-+%define HAVE_DCBZL 0
-+%define HAVE_LDBRX 0
-+%define HAVE_POWER8 0
-+%define HAVE_PPC4XX 0
-+%define HAVE_VSX 0
-+%define HAVE_RVV 0
-+%define HAVE_AESNI 1
-+%define HAVE_AMD3DNOW 1
-+%define HAVE_AMD3DNOWEXT 1
-+%define HAVE_AVX 1
-+%define HAVE_AVX2 1
-+%define HAVE_AVX512 1
-+%define HAVE_AVX512ICL 1
-+%define HAVE_FMA3 1
-+%define HAVE_FMA4 1
-+%define HAVE_MMX 1
-+%define HAVE_MMXEXT 1
-+%define HAVE_SSE 1
-+%define HAVE_SSE2 1
-+%define HAVE_SSE3 1
-+%define HAVE_SSE4 1
-+%define HAVE_SSE42 1
-+%define HAVE_SSSE3 1
-+%define HAVE_XOP 1
-+%define HAVE_CPUNOP 0
-+%define HAVE_I686 1
-+%define HAVE_MIPSFPU 0
-+%define HAVE_MIPS32R2 0
-+%define HAVE_MIPS32R5 0
-+%define HAVE_MIPS64R2 0
-+%define HAVE_MIPS32R6 0
-+%define HAVE_MIPS64R6 0
-+%define HAVE_MIPSDSP 0
-+%define HAVE_MIPSDSPR2 0
-+%define HAVE_MSA 0
-+%define HAVE_LOONGSON2 0
-+%define HAVE_LOONGSON3 0
-+%define HAVE_MMI 0
-+%define HAVE_LSX 0
-+%define HAVE_LASX 0
-+%define HAVE_ARMV5TE_EXTERNAL 0
-+%define HAVE_ARMV6_EXTERNAL 0
-+%define HAVE_ARMV6T2_EXTERNAL 0
-+%define HAVE_ARMV8_EXTERNAL 0
-+%define HAVE_NEON_EXTERNAL 0
-+%define HAVE_VFP_EXTERNAL 0
-+%define HAVE_VFPV3_EXTERNAL 0
-+%define HAVE_SETEND_EXTERNAL 0
-+%define HAVE_ALTIVEC_EXTERNAL 0
-+%define HAVE_DCBZL_EXTERNAL 0
-+%define HAVE_LDBRX_EXTERNAL 0
-+%define HAVE_POWER8_EXTERNAL 0
-+%define HAVE_PPC4XX_EXTERNAL 0
-+%define HAVE_VSX_EXTERNAL 0
-+%define HAVE_RVV_EXTERNAL 0
-+%define HAVE_AESNI_EXTERNAL 1
-+%define HAVE_AMD3DNOW_EXTERNAL 1
-+%define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+%define HAVE_AVX_EXTERNAL 1
-+%define HAVE_AVX2_EXTERNAL 1
-+%define HAVE_AVX512_EXTERNAL 1
-+%define HAVE_AVX512ICL_EXTERNAL 0
-+%define HAVE_FMA3_EXTERNAL 1
-+%define HAVE_FMA4_EXTERNAL 1
-+%define HAVE_MMX_EXTERNAL 1
-+%define HAVE_MMXEXT_EXTERNAL 1
-+%define HAVE_SSE_EXTERNAL 1
-+%define HAVE_SSE2_EXTERNAL 1
-+%define HAVE_SSE3_EXTERNAL 1
-+%define HAVE_SSE4_EXTERNAL 1
-+%define HAVE_SSE42_EXTERNAL 1
-+%define HAVE_SSSE3_EXTERNAL 1
-+%define HAVE_XOP_EXTERNAL 1
-+%define HAVE_CPUNOP_EXTERNAL 0
-+%define HAVE_I686_EXTERNAL 0
-+%define HAVE_MIPSFPU_EXTERNAL 0
-+%define HAVE_MIPS32R2_EXTERNAL 0
-+%define HAVE_MIPS32R5_EXTERNAL 0
-+%define HAVE_MIPS64R2_EXTERNAL 0
-+%define HAVE_MIPS32R6_EXTERNAL 0
-+%define HAVE_MIPS64R6_EXTERNAL 0
-+%define HAVE_MIPSDSP_EXTERNAL 0
-+%define HAVE_MIPSDSPR2_EXTERNAL 0
-+%define HAVE_MSA_EXTERNAL 0
-+%define HAVE_LOONGSON2_EXTERNAL 0
-+%define HAVE_LOONGSON3_EXTERNAL 0
-+%define HAVE_MMI_EXTERNAL 0
-+%define HAVE_LSX_EXTERNAL 0
-+%define HAVE_LASX_EXTERNAL 0
-+%define HAVE_ARMV5TE_INLINE 0
-+%define HAVE_ARMV6_INLINE 0
-+%define HAVE_ARMV6T2_INLINE 0
-+%define HAVE_ARMV8_INLINE 0
-+%define HAVE_NEON_INLINE 0
-+%define HAVE_VFP_INLINE 0
-+%define HAVE_VFPV3_INLINE 0
-+%define HAVE_SETEND_INLINE 0
-+%define HAVE_ALTIVEC_INLINE 0
-+%define HAVE_DCBZL_INLINE 0
-+%define HAVE_LDBRX_INLINE 0
-+%define HAVE_POWER8_INLINE 0
-+%define HAVE_PPC4XX_INLINE 0
-+%define HAVE_VSX_INLINE 0
-+%define HAVE_RVV_INLINE 0
-+%define HAVE_AESNI_INLINE 1
-+%define HAVE_AMD3DNOW_INLINE 1
-+%define HAVE_AMD3DNOWEXT_INLINE 1
-+%define HAVE_AVX_INLINE 1
-+%define HAVE_AVX2_INLINE 1
-+%define HAVE_AVX512_INLINE 1
-+%define HAVE_AVX512ICL_INLINE 1
-+%define HAVE_FMA3_INLINE 1
-+%define HAVE_FMA4_INLINE 1
-+%define HAVE_MMX_INLINE 1
-+%define HAVE_MMXEXT_INLINE 1
-+%define HAVE_SSE_INLINE 1
-+%define HAVE_SSE2_INLINE 1
-+%define HAVE_SSE3_INLINE 1
-+%define HAVE_SSE4_INLINE 1
-+%define HAVE_SSE42_INLINE 1
-+%define HAVE_SSSE3_INLINE 1
-+%define HAVE_XOP_INLINE 1
-+%define HAVE_CPUNOP_INLINE 0
-+%define HAVE_I686_INLINE 0
-+%define HAVE_MIPSFPU_INLINE 0
-+%define HAVE_MIPS32R2_INLINE 0
-+%define HAVE_MIPS32R5_INLINE 0
-+%define HAVE_MIPS64R2_INLINE 0
-+%define HAVE_MIPS32R6_INLINE 0
-+%define HAVE_MIPS64R6_INLINE 0
-+%define HAVE_MIPSDSP_INLINE 0
-+%define HAVE_MIPSDSPR2_INLINE 0
-+%define HAVE_MSA_INLINE 0
-+%define HAVE_LOONGSON2_INLINE 0
-+%define HAVE_LOONGSON3_INLINE 0
-+%define HAVE_MMI_INLINE 0
-+%define HAVE_LSX_INLINE 0
-+%define HAVE_LASX_INLINE 0
-+%define HAVE_ALIGNED_STACK 0
-+%define HAVE_FAST_64BIT 0
-+%define HAVE_FAST_CLZ 1
-+%define HAVE_FAST_CMOV 0
-+%define HAVE_FAST_FLOAT16 0
-+%define HAVE_LOCAL_ALIGNED 1
-+%define HAVE_SIMD_ALIGN_16 1
-+%define HAVE_SIMD_ALIGN_32 1
-+%define HAVE_SIMD_ALIGN_64 1
-+%define HAVE_ATOMIC_CAS_PTR 0
-+%define HAVE_MACHINE_RW_BARRIER 0
-+%define HAVE_MEMORYBARRIER 0
-+%define HAVE_MM_EMPTY 0
-+%define HAVE_RDTSC 0
-+%define HAVE_SEM_TIMEDWAIT 1
-+%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+%define HAVE_INLINE_ASM 1
-+%define HAVE_SYMVER 0
-+%define HAVE_X86ASM 1
-+%define HAVE_BIGENDIAN 0
-+%define HAVE_FAST_UNALIGNED 1
-+%define HAVE_ARPA_INET_H 0
-+%define HAVE_ASM_TYPES_H 0
-+%define HAVE_CDIO_PARANOIA_H 0
-+%define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+%define HAVE_CUDA_H 0
-+%define HAVE_DISPATCH_DISPATCH_H 0
-+%define HAVE_DEV_BKTR_IOCTL_BT848_H 0
-+%define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
-+%define HAVE_DEV_IC_BT8XX_H 1
-+%define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
-+%define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
-+%define HAVE_DIRECT_H 0
-+%define HAVE_DIRENT_H 1
-+%define HAVE_DXGIDEBUG_H 0
-+%define HAVE_DXVA_H 0
-+%define HAVE_ES2_GL_H 0
-+%define HAVE_GSM_H 0
-+%define HAVE_IO_H 0
-+%define HAVE_LINUX_DMA_BUF_H 0
-+%define HAVE_LINUX_PERF_EVENT_H 0
-+%define HAVE_MACHINE_IOCTL_BT848_H 0
-+%define HAVE_MACHINE_IOCTL_METEOR_H 0
-+%define HAVE_MALLOC_H 0
-+%define HAVE_OPENCV2_CORE_CORE_C_H 0
-+%define HAVE_OPENGL_GL3_H 0
-+%define HAVE_POLL_H 1
-+%define HAVE_SYS_PARAM_H 1
-+%define HAVE_SYS_RESOURCE_H 1
-+%define HAVE_SYS_SELECT_H 1
-+%define HAVE_SYS_SOUNDCARD_H 0
-+%define HAVE_SYS_TIME_H 1
-+%define HAVE_SYS_UN_H 1
-+%define HAVE_SYS_VIDEOIO_H 1
-+%define HAVE_TERMIOS_H 1
-+%define HAVE_UDPLITE_H 0
-+%define HAVE_UNISTD_H 1
-+%define HAVE_VALGRIND_VALGRIND_H 0 ; %define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440
-+%define HAVE_WINDOWS_H 0
-+%define HAVE_WINSOCK2_H 0
-+%define HAVE_INTRINSICS_NEON 0
-+%define HAVE_ATANF 1
-+%define HAVE_ATAN2F 1
-+%define HAVE_CBRT 1
-+%define HAVE_CBRTF 1
-+%define HAVE_COPYSIGN 1
-+%define HAVE_COSF 1
-+%define HAVE_ERF 1
-+%define HAVE_EXP2 1
-+%define HAVE_EXP2F 1
-+%define HAVE_EXPF 1
-+%define HAVE_HYPOT 1
-+%define HAVE_ISFINITE 1
-+%define HAVE_ISINF 1
-+%define HAVE_ISNAN 1
-+%define HAVE_LDEXPF 1
-+%define HAVE_LLRINT 1
-+%define HAVE_LLRINTF 1
-+%define HAVE_LOG2 1
-+%define HAVE_LOG2F 1
-+%define HAVE_LOG10F 1
-+%define HAVE_LRINT 1
-+%define HAVE_LRINTF 1
-+%define HAVE_POWF 1
-+%define HAVE_RINT 1
-+%define HAVE_ROUND 1
-+%define HAVE_ROUNDF 1
-+%define HAVE_SINF 1
-+%define HAVE_TRUNC 1
-+%define HAVE_TRUNCF 1
-+%define HAVE_DOS_PATHS 0
-+%define HAVE_LIBC_MSVCRT 0
-+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
-+%define HAVE_SECTION_DATA_REL_RO 1
-+%define HAVE_THREADS 1
-+%define HAVE_UWP 0
-+%define HAVE_WINRT 0
-+%define HAVE_ACCESS 1
-+%define HAVE_ALIGNED_MALLOC 0
-+%define HAVE_ARC4RANDOM 1
-+%define HAVE_CLOCK_GETTIME 1
-+%define HAVE_CLOSESOCKET 0
-+%define HAVE_COMMANDLINETOARGVW 0
-+%define HAVE_FCNTL 1
-+%define HAVE_GETADDRINFO 0
-+%define HAVE_GETAUXVAL 0
-+%define HAVE_GETENV 1
-+%define HAVE_GETHRTIME 0
-+%define HAVE_GETOPT 1
-+%define HAVE_GETMODULEHANDLE 0
-+%define HAVE_GETPROCESSAFFINITYMASK 0
-+%define HAVE_GETPROCESSMEMORYINFO 0
-+%define HAVE_GETPROCESSTIMES 0
-+%define HAVE_GETRUSAGE 1
-+%define HAVE_GETSTDHANDLE 0
-+%define HAVE_GETSYSTEMTIMEASFILETIME 0
-+%define HAVE_GETTIMEOFDAY 1
-+%define HAVE_GLOB 1
-+%define HAVE_GLXGETPROCADDRESS 0
-+%define HAVE_GMTIME_R 1
-+%define HAVE_INET_ATON 0
-+%define HAVE_ISATTY 1
-+%define HAVE_KBHIT 0
-+%define HAVE_LOCALTIME_R 1
-+%define HAVE_LSTAT 1
-+%define HAVE_LZO1X_999_COMPRESS 0
-+%define HAVE_MACH_ABSOLUTE_TIME 0
-+%define HAVE_MAPVIEWOFFILE 0
-+%define HAVE_MEMALIGN 0
-+%define HAVE_MKSTEMP 1
-+%define HAVE_MMAP 1
-+%define HAVE_MPROTECT 1
-+%define HAVE_NANOSLEEP 1
-+%define HAVE_PEEKNAMEDPIPE 0
-+%define HAVE_POSIX_MEMALIGN 1
-+%define HAVE_PRCTL 0
-+%define HAVE_PTHREAD_CANCEL 1
-+%define HAVE_SCHED_GETAFFINITY 0
-+%define HAVE_SECITEMIMPORT 0
-+%define HAVE_SETCONSOLETEXTATTRIBUTE 0
-+%define HAVE_SETCONSOLECTRLHANDLER 0
-+%define HAVE_SETDLLDIRECTORY 0
-+%define HAVE_SETMODE 0
-+%define HAVE_SETRLIMIT 1
-+%define HAVE_SLEEP 0
-+%define HAVE_STRERROR_R 1
-+%define HAVE_SYSCONF 1
-+%define HAVE_SYSCTL 0
-+%define HAVE_USLEEP 1
-+%define HAVE_UTGETOSTYPEFROMSTRING 0
-+%define HAVE_VIRTUALALLOC 0
-+%define HAVE_WGLGETPROCADDRESS 0
-+%define HAVE_BCRYPT 0
-+%define HAVE_VAAPI_DRM 0
-+%define HAVE_VAAPI_X11 0
-+%define HAVE_VDPAU_X11 0
-+%define HAVE_PTHREADS 1
-+%define HAVE_OS2THREADS 0
-+%define HAVE_W32THREADS 0
-+%define HAVE_AS_ARCH_DIRECTIVE 0
-+%define HAVE_AS_DN_DIRECTIVE 0
-+%define HAVE_AS_FPU_DIRECTIVE 0
-+%define HAVE_AS_FUNC 0
-+%define HAVE_AS_OBJECT_ARCH 0
-+%define HAVE_ASM_MOD_Q 0
-+%define HAVE_BLOCKS_EXTENSION 0
-+%define HAVE_EBP_AVAILABLE 1
-+%define HAVE_EBX_AVAILABLE 1
-+%define HAVE_GNU_AS 0
-+%define HAVE_GNU_WINDRES 0
-+%define HAVE_IBM_ASM 0
-+%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
-+%define HAVE_INLINE_ASM_LABELS 1
-+%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-+%define HAVE_PRAGMA_DEPRECATED 1
-+%define HAVE_RSYNC_CONTIMEOUT 0
-+%define HAVE_SYMVER_ASM_LABEL 1
-+%define HAVE_SYMVER_GNU_ASM 1
-+%define HAVE_VFP_ARGS 0
-+%define HAVE_XFORM_ASM 0
-+%define HAVE_XMM_CLOBBERS 1
-+%define HAVE_DPI_AWARENESS_CONTEXT 0
-+%define HAVE_IDXGIOUTPUT5 0
-+%define HAVE_KCMVIDEOCODECTYPE_HEVC 0
-+%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
-+%define HAVE_KCMVIDEOCODECTYPE_VP9 0
-+%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0
-+%define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0
-+%define HAVE_SOCKLEN_T 0
-+%define HAVE_STRUCT_ADDRINFO 0
-+%define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-+%define HAVE_STRUCT_IP_MREQ_SOURCE 0
-+%define HAVE_STRUCT_IPV6_MREQ 0
-+%define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-+%define HAVE_STRUCT_POLLFD 0
-+%define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-+%define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
-+%define HAVE_STRUCT_SOCKADDR_IN6 0
-+%define HAVE_STRUCT_SOCKADDR_SA_LEN 0
-+%define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+%define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
-+%define HAVE_GZIP 1
-+%define HAVE_LIBDRM_GETFB2 0
-+%define HAVE_MAKEINFO 1
-+%define HAVE_MAKEINFO_HTML 0
-+%define HAVE_OPENCL_D3D11 0
-+%define HAVE_OPENCL_DRM_ARM 0
-+%define HAVE_OPENCL_DRM_BEIGNET 0
-+%define HAVE_OPENCL_DXVA2 0
-+%define HAVE_OPENCL_VAAPI_BEIGNET 0
-+%define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+%define HAVE_PERL 1
-+%define HAVE_POD2MAN 1
-+%define HAVE_TEXI2HTML 0
-+%define HAVE_XMLLINT 1
-+%define HAVE_ZLIB_GZIP 0
-+%define CONFIG_DOC 0
-+%define CONFIG_HTMLPAGES 0
-+%define CONFIG_MANPAGES 0
-+%define CONFIG_PODPAGES 0
-+%define CONFIG_TXTPAGES 0
-+%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
-+%define CONFIG_AVIO_READING_EXAMPLE 1
-+%define CONFIG_DECODE_AUDIO_EXAMPLE 1
-+%define CONFIG_DECODE_VIDEO_EXAMPLE 1
-+%define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-+%define CONFIG_ENCODE_AUDIO_EXAMPLE 1
-+%define CONFIG_ENCODE_VIDEO_EXAMPLE 1
-+%define CONFIG_EXTRACT_MVS_EXAMPLE 1
-+%define CONFIG_FILTER_AUDIO_EXAMPLE 0
-+%define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-+%define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-+%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 1
-+%define CONFIG_HW_DECODE_EXAMPLE 1
-+%define CONFIG_METADATA_EXAMPLE 1
-+%define CONFIG_MUXING_EXAMPLE 0
-+%define CONFIG_QSVDEC_EXAMPLE 0
-+%define CONFIG_REMUXING_EXAMPLE 1
-+%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-+%define CONFIG_SCALING_VIDEO_EXAMPLE 0
-+%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-+%define CONFIG_TRANSCODING_EXAMPLE 0
-+%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
-+%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-+%define CONFIG_QSV_TRANSCODE_EXAMPLE 0
-+%define CONFIG_AVISYNTH 0
-+%define CONFIG_FREI0R 0
-+%define CONFIG_LIBCDIO 0
-+%define CONFIG_LIBDAVS2 0
-+%define CONFIG_LIBRUBBERBAND 0
-+%define CONFIG_LIBVIDSTAB 0
-+%define CONFIG_LIBX264 0
-+%define CONFIG_LIBX265 0
-+%define CONFIG_LIBXAVS 0
-+%define CONFIG_LIBXAVS2 0
-+%define CONFIG_LIBXVID 0
-+%define CONFIG_DECKLINK 0
-+%define CONFIG_LIBFDK_AAC 0
-+%define CONFIG_LIBTLS 0
-+%define CONFIG_GMP 0
-+%define CONFIG_LIBARIBB24 0
-+%define CONFIG_LIBLENSFUN 0
-+%define CONFIG_LIBOPENCORE_AMRNB 0
-+%define CONFIG_LIBOPENCORE_AMRWB 0
-+%define CONFIG_LIBVO_AMRWBENC 0
-+%define CONFIG_MBEDTLS 0
-+%define CONFIG_RKMPP 0
-+%define CONFIG_LIBSMBCLIENT 0
-+%define CONFIG_CHROMAPRINT 0
-+%define CONFIG_GCRYPT 0
-+%define CONFIG_GNUTLS 0
-+%define CONFIG_JNI 0
-+%define CONFIG_LADSPA 0
-+%define CONFIG_LCMS2 0
-+%define CONFIG_LIBAOM 0