aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2022-08-31 17:47:43 +0000
committerRene Ladan <rene@FreeBSD.org>2022-09-03 08:40:22 +0000
commit89b6c3ce8595f65174312096d44b14a77a12721d (patch)
treeaeb179a19c031f080788f4398d8031e2ad8774b5
parent87bbbd639068fa91f9e8eef7eed3f3959d954273 (diff)
downloadports-89b6c3ce8595f65174312096d44b14a77a12721d.tar.gz
ports-89b6c3ce8595f65174312096d44b14a77a12721d.zip
www/chromium: update to 105.0.5195.52
-rw-r--r--www/chromium/Makefile3
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-BUILD.gn30
-rw-r--r--www/chromium/files/patch-base_BUILD.gn31
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h19
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h6
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc4
-rw-r--r--www/chromium/files/patch-base_base__switches.cc8
-rw-r--r--www/chromium/files/patch-base_base__switches.h6
-rw-r--r--www/chromium/files/patch-base_debug_elf__reader.cc10
-rw-r--r--www/chromium/files/patch-base_debug_stack__trace__posix.cc12
-rw-r--r--www/chromium/files/patch-base_files_dir__reader__linux.h6
-rw-r--r--www/chromium/files/patch-base_files_file__util__posix.cc7
-rw-r--r--www/chromium/files/patch-base_files_file__util__unittest.cc4
-rw-r--r--www/chromium/files/patch-base_linux__util.cc4
-rw-r--r--www/chromium/files/patch-base_message__loop_message__pump__glib.cc6
-rw-r--r--www/chromium/files/patch-base_posix_unix__domain__socket.cc10
-rw-r--r--www/chromium/files/patch-base_process_launch__posix.cc4
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.h30
-rw-r--r--www/chromium/files/patch-base_process_process__metrics__freebsd.cc4
-rw-r--r--www/chromium/files/patch-base_process_process__metrics__posix.cc4
-rw-r--r--www/chromium/files/patch-base_process_process__posix.cc10
-rw-r--r--www/chromium/files/patch-base_profiler_module__cache.cc11
-rw-r--r--www/chromium/files/patch-base_rand__util.h6
-rw-r--r--www/chromium/files/patch-base_rand__util__posix.cc35
-rw-r--r--www/chromium/files/patch-base_system_sys__info.cc20
-rw-r--r--www/chromium/files/patch-base_system_sys__info.h4
-rw-r--r--www/chromium/files/patch-base_system_sys__info__freebsd.cc18
-rw-r--r--www/chromium/files/patch-base_system_sys__info__openbsd.cc12
-rw-r--r--www/chromium/files/patch-base_system_sys__info__posix.cc14
-rw-r--r--www/chromium/files/patch-base_system_sys__info__unittest.cc9
-rw-r--r--www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc6
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread.h6
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__linux.cc32
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__posix.cc14
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__unittest.cc12
-rw-r--r--www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc13
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn40
-rw-r--r--www/chromium/files/patch-build_config_ozone.gni4
-rw-r--r--www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py6
-rw-r--r--www/chromium/files/patch-build_toolchain_gcc__toolchain.gni15
-rw-r--r--www/chromium/files/patch-cc_BUILD.gn6
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main.cc4
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc44
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd17
-rw-r--r--www/chromium/files/patch-chrome_app_settings__strings.grdp6
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc48
-rw-r--r--www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc6
-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_browser__features.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.h4
-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.cc12
-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_chrome__download__manager__delegate.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__commands.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__file__picker.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__item__model.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc31
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h22
-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_extensions_browser__context__keyed__service__factories.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc25
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h20
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_platform__util__linux.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc71
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_process__singleton__posix.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc14
-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_appearance__page_appearance__page.ts10
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css4
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_route.ts4
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html14
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__helper.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__service.cc25
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc37
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc30
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc13
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.h14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc4
-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_opaque__browser__frame__view.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc13
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc18
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc4
-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.cc28
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.h16
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.cc14
-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_extensions_permissions_chrome__permission__message__rules.cc11
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc10
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h8
-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_test_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_updater_app_app__install.cc4
-rw-r--r--www/chromium/files/patch-chrome_updater_updater.cc4
-rw-r--r--www/chromium/files/patch-chrome_updater_util.cc6
-rw-r--r--www/chromium/files/patch-chrome_utility_services.cc8
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc14
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc22
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc20
-rw-r--r--www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc4
-rw-r--r--www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc4
-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_cast__channel_cast__message__util.cc4
-rw-r--r--www/chromium/files/patch-components_crash_core_app_BUILD.gn10
-rw-r--r--www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc10
-rw-r--r--www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc10
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc4
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc4
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.h4
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.h10
-rw-r--r--www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc4
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc6
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc15
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h11
-rw-r--r--www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc6
-rw-r--r--www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc4
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc11
-rw-r--r--www/chromium/files/patch-components_policy_resources_policy__templates.json44
-rw-r--r--www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc19
-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.cc6
-rw-r--r--www/chromium/files/patch-content_app_content__main.cc6
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc16
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc19
-rw-r--r--www/chromium/files/patch-content_browser_download_download__manager__impl.cc6
-rw-r--r--www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.cc10
-rw-r--r--www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h20
-rw-r--r--www/chromium/files/patch-content_browser_media_media__interface__proxy.cc10
-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__message__filter.cc12
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h11
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc30
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h31
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc22
-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_web__contents_web__contents__view__aura.cc8
-rw-r--r--www/chromium/files/patch-content_child_child__process.cc4
-rw-r--r--www/chromium/files/patch-content_common_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_common_font__list__unittest.cc14
-rw-r--r--www/chromium/files/patch-content_common_user__agent.cc15
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc6
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc12
-rw-r--r--www/chromium/files/patch-content_public_browser_render__process__host.h20
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.cc8
-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.cc4
-rw-r--r--www/chromium/files/patch-content_public_test_mock__render__process__host.h11
-rw-r--r--www/chromium/files/patch-content_public_test_mock__render__thread.cc6
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc25
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc19
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h15
-rw-r--r--www/chromium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_shell_app_shell__main__delegate.cc4
-rw-r--r--www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc10
-rw-r--r--www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc4
-rw-r--r--www/chromium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_zygote_zygote__linux.cc4
-rw-r--r--www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni4
-rw-r--r--www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc6
-rw-r--r--www/chromium/files/patch-extensions_browser_extension__prefs.cc4
-rw-r--r--www/chromium/files/patch-extensions_common_api___permission__features.json12
-rw-r--r--www/chromium/files/patch-extensions_common_api_runtime.json12
-rw-r--r--www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc11
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc (renamed from www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc)6
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc (renamed from www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc)16
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc (renamed from www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__gl__texture.cc)8
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc (renamed from www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc)6
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc (renamed from www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc)18
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc (renamed from www/chromium/files/patch-gpu_command__buffer_service_wrapped__sk__image.cc)6
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc6
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc4
-rw-r--r--www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc4
-rw-r--r--www/chromium/files/patch-media_audio_audio__input__device.cc4
-rw-r--r--www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc10
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc16
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h6
-rw-r--r--www/chromium/files/patch-media_base_video__frame.h10
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc8
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h4
-rw-r--r--www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc6
-rw-r--r--www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc4
-rw-r--r--www/chromium/files/patch-media_media__options.gni19
-rw-r--r--www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc22
-rw-r--r--www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc10
-rw-r--r--www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc4
-rw-r--r--www/chromium/files/patch-net_BUILD.gn20
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier.cc12
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier__posix.cc6
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc6
-rw-r--r--www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h4
-rw-r--r--www/chromium/files/patch-net_dns_dns__config__service__posix.cc6
-rw-r--r--www/chromium/files/patch-net_dns_host__resolver__proc.cc4
-rw-r--r--www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc4
-rw-r--r--www/chromium/files/patch-net_http_http__auth__gssapi__posix.h4
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__config__service.cc (renamed from www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc)22
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc8
-rw-r--r--www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h6
-rw-r--r--www/chromium/files/patch-net_url__request_url__fetcher.cc11
-rw-r--r--www/chromium/files/patch-net_url__request_url__fetcher.h11
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context__builder.cc6
-rw-r--r--www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc6
-rw-r--r--www/chromium/files/patch-printing_print__settings__conversion.cc4
-rw-r--r--www/chromium/files/patch-printing_printing__context__linux.cc38
-rw-r--r--www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_policy__watcher.cc11
-rw-r--r--www/chromium/files/patch-remoting_host_remoting__me2me__host.cc29
-rw-r--r--www/chromium/files/patch-remoting_host_setup_start__host__main.cc8
-rw-r--r--www/chromium/files/patch-sandbox_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc16
-rw-r--r--www/chromium/files/patch-services_device_compute__pressure_cpu__probe.cc (renamed from www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc)6
-rw-r--r--www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc4
-rw-r--r--www/chromium/files/patch-services_network_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_network_network__service.cc10
-rw-r--r--www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc11
-rw-r--r--www/chromium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom4
-rw-r--r--www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h6
-rw-r--r--www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h13
-rw-r--r--www/chromium/files/patch-third__party_angle_BUILD.gn26
-rw-r--r--www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp12
-rw-r--r--www/chromium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn11
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp4
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp4
-rw-r--r--www/chromium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn11
-rw-r--r--www/chromium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_public_platform_platform.h11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc16
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc10
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc10
-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_platform_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc11
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json520
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.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_crashpad_crashpad_util_posix_signals.cc4
-rw-r--r--www/chromium/files/patch-third__party_libevent_event.h (renamed from www/chromium/files/patch-base_third__party_libevent_event.h)4
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc4
-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_protobuf_src_google_protobuf_arenastring.cc12
-rw-r--r--www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h4
-rw-r--r--www/chromium/files/patch-third__party_ruy_BUILD.gn11
-rw-r--r--www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c6
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_System_SharedLibrary.hpp11
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_Vulkan_BUILD.gn13
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn25
-rw-r--r--www/chromium/files/patch-third__party_tflite_features.gni10
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h11
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h16
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h19
-rw-r--r--www/chromium/files/patch-third__party_webrtc_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc4
-rw-r--r--www/chromium/files/patch-tools_generate__stubs_rules.gni4
-rw-r--r--www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py4
-rw-r--r--www/chromium/files/patch-ui_aura_screen__ozone.cc31
-rw-r--r--www/chromium/files/patch-ui_aura_screen__ozone.h59
-rw-r--r--www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc4
-rw-r--r--www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h4
-rw-r--r--www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc4
-rw-r--r--www/chromium/files/patch-ui_base_ime_fake__text__input__client.h4
-rw-r--r--www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc31
-rw-r--r--www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc20
-rw-r--r--www/chromium/files/patch-ui_base_ime_text__input__client.h4
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.cc6
-rw-r--r--www/chromium/files/patch-ui_base_webui_web__ui__util.cc4
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc11
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__cursor__factory.h20
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc31
-rw-r--r--www/chromium/files/patch-ui_base_x_x11__util.h13
-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_display_screen.cc31
-rw-r--r--www/chromium/files/patch-ui_display_screen.h56
-rw-r--r--www/chromium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gfx_font__fallback__linux.cc4
-rw-r--r--www/chromium/files/patch-ui_gfx_font__render__params__linux.cc20
-rw-r--r--www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h8
-rw-r--r--www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc6
-rw-r--r--www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h11
-rw-r--r--www/chromium/files/patch-ui_gfx_platform__font__skia.cc20
-rw-r--r--www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc41
-rw-r--r--www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc20
-rw-r--r--www/chromium/files/patch-ui_gl_generate__bindings.py4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__context.cc4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc8
-rw-r--r--www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc20
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.h11
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc11
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc40
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h54
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc43
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h35
-rw-r--r--www/chromium/files/patch-ui_ozone_public_platform__screen.cc18
-rw-r--r--www/chromium/files/patch-ui_ozone_public_platform__screen.h35
-rw-r--r--www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h6
-rw-r--r--www/chromium/files/patch-ui_views_controls_prefix__selector.cc4
-rw-r--r--www/chromium/files/patch-ui_views_controls_prefix__selector.h4
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.cc48
-rw-r--r--www/chromium/files/patch-ui_views_controls_textfield_textfield.h13
-rw-r--r--www/chromium/files/patch-ui_views_focus_focus__manager.cc6
-rw-r--r--www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc11
-rw-r--r--www/chromium/files/patch-ui_views_linux__ui_linux__ui.h20
-rw-r--r--www/chromium/files/patch-ui_views_style_platform__style.cc20
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h4
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc15
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc4
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.cc6
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.h11
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn8
-rw-r--r--www/chromium/files/patch-v8_src_api_api.cc4
-rw-r--r--www/chromium/files/patch-v8_src_base_platform_platform-posix.cc6
-rw-r--r--www/chromium/files/patch-v8_src_objects_simd.cc99
-rw-r--r--www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h32
374 files changed, 2252 insertions, 2116 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index dfcae40c7090..8d4cdb35057b 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 104.0.5112.101
+PORTVERSION= 105.0.5195.52
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
@@ -110,6 +110,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_freetype=false \
use_system_harfbuzz=true \
use_system_libjpeg=true \
+ use_system_libwayland=true \
use_system_wayland_scanner=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS}" \
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index c75fcb8d26d5..a0316463f879 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1660719568
-SHA256 (chromium-104.0.5112.101.tar.xz) = 60f015e1559de4044cdfa3bdc1f8fde535927c8ab15b0959ccc9b6feec832f5b
-SIZE (chromium-104.0.5112.101.tar.xz) = 1510110428
-SHA256 (chrome-linux-104.0.5112.101-llvm13.profdata.tar.xz) = 8fe3066b129724a187ffc4d0d02ede643b80d466d45fe270e2074f6b098790b0
-SIZE (chrome-linux-104.0.5112.101-llvm13.profdata.tar.xz) = 24584836
-SHA256 (chromium-104.0.5112.101-testdata.tar.xz) = 77f7da315f1a37983083c3f24c16da035d3da6a667db32cfd6edba6546344a31
-SIZE (chromium-104.0.5112.101-testdata.tar.xz) = 264016568
+TIMESTAMP = 1661937622
+SHA256 (chromium-105.0.5195.52.tar.xz) = dc71b2be9c30c2a7a250b3dbfb26f9b0d1aa2df7335b53ed44a203ff69947c42
+SIZE (chromium-105.0.5195.52.tar.xz) = 1597749968
+SHA256 (chrome-linux-105.0.5195.52-llvm13.profdata.tar.xz) = be6371fbfe9949ee56c8ba5c45c2e3d31c36c153e035b89d4bbda4e35077c8c2
+SIZE (chrome-linux-105.0.5195.52-llvm13.profdata.tar.xz) = 24879272
+SHA256 (chromium-105.0.5195.52-testdata.tar.xz) = 486fe655cfc8a4210598f4797fbbc603a8783702c50b5c3a9badd3a179ba9106
+SIZE (chromium-105.0.5195.52-testdata.tar.xz) = 264061000
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 c6627a923546..a6357f969e30 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2022-07-22 17:30:31 UTC
+--- BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ BUILD.gn
-@@ -54,7 +54,7 @@ declare_args() {
+@@ -53,7 +53,7 @@ declare_args() {
root_extra_deps = []
}
@@ -9,15 +9,15 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -86,7 +86,6 @@ group("gn_all") {
+@@ -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",
- "//services/service_manager/public/cpp",
-@@ -446,7 +445,7 @@ group("gn_all") {
+@@ -435,7 +434,7 @@ group("gn_all") {
]
}
@@ -26,8 +26,8 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
-@@ -635,6 +634,15 @@ group("gn_all") {
- }
+@@ -624,6 +623,15 @@ group("gn_all") {
+ deps += [ "//gpu/tools/compositor_model_bench" ]
}
+ if (is_bsd) {
@@ -42,7 +42,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
-@@ -683,7 +691,7 @@ group("gn_all") {
+@@ -672,7 +680,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1184,7 +1192,7 @@ if (!is_ios) {
+@@ -1187,7 +1195,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -60,7 +60,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1193,7 +1201,7 @@ if (!is_ios) {
+@@ -1196,7 +1204,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -69,12 +69,12 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1592,7 +1600,7 @@ group("chromium_builder_perf") {
+@@ -1645,7 +1653,7 @@ group("chromium_builder_perf") {
+ data_deps += [ "//chrome/test:performance_browser_tests" ]
+ }
- if (is_win) {
- data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
-- } else {
-+ } else if (!is_bsd) {
+- if (!is_win) {
++ if (!is_win && !is_bsd) {
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index e5a50d632c33..9ca1c2331d10 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,15 @@
---- base/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+--- base/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ base/BUILD.gn
-@@ -1001,7 +1001,7 @@ mixed_component("base") {
+@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") {
+ flags = [ "CRONET_BUILD=$is_cronet_build" ]
+ }
+
+-enable_message_pump_epoll = is_linux || is_chromeos || is_android
++enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd
+ buildflag_header("message_pump_buildflags") {
+ header = "message_pump_buildflags.h"
+ header_dir = "base/message_loop"
+@@ -1014,7 +1014,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@@ -9,7 +18,7 @@
sources += [
"profiler/stack_copier_signal.cc",
"profiler/stack_copier_signal.h",
-@@ -1010,6 +1010,12 @@ mixed_component("base") {
+@@ -1023,6 +1023,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@@ -22,7 +31,7 @@
}
if (is_win) {
-@@ -1496,11 +1502,23 @@ mixed_component("base") {
+@@ -1507,11 +1513,23 @@ mixed_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.
@@ -47,7 +56,7 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
-@@ -1528,7 +1546,7 @@ mixed_component("base") {
+@@ -1539,7 +1557,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -56,7 +65,7 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1584,7 +1602,7 @@ mixed_component("base") {
+@@ -1595,7 +1613,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -65,7 +74,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2165,6 +2183,42 @@ mixed_component("base") {
+@@ -2183,6 +2201,42 @@ mixed_component("base") {
}
}
@@ -108,7 +117,7 @@
# iOS
if (is_ios) {
sources -= [
-@@ -3467,7 +3521,7 @@ test("base_unittests") {
+@@ -3496,7 +3550,7 @@ test("base_unittests") {
}
}
@@ -117,7 +126,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3514,7 +3568,7 @@ test("base_unittests") {
+@@ -3543,7 +3597,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -126,7 +135,7 @@
sources += [
"profiler/stack_copier_signal_unittest.cc",
"profiler/thread_delegate_posix_unittest.cc",
-@@ -3524,7 +3578,7 @@ test("base_unittests") {
+@@ -3553,7 +3607,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -135,7 +144,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3712,7 +3766,7 @@ test("base_unittests") {
+@@ -3741,7 +3795,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
index bd41b2b9b998..1d14687939fd 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-05-19 14:06:27 UTC
+--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-08-31 12:19:35 UTC
+++ base/allocator/partition_allocator/page_allocator_constants.h
@@ -24,7 +24,7 @@
// elimination.
@@ -12,13 +12,13 @@
@@ -79,7 +79,7 @@ PageAllocationGranularityShift() {
return 14; // 16kB
#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
- return vm_page_shift;
+ return static_cast<size_t>(vm_page_shift);
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
// page sizes. Retrieve from or initialize cache.
- int shift = page_characteristics.shift.load(std::memory_order_relaxed);
-@@ -99,7 +99,7 @@ PageAllocationGranularity() {
+ size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
+@@ -100,7 +100,7 @@ PageAllocationGranularity() {
// This is literally equivalent to |1 << PageAllocationGranularityShift()|
// below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
return vm_page_size;
@@ -26,4 +26,13 @@
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
// arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
// initialize cache.
- int size = page_characteristics.size.load(std::memory_order_relaxed);
+ size_t size = page_characteristics.size.load(std::memory_order_relaxed);
+@@ -139,7 +139,7 @@ SystemPageShift() {
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
+ SystemPageSize() {
+ #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
+- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
+ // This is literally equivalent to |1 << SystemPageShift()| below, but was
+ // separated out for 64-bit IS_APPLE and arm64 on Linux to avoid << on a
+ // non-constexpr.
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
index ba8125fd0062..5ba98fe032f3 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-07-22 17:30:31 UTC
+--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-08-31 12:19:35 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
-@@ -234,7 +234,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
+@@ -233,7 +233,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_ = 0;
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
index ea17eb2ddaca..df44ff1d52bf 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-07-22 17:30:31 UTC
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-08-31 12:19:35 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -96,7 +96,7 @@ PartitionPageShift() {
+@@ -91,7 +91,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
@@ -9,7 +9,7 @@
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
-@@ -252,7 +252,7 @@ constexpr size_t kSuperPageBaseMask = ~kSuperPageOffse
+@@ -247,7 +247,7 @@ constexpr size_t kSuperPageBaseMask = ~kSuperPageOffse
#if defined(PA_HAS_64_BITS_POINTERS)
// The Configurable Pool is only available in 64-bit mode
constexpr size_t kNumPools = 3;
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 a46d0c1a9f27..a788aa40be35 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2022-07-22 17:30:31 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2022-08-31 12:19:35 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -33,7 +33,7 @@
#include "wow64apiset.h"
@@ -27,7 +27,7 @@
// It's better for slot_usage to be stack-allocated and fixed-size, which
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -655,7 +655,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -652,7 +652,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_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc
index 59678d7551d9..8e449113ec69 100644
--- a/www/chromium/files/patch-base_base__switches.cc
+++ b/www/chromium/files/patch-base_base__switches.cc
@@ -1,4 +1,4 @@
---- base/base_switches.cc.orig 2022-02-28 16:54:41 UTC
+--- base/base_switches.cc.orig 2022-08-31 12:19:35 UTC
+++ base/base_switches.cc
@@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
@@ -6,6 +6,6 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Controls whether or not retired instruction counts are surfaced for threads
- // in trace events on Linux.
- //
+ // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
+ // Crashpad is fully enabled on Linux. Indicates that Crashpad should be
+ // enabled.
diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h
index 8b90f08b6a9e..a2effa2e495d 100644
--- a/www/chromium/files/patch-base_base__switches.h
+++ b/www/chromium/files/patch-base_base__switches.h
@@ -1,4 +1,4 @@
---- base/base_switches.h.orig 2022-02-28 16:54:41 UTC
+--- base/base_switches.h.orig 2022-08-31 12:19:35 UTC
+++ base/base_switches.h
@@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[];
extern const char kForceFieldTrialParams[];
@@ -6,6 +6,6 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- extern const char kEnableThreadInstructionCount[];
-
// TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
+ // Crashpad is fully enabled on Linux.
+ extern const char kEnableCrashpad[];
diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc
index 21904ae7ca00..d64763186791 100644
--- a/www/chromium/files/patch-base_debug_elf__reader.cc
+++ b/www/chromium/files/patch-base_debug_elf__reader.cc
@@ -1,6 +1,6 @@
---- base/debug/elf_reader.cc.orig 2022-02-07 13:39:41 UTC
+--- base/debug/elf_reader.cc.orig 2022-08-31 12:19:35 UTC
+++ base/debug/elf_reader.cc
-@@ -76,6 +76,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
bool found = false;
while (current_section < section_end) {
current_note = reinterpret_cast<const Nhdr*>(current_section);
@@ -8,11 +8,11 @@
if (current_note->n_type == NT_GNU_BUILD_ID) {
StringPiece note_name(current_section + sizeof(Nhdr),
current_note->n_namesz);
-@@ -85,6 +86,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
+@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
break;
}
}
+#endif
- size_t section_size = bits::AlignUp(current_note->n_namesz, 4) +
- bits::AlignUp(current_note->n_descsz, 4) +
+ size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) +
+ bits::AlignUp(current_note->n_descsz, 4u) +
diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
index f53bb3e100d4..a08b8d7d1709 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,6 +1,6 @@
---- base/debug/stack_trace_posix.cc.orig 2022-03-25 21:59:56 UTC
+--- base/debug/stack_trace_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/debug/stack_trace_posix.cc
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
#include <AvailabilityMacros.h>
#endif
@@ -9,7 +9,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -695,6 +695,9 @@ class SandboxSymbolizeHelper {
+@@ -698,6 +698,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
@@ -19,7 +19,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
-@@ -712,6 +715,7 @@ class SandboxSymbolizeHelper {
+@@ -715,6 +718,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;
@@ -27,7 +27,7 @@
}
// Opens all object files and caches their file descriptors.
-@@ -868,7 +872,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
+@@ -871,7 +875,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
// If we do not have unwind tables, then try tracing using frame pointers.
return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
count, 0);
@@ -35,4 +35,4 @@
+#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
// Though the backtrace API man page does not list any possible negative
// return values, we take no chance.
- return base::saturated_cast<size_t>(backtrace(trace, count));
+ return base::saturated_cast<size_t>(
diff --git a/www/chromium/files/patch-base_files_dir__reader__linux.h b/www/chromium/files/patch-base_files_dir__reader__linux.h
index 82ff9a17eb2e..91bc1897532e 100644
--- a/www/chromium/files/patch-base_files_dir__reader__linux.h
+++ b/www/chromium/files/patch-base_files_dir__reader__linux.h
@@ -1,4 +1,4 @@
---- base/files/dir_reader_linux.h.orig 2022-06-18 05:49:12 UTC
+--- base/files/dir_reader_linux.h.orig 2022-08-31 12:19:35 UTC
+++ base/files/dir_reader_linux.h
@@ -16,10 +16,16 @@
#include "base/logging.h"
@@ -32,8 +32,8 @@
+#if BUILDFLAG(IS_BSD)
+ const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_));
+#else
- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
+ const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
+#endif
if (r == 0)
return false;
- if (r == -1) {
+ if (r < 0) {
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index 5fafd41cb66a..b932d5c3169d 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,15 +1,12 @@
---- base/files/file_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+--- base/files/file_util_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/files/file_util_posix.cc
-@@ -696,32 +696,37 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -700,32 +700,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
+ const FilePath kFileSystemRoot("/");
std::vector<FilePath> subpaths;
-+ if (DirectoryExists(full_path))
-+ return true;
-+
// Collect a list of all parent directories.
FilePath last_path = full_path;
- subpaths.push_back(full_path);
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 cbc96b4a9d6f..4448278044cf 100644
--- a/www/chromium/files/patch-base_files_file__util__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -1,4 +1,4 @@
---- base/files/file_util_unittest.cc.orig 2022-06-17 14:20:10 UTC
+--- base/files/file_util_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ base/files/file_util_unittest.cc
@@ -3522,7 +3522,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
@@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
-@@ -4238,7 +4238,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4245,7 +4245,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc
index 1f949df12ab0..c4b5ebcf6394 100644
--- a/www/chromium/files/patch-base_linux__util.cc
+++ b/www/chromium/files/patch-base_linux__util.cc
@@ -1,4 +1,4 @@
---- base/linux_util.cc.orig 2022-05-19 14:06:27 UTC
+--- base/linux_util.cc.orig 2022-08-31 12:19:35 UTC
+++ base/linux_util.cc
@@ -15,6 +15,7 @@
@@ -18,7 +18,7 @@
// 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
char buf[25];
strings::SafeSPrintf(buf, "/proc/%d/task", pid);
-@@ -154,6 +158,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
+@@ -152,6 +156,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
}
return true;
diff --git a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc
index 047712904c6f..6734d01e8bf0 100644
--- a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc
+++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc
@@ -1,4 +1,4 @@
---- base/message_loop/message_pump_glib.cc.orig 2022-02-28 16:54:41 UTC
+--- base/message_loop/message_pump_glib.cc.orig 2022-08-31 12:19:35 UTC
+++ base/message_loop/message_pump_glib.cc
@@ -8,6 +8,11 @@
#include <glib.h>
@@ -10,9 +10,9 @@
+#endif
+
#include "base/logging.h"
+ #include "base/memory/raw_ptr.h"
#include "base/notreached.h"
- #include "base/numerics/safe_conversions.h"
-@@ -50,9 +55,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti
+@@ -51,9 +56,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti
}
bool RunningOnMainThread() {
diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc
index 9fac90a4accf..1ae00278ecd3 100644
--- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc
@@ -1,6 +1,6 @@
---- base/posix/unix_domain_socket.cc.orig 2022-02-28 16:54:41 UTC
+--- base/posix/unix_domain_socket.cc.orig 2022-08-31 12:19:35 UTC
+++ base/posix/unix_domain_socket.cc
-@@ -50,7 +50,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
+@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
// static
bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
@@ -9,7 +9,7 @@
const int enable = 1;
return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
#else
-@@ -140,7 +140,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
+@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
const size_t kControlBufferSize =
CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
@@ -18,7 +18,7 @@
// macOS does not support ucred.
// macOS supports xucred, but this structure is insufficient.
+ CMSG_SPACE(sizeof(struct ucred))
-@@ -168,7 +168,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
+@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
wire_fds_len = payload_len / sizeof(int);
}
@@ -27,7 +27,7 @@
// macOS does not support SCM_CREDENTIALS.
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDENTIALS) {
-@@ -202,6 +202,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
+@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
socklen_t pid_size = sizeof(pid);
if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0)
pid = -1;
diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc
index 137785dd2f2b..656ff7be03d3 100644
--- a/www/chromium/files/patch-base_process_launch__posix.cc
+++ b/www/chromium/files/patch-base_process_launch__posix.cc
@@ -1,6 +1,6 @@
---- base/process/launch_posix.cc.orig 2022-06-17 14:20:10 UTC
+--- base/process/launch_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/process/launch_posix.cc
-@@ -63,6 +63,9 @@
+@@ -64,6 +64,9 @@
#error "macOS should use launch_mac.cc"
#endif
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index 79286ab92b7d..dfd8f228a00e 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,6 +1,6 @@
---- base/process/process_metrics.h.orig 2022-06-17 14:20:10 UTC
+--- base/process/process_metrics.h.orig 2022-08-31 12:19:35 UTC
+++ base/process/process_metrics.h
-@@ -35,7 +35,7 @@
+@@ -36,7 +36,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
#include <vector>
-@@ -51,7 +51,7 @@ class Value;
+@@ -52,7 +52,7 @@ class Value;
// Full declaration is in process_metrics_iocounters.h.
struct IoCounters;
@@ -18,7 +18,7 @@
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
-@@ -106,7 +106,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -107,7 +107,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@@ -27,7 +27,7 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
-@@ -154,7 +154,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -36,7 +36,7 @@
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
// Threads that have already terminated will not be reported. Thus, the sum of
-@@ -237,7 +237,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // BUILDFLAG(IS_POSIX)
@@ -45,7 +45,7 @@
// Bytes of swap as reported by /proc/[pid]/status.
uint64_t GetVmSwapBytes() const;
-@@ -258,7 +258,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -54,16 +54,16 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
-@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- CPU::CoreType GetCoreType(int core_index);
+ CPU::CoreType GetCoreType(uint32_t core_index);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
-@@ -293,7 +293,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -294,7 +294,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -72,7 +72,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
-@@ -336,7 +336,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -337,7 +337,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -81,7 +81,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -371,7 +371,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -372,7 +372,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -90,7 +90,7 @@
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
-@@ -386,7 +386,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -387,7 +387,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -99,7 +99,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -423,7 +423,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -108,7 +108,7 @@
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
// Exposed for testing.
-@@ -610,7 +610,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -611,7 +611,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;
diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
index 6e1f650925be..33b263a8c1fd 100644
--- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics_freebsd.cc.orig 2022-04-21 18:48:31 UTC
+--- base/process/process_metrics_freebsd.cc.orig 2022-09-01 05:13:41 UTC
+++ base/process/process_metrics_freebsd.cc
@@ -3,20 +3,39 @@
// found in the LICENSE file.
@@ -70,7 +70,7 @@
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
}
-+int GetNumberOfThreads(ProcessHandle process) {
++int64_t GetNumberOfThreads(ProcessHandle process) {
+ // Taken from FreeBSD top (usr.bin/top/machine.c)
+
+ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
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 e51334a26d54..9cd1a72c8e2a 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-02-28 16:54:41 UTC
+--- base/process/process_metrics_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/process/process_metrics_posix.cc
@@ -20,6 +20,8 @@
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -135,7 +137,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_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc
index 4f9205302896..9872810a9d99 100644
--- a/www/chromium/files/patch-base_process_process__posix.cc
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_posix.cc.orig 2022-07-22 17:30:31 UTC
+--- base/process/process_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/process/process_posix.cc
@@ -25,10 +25,15 @@
#include "build/build_config.h"
@@ -17,7 +17,7 @@
#if BUILDFLAG(CLANG_PROFILING)
#include "base/test/clang_profiling.h"
#endif
-@@ -97,7 +102,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
+@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
return ret_pid > 0;
}
@@ -26,7 +26,7 @@
// Using kqueue on Mac so that we can wait on non-child processes.
// We can't use kqueues on child processes because we need to reap
// our own children using wait.
-@@ -202,7 +207,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
+@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
const bool exited = (parent_pid < 0);
if (!exited && parent_pid != our_pid) {
@@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
-@@ -379,7 +384,55 @@ void Process::Exited(int exit_code) const {
+@@ -392,7 +397,55 @@ void Process::Exited(int exit_code) const {
int Process::GetPriority() const {
DCHECK(IsValid());
@@ -43,7 +43,7 @@
+#if defined(OS_BSD)
+ return 0;
+#else
- return getpriority(PRIO_PROCESS, process_);
+ return getpriority(PRIO_PROCESS, static_cast<id_t>(process_));
+#endif
+}
+
diff --git a/www/chromium/files/patch-base_profiler_module__cache.cc b/www/chromium/files/patch-base_profiler_module__cache.cc
new file mode 100644
index 000000000000..49e9bebdb59d
--- /dev/null
+++ b/www/chromium/files/patch-base_profiler_module__cache.cc
@@ -0,0 +1,11 @@
+--- base/profiler/module_cache.cc.orig 2022-08-31 12:19:35 UTC
++++ base/profiler/module_cache.cc
+@@ -34,7 +34,7 @@ struct ModuleAddressCompare {
+
+ std::string TransformModuleIDToBreakpadFormat(StringPiece module_id) {
+ std::string mangled_id(module_id);
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Linux ELF module IDs are 160bit integers, which we need to mangle
+ // down to 128bit integers to match the id that Breakpad outputs.
+ // Example on version '66.0.3359.170' x64:
diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h
index 7dbf39ebe0ba..9aac9f670070 100644
--- a/www/chromium/files/patch-base_rand__util.h
+++ b/www/chromium/files/patch-base_rand__util.h
@@ -1,11 +1,11 @@
---- base/rand_util.h.orig 2022-03-25 21:59:56 UTC
+--- base/rand_util.h.orig 2022-08-31 12:19:35 UTC
+++ base/rand_util.h
-@@ -81,7 +81,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -80,7 +80,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}
-#if BUILDFLAG(IS_POSIX)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_BSD)
BASE_EXPORT int GetUrandomFD();
#endif
diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc
index ce4eedbcb4ee..668c63d52569 100644
--- a/www/chromium/files/patch-base_rand__util__posix.cc
+++ b/www/chromium/files/patch-base_rand__util__posix.cc
@@ -1,7 +1,7 @@
---- base/rand_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+--- base/rand_util_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/rand_util_posix.cc
-@@ -17,7 +17,7 @@
- #include "base/posix/eintr_wrapper.h"
+@@ -22,7 +22,7 @@
+ #include "base/time/time.h"
#include "build/build_config.h"
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
@@ -9,31 +9,36 @@
#include "third_party/lss/linux_syscall_support.h"
#elif BUILDFLAG(IS_MAC)
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
-@@ -34,6 +34,7 @@ static constexpr int kOpenFlags = O_RDONLY;
+@@ -39,6 +39,7 @@ static constexpr int kOpenFlags = O_RDONLY;
static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC;
#endif
-+#if !BUILDFLAG(IS_OPENBSD)
++#if !BUILDFLAG(IS_BSD)
// We keep the file descriptor for /dev/urandom around so we don't need to
// reopen it (which is expensive), and since we may not even be able to reopen
// it if we are later put in a sandbox. This class wraps the file descriptor so
-@@ -51,6 +52,7 @@ class URandomFd {
+@@ -56,10 +57,11 @@ class URandomFd {
private:
const int fd_;
};
+#endif
- } // namespace
-
-@@ -62,6 +64,7 @@ namespace base {
+ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+ BUILDFLAG(IS_ANDROID)) && \
+- !BUILDFLAG(IS_NACL)
++ !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
+ // TODO(pasko): Unify reading kernel version numbers in:
+ // mojo/core/channel_linux.cc
+ // chrome/browser/android/seccomp_support_detector.cc
+@@ -144,6 +146,7 @@ void ConfigureRandBytesFieldTrial() {
// (https://chromium-review.googlesource.com/c/chromium/src/+/1545096) and land
// it or some form of it.
void RandBytes(void* output, size_t output_length) {
-+#if !BUILDFLAG(IS_OPENBSD)
- #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
- // We have to call `getrandom` via Linux Syscall Support, rather than through
- // the libc wrapper, because we might not have an up-to-date libc (e.g. on
-@@ -91,11 +94,16 @@ void RandBytes(void* output, size_t output_length) {
++#if !BUILDFLAG(IS_BSD)
+ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+ BUILDFLAG(IS_ANDROID)) && \
+ !BUILDFLAG(IS_NACL)
+@@ -172,11 +175,16 @@ void RandBytes(void* output, size_t output_length) {
const bool success =
ReadFromFD(urandom_fd, static_cast<char*>(output), output_length);
CHECK(success);
@@ -42,7 +47,7 @@
+#endif
}
-+#if !BUILDFLAG(IS_OPENBSD)
++#if !BUILDFLAG(IS_BSD)
int GetUrandomFD() {
static NoDestructor<URandomFd> urandom_fd;
return urandom_fd->fd();
diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc
index a9affa23e4ae..84cc358951eb 100644
--- a/www/chromium/files/patch-base_system_sys__info.cc
+++ b/www/chromium/files/patch-base_system_sys__info.cc
@@ -1,11 +1,11 @@
---- base/system/sys_info.cc.orig 2022-06-17 14:20:10 UTC
+--- base/system/sys_info.cc.orig 2022-08-31 12:19:35 UTC
+++ base/system/sys_info.cc
-@@ -103,7 +103,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
- base::ThreadPool::PostTaskAndReplyWithResult(
- FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- base::ThreadPool::PostTaskAndReplyWithResult(
- FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync),
- std::move(callback));
+@@ -101,7 +101,7 @@ std::string SysInfo::HardwareModelName() {
+ #endif
+
+ void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ constexpr base::TaskTraits kTraits = {base::MayBlock()};
+ #else
+ constexpr base::TaskTraits kTraits = {};
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index cd89561cd4d8..13de608eee31 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,4 +1,4 @@
---- base/system/sys_info.h.orig 2022-06-17 14:20:10 UTC
+--- base/system/sys_info.h.orig 2022-08-31 12:19:35 UTC
+++ base/system/sys_info.h
@@ -211,6 +211,8 @@ class BASE_EXPORT SysInfo {
// On Desktop this returns true when memory <= 2GB.
@@ -15,6 +15,6 @@
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
- static int64_t AmountOfAvailablePhysicalMemory(
+ static uint64_t AmountOfAvailablePhysicalMemory(
const SystemMemoryInfoKB& meminfo);
#endif
diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
index 99ff948c012b..81e026100278 100644
--- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_freebsd.cc.orig 2022-04-21 18:48:31 UTC
+--- base/system/sys_info_freebsd.cc.orig 2022-09-01 17:22:07 UTC
+++ base/system/sys_info_freebsd.cc
@@ -9,30 +9,106 @@
#include <sys/sysctl.h>
@@ -9,6 +9,8 @@
namespace base {
+-int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
+- int pages, page_size;
+int SysInfo::NumberOfProcessors() {
+ int mib[] = {CTL_HW, HW_NCPU};
+ int ncpu;
@@ -20,8 +22,7 @@
+ return ncpu;
+}
+
- int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
-- int pages, page_size;
++uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
+ int pages, page_size, r = 0;
size_t size = sizeof(pages);
- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
@@ -37,11 +38,12 @@
NOTREACHED();
return 0;
}
+- return static_cast<int64_t>(pages) * page_size;
+
- return static_cast<int64_t>(pages) * page_size;
++ return static_cast<uint64_t>(pages) * page_size;
}
-+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
++uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
+ int page_size, r = 0;
+ unsigned int pgfree, pginact, pgcache;
+ size_t size = sizeof(page_size);
@@ -61,12 +63,12 @@
+ return 0;
+ }
+
-+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
++ return static_cast<uint64_t>((pgfree + pginact + pgcache) * page_size);
+}
+
// static
-+int64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) {
-+ int64_t res_kb = info.available != 0
++uint64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) {
++ uint64_t res_kb = info.available != 0
+ ? info.available - info.active_file
+ : info.free + info.reclaimable + info.inactive_file;
+ return res_kb * 1024;
diff --git a/www/chromium/files/patch-base_system_sys__info__openbsd.cc b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
index 54d7442406af..4e9997823827 100644
--- a/www/chromium/files/patch-base_system_sys__info__openbsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_openbsd.cc.orig 2022-04-21 18:48:31 UTC
+--- base/system/sys_info_openbsd.cc.orig 2022-08-31 12:19:35 UTC
+++ base/system/sys_info_openbsd.cc
@@ -11,6 +11,7 @@
#include <sys/sysctl.h>
@@ -8,7 +8,7 @@
namespace {
-@@ -28,9 +29,15 @@ int64_t AmountOfMemory(int pages_name) {
+@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) {
namespace base {
@@ -25,10 +25,10 @@
int ncpu;
size_t size = sizeof(ncpu);
if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
-@@ -42,10 +49,26 @@ int SysInfo::NumberOfProcessors() {
+@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() {
// static
- int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
+ uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
- return AmountOfMemory(_SC_PHYS_PAGES);
+ // pledge(2)
+ if (!aofpmem)
@@ -50,10 +50,10 @@
+}
+
+// static
- int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
+ uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
// We should add inactive file-backed memory also but there is no such
// information from OpenBSD unfortunately.
-@@ -57,23 +80,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
+@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
size_t limit;
size_t size = sizeof(limit);
diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc
index a27e4ff85693..35b8b9b0d889 100644
--- a/www/chromium/files/patch-base_system_sys__info__posix.cc
+++ b/www/chromium/files/patch-base_system_sys__info__posix.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_posix.cc.orig 2022-06-17 14:20:10 UTC
+--- base/system/sys_info_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/system/sys_info_posix.cc
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@
namespace {
@@ -9,16 +9,16 @@
int NumberOfProcessors() {
// sysconf returns the number of "logical" (not "physical") processors on both
// Mac and Linux. So we get the number of max available "logical" processors.
-@@ -76,7 +76,7 @@ int NumberOfProcessors() {
+@@ -77,7 +77,7 @@ int NumberOfProcessors() {
base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
-#endif // !BUILDFLAG(IS_OPENBSD)
+#endif // !BUILDFLAG(IS_BSD)
- int64_t AmountOfVirtualMemory() {
+ uint64_t AmountOfVirtualMemory() {
struct rlimit limit;
-@@ -142,11 +142,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
+@@ -144,11 +144,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
namespace base {
@@ -31,8 +31,8 @@
+#endif // !BUILDFLAG(IS_BSD)
// static
- int64_t SysInfo::AmountOfVirtualMemory() {
-@@ -236,6 +236,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+ uint64_t SysInfo::AmountOfVirtualMemory() {
+@@ -238,6 +238,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
arch = "x86";
} else if (arch == "amd64") {
arch = "x86_64";
diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc
index f7c662a4e82e..23d8386cb560 100644
--- a/www/chromium/files/patch-base_system_sys__info__unittest.cc
+++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc
@@ -1,11 +1,12 @@
---- base/system/sys_info_unittest.cc.orig 2022-06-17 14:20:10 UTC
+--- base/system/sys_info_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ base/system/sys_info_unittest.cc
-@@ -233,12 +233,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
+@@ -234,12 +234,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
bool empty_result_expected =
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \
-- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) |
++ BUILDFLAG(IS_BSD)
false;
#else
true;
diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
index 18a649f3ba84..abb639bc986d 100644
--- a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
+++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc
@@ -1,11 +1,11 @@
---- base/task/thread_pool/environment_config_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- base/task/thread_pool/environment_config_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ base/task/thread_pool/environment_config_unittest.cc
@@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
- EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread());
+ EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread());
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
- EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread());
+ EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread());
#else
#error Platform doesn't match any block
diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h
index c871da786e1f..213431093414 100644
--- a/www/chromium/files/patch-base_threading_platform__thread.h
+++ b/www/chromium/files/patch-base_threading_platform__thread.h
@@ -1,11 +1,11 @@
---- base/threading/platform_thread.h.orig 2022-07-22 17:30:31 UTC
+--- base/threading/platform_thread.h.orig 2022-08-31 12:19:35 UTC
+++ base/threading/platform_thread.h
-@@ -213,7 +213,7 @@ class BASE_EXPORT PlatformThread {
+@@ -249,7 +249,7 @@ class BASE_EXPORT PlatformThread {
// Returns a realtime period provided by `delegate`.
static TimeDelta GetRealtimePeriod(Delegate* delegate);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Toggles a specific thread's priority at runtime. This can be used to
+ // Toggles a specific thread's type at runtime. This can be used to
// change the priority of a thread in a different process and will fail
// if the calling process does not have proper permissions. The
diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
index d10b804f030b..ed2cf1404bbe 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_linux.cc.orig 2022-06-17 14:20:10 UTC
+--- base/threading/platform_thread_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ base/threading/platform_thread_linux.cc
@@ -29,7 +29,9 @@
@@ -10,7 +10,7 @@
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
-@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid,
+@@ -132,7 +134,7 @@ long sched_setattr(pid_t pid,
#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -19,7 +19,7 @@
const FilePath::CharType kCgroupDirectory[] =
FILE_PATH_LITERAL("/sys/fs/cgroup");
-@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
+@@ -303,7 +305,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th
namespace internal {
namespace {
@@ -28,34 +28,34 @@
const struct sched_param kRealTimePrio = {8};
#endif
} // namespace
-@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
+@@ -328,7 +330,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue
};
- bool CanSetThreadPriorityToRealtimeAudio() {
+ bool CanSetThreadTypeToRealtimeAudio() {
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
- // pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
+ // pthread_setschedparam in SetCurrentThreadTypeForPlatform().
struct rlimit rlim;
-@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
- }
+@@ -340,7 +342,7 @@ bool CanSetThreadTypeToRealtimeAudio() {
- bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) {
+ bool SetCurrentThreadTypeForPlatform(ThreadType thread_type,
+ MessagePumpType pump_type_hint) {
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
// For legacy schedtune interface
- SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority);
+ SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type);
-@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
- }
+@@ -359,7 +361,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread
- absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() {
+ absl::optional<ThreadPriorityForTest>
+ GetCurrentThreadPriorityForPlatformForTest() {
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
int maybe_sched_rr = 0;
struct sched_param maybe_realtime_prio = {0};
if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
-@@ -347,7 +349,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
+@@ -378,7 +380,7 @@ GetCurrentThreadPriorityForPlatformForTest() {
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
@@ -64,13 +64,13 @@
// On linux we can get the thread names to show up in the debugger by setting
// the process name for the LWP. We don't want to do this for the main
// thread because that would rename the process, causing tools like killall
-@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
+@@ -408,8 +410,10 @@ void PlatformThread::SetThreadType(ProcessId process_i
// priority.
CHECK_NE(thread_id, process_id);
+#if !BUILDFLAG(IS_BSD)
// For legacy schedtune interface
- SetThreadCgroupsForThreadPriority(thread_id, priority);
+ SetThreadCgroupsForThreadType(thread_id, thread_type);
+#endif
#if BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
index 393a2d1be773..562468b060d3 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,4 +1,4 @@
---- base/threading/platform_thread_posix.cc.orig 2022-05-19 14:06:27 UTC
+--- base/threading/platform_thread_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ base/threading/platform_thread_posix.cc
@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) {
if (!thread_params->joinable)
@@ -7,15 +7,15 @@
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
- internal::PCScan::NotifyThreadCreated(internal::GetStackPointer());
- #endif
-@@ -365,6 +365,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri
- // static
- void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) {
+ partition_alloc::internal::PCScan::NotifyThreadCreated(
+ partition_alloc::internal::GetStackPointer());
+@@ -371,6 +371,9 @@ namespace internal {
+ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+ MessagePumpType pump_type_hint) {
#if BUILDFLAG(IS_NACL)
+ NOTIMPLEMENTED();
+// avoid pledge(2) violation
+#elif BUILDFLAG(IS_BSD)
NOTIMPLEMENTED();
#else
- if (internal::SetCurrentThreadPriorityForPlatform(priority))
+ if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
index ddb1bc00ca9f..d2b705a17220 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- base/threading/platform_thread_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ base/threading/platform_thread_unittest.cc
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
#include "base/time/time.h"
#endif
@@ -9,16 +9,16 @@
#include <pthread.h>
#include <sys/syscall.h>
#include <sys/types.h>
-@@ -319,7 +319,7 @@ TEST(PlatformThreadTest,
+@@ -416,7 +416,7 @@ TEST(PlatformThreadTest,
// and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
// proprerty changes for a given platform.
- TEST(PlatformThreadTest, CanChangeThreadPriority) {
+ TEST(PlatformThreadTest, CanChangeThreadType) {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
// able to increase priority to any level.
constexpr bool kCanIncreasePriority = false;
-@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
+@@ -515,7 +515,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
TEST(PlatformThreadTest, GetDefaultThreadStackSize) {
size_t stack_size = PlatformThread::GetDefaultThreadStackSize();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \
@@ -27,7 +27,7 @@
!defined(THREAD_SANITIZER)) || \
(BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER))
EXPECT_EQ(0u, stack_size);
-@@ -578,12 +578,16 @@ INSTANTIATE_TEST_SUITE_P(
+@@ -676,12 +676,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)
diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
index 3a85c8907285..0567b054551b 100644
--- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,6 +1,6 @@
---- base/trace_event/malloc_dump_provider.cc.orig 2022-06-17 14:20:10 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig 2022-08-31 12:19:35 UTC
+++ base/trace_event/malloc_dump_provider.cc
-@@ -23,6 +23,8 @@
+@@ -24,6 +24,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
@@ -9,17 +9,16 @@
#else
#include <malloc.h>
#endif
-@@ -176,7 +178,8 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+@@ -185,7 +187,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
-- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA))
-+ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_FUCHSIA) && \
-+ !BUILDFLAG(IS_BSD))
+- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA))
++ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD))
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
-@@ -341,6 +344,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -356,6 +358,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 50d9caf98660..345284620bd1 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 2022-07-22 17:30:31 UTC
+--- build/config/compiler/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ build/config/compiler/BUILD.gn
@@ -231,13 +231,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
@@ -18,7 +18,7 @@
}
# compiler ---------------------------------------------------------------------
-@@ -447,6 +450,10 @@ config("compiler") {
+@@ -461,6 +464,10 @@ config("compiler") {
}
}
@@ -29,7 +29,7 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
-@@ -522,7 +529,7 @@ config("compiler") {
+@@ -536,7 +543,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
@@ -38,25 +38,25 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
-@@ -909,7 +916,7 @@ config("compiler_cpu_abi") {
+@@ -900,7 +907,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
-- if (is_clang && !is_android && !is_nacl) {
-+ if (is_clang && !is_android && !is_nacl && !is_bsd) {
+- if (is_clang && !is_android && !is_nacl &&
++ if (is_clang && !is_android && !is_nacl && !is_bsd &&
+ !(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
- }
-@@ -923,7 +930,7 @@ config("compiler_cpu_abi") {
+@@ -915,7 +922,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
-- if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
-+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) {
+- if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd &&
+ !(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
- }
-@@ -1244,7 +1251,7 @@ config("compiler_deterministic") {
+@@ -1243,7 +1250,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.
@@ -65,7 +65,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
-@@ -1535,12 +1542,12 @@ config("default_warnings") {
+@@ -1534,7 +1541,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -73,14 +73,8 @@
+ if (!is_nacl && !is_bsd) {
# TODO(https://crbug.com/1300731) Clean up and enable.
cflags += [ "-Wno-unqualified-std-cast-call" ]
- }
-- if (!is_nacl && !(is_chromeos ||
-+ if (!is_nacl && !is_bsd && !(is_chromeos ||
- default_toolchain == "//build/toolchain/cros:target")) {
- # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated.
- cflags += [
-@@ -1724,7 +1731,7 @@ config("no_chromium_code") {
+@@ -1727,7 +1734,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -89,7 +83,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2238,7 +2245,7 @@ config("afdo_optimize_size") {
+@@ -2241,7 +2248,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") {
@@ -98,7 +92,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2254,7 +2261,7 @@ config("afdo") {
+@@ -2257,7 +2264,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@@ -107,7 +101,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2395,7 +2402,8 @@ config("symbols") {
+@@ -2397,7 +2404,8 @@ config("symbols") {
}
}
diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni
index c3d27e12d61f..739797e19626 100644
--- a/www/chromium/files/patch-build_config_ozone.gni
+++ b/www/chromium/files/patch-build_config_ozone.gni
@@ -1,6 +1,6 @@
---- build/config/ozone.gni.orig 2022-07-22 17:30:31 UTC
+--- build/config/ozone.gni.orig 2022-08-31 12:19:35 UTC
+++ build/config/ozone.gni
-@@ -88,7 +88,15 @@ declare_args() {
+@@ -87,7 +87,15 @@ declare_args() {
} else if (is_chromeos_lacros) {
ozone_platform = "wayland"
ozone_platform_wayland = true
diff --git a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
index fe360f1a2deb..de7589861474 100644
--- a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
+++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
@@ -1,8 +1,8 @@
---- build/linux/unbundle/replace_gn_files.py.orig 2021-12-14 11:44:55 UTC
+--- build/linux/unbundle/replace_gn_files.py.orig 2022-08-31 12:19:35 UTC
+++ build/linux/unbundle/replace_gn_files.py
-@@ -25,6 +25,7 @@ REPLACEMENTS = {
- 'libevent': 'base/third_party/libevent/BUILD.gn',
+@@ -52,6 +52,7 @@ REPLACEMENTS = {
'libjpeg': 'third_party/libjpeg.gni',
+ 'libjxl' : 'third_party/libjxl/BUILD.gn',
'libpng': 'third_party/libpng/BUILD.gn',
+ 'libusb': 'third_party/libusb/BUILD.gn',
'libvpx': 'third_party/libvpx/BUILD.gn',
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index b60fac0078ef..7ac958f7baee 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 2022-05-19 14:06:27 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2022-08-31 12:19:35 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,11 +14,20 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -786,13 +793,12 @@ template("gcc_toolchain") {
+@@ -786,22 +793,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {
-- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+- _path = "$clang_base_path/bin"
+- _is_path_absolute = get_path_info(_path, "abspath") == _path
+-
+- # Preserve absolute paths for tools like distcc.
+- if (_is_path_absolute && filter_include([ _path ], [ "//*" ]) == []) {
+- prefix = _path
+- } else {
+- prefix = rebase_path(_path, root_build_dir)
+- }
+-
- cc = "${prefix}/clang"
- cxx = "${prefix}/clang++"
+ cc = "cc"
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index b6f50ae884f8..7ac34593005c 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 2022-06-17 14:20:10 UTC
+--- cc/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ cc/BUILD.gn
-@@ -669,7 +669,7 @@ cc_test_static_library("test_support") {
+@@ -666,7 +666,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
-@@ -897,7 +897,6 @@ cc_test("cc_unittests") {
+@@ -894,7 +894,6 @@ cc_test("cc_unittests") {
data = [ "//components/viz/test/data/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc
index f0268b40f412..b9058a38e3ef 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/app/chrome_main.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/app/chrome_main.cc
@@ -26,7 +26,7 @@
#include "chrome/app/notification_metrics.h"
@@ -9,7 +9,7 @@
#include "base/base_switches.h"
#endif
-@@ -147,7 +147,7 @@ int ChromeMain(int argc, const char** argv) {
+@@ -152,7 +152,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 e9c8dd1d6baa..dd8b95e8c3ff 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -125,7 +125,7 @@
#include "components/about_ui/credit_utils.h"
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -168,12 +168,12 @@
+@@ -168,16 +168,16 @@
#include "v8/include/v8.h"
#endif
@@ -18,13 +18,18 @@
#include "base/environment.h"
#endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "base/message_loop/message_pump_libevent.h"
+ #endif
+
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \
- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -320,7 +320,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -323,7 +323,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@@ -33,7 +38,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -406,7 +406,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -409,7 +409,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -42,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) ||
-@@ -470,7 +470,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -473,7 +473,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -51,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.
-@@ -554,7 +554,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -556,7 +556,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -60,7 +65,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -733,6 +733,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
+@@ -735,6 +735,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
// not always enabled on Linux/ChromeOS.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@@ -69,8 +74,17 @@
#else
bool enable_gwp_asan = true;
#endif
-@@ -878,7 +880,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
- }
+@@ -794,7 +796,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
+ base::internal::TimerBase::InitializeFeatures();
+ base::InitializeCpuReductionExperiment();
+ base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ base::MessagePumpLibevent::InitializeFeatures();
+ #elif BUILDFLAG(IS_MAC)
+ base::PlatformThread::InitializeOptimizedRealtimeThreadingFeature();
+@@ -881,7 +883,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+
// 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)
@@ -78,7 +92,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -936,7 +938,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -911,7 +913,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -87,8 +101,8 @@
nacl::RegisterPathProvider();
#endif
-@@ -1316,7 +1318,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
- locale;
+@@ -1291,7 +1293,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+ CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
@@ -96,10 +110,10 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1393,7 +1395,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1367,7 +1369,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.
+ // This entry is not needed on Linux, where the NaCl loader
+ // process is launched via nacl_helper instead.
-#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
{switches::kNaClLoaderProcess, NaClMain},
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index 5e9dce92b81b..9edf54956e68 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 2022-07-22 17:30:31 UTC
+--- chrome/app/generated_resources.grd.orig 2022-08-31 12:19:35 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.
-->
-@@ -2989,7 +2989,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3071,7 +3071,7 @@ are declared in tools/grit/grit_rule.gni.
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@@ -18,7 +18,16 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
-@@ -8737,7 +8737,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -4801,7 +4801,7 @@ are declared in tools/grit/grit_rule.gni.
+ Read information about your browser, OS, device, installed software, registry values and files
+ </message>
+ </if>
+- <if expr="is_macosx or is_linux">
++ <if expr="is_macosx or is_posix">
+ <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>
+@@ -8880,7 +8880,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@@ -27,7 +36,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>
-@@ -9897,7 +9897,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -10046,7 +10046,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index ea16909c08e8..490b9e95fb3c 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 2022-07-22 17:30:31 UTC
+--- chrome/app/settings_strings.grdp.orig 2022-08-31 12:19:35 UTC
+++ chrome/app/settings_strings.grdp
-@@ -131,7 +131,7 @@
+@@ -134,7 +134,7 @@
Theme
</message>
</if>
@@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
</message>
-@@ -145,7 +145,7 @@
+@@ -148,7 +148,7 @@
Use Classic
</message>
</if>
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 49e45123da2f..c710f6c89a47 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/about_flags.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/about_flags.cc
-@@ -203,7 +203,7 @@
+@@ -210,7 +210,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -277,7 +277,7 @@
+@@ -285,7 +285,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck
#endif // ENABLE_SUPERVISED_USERS
@@ -18,8 +18,8 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -366,7 +366,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
- gl::kANGLEImplementationMetalName}};
+@@ -390,7 +390,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+ {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
-#if BUILDFLAG(IS_LINUX)
@@ -27,7 +27,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1137,7 +1137,7 @@ const FeatureEntry::FeatureVariation
+@@ -1214,7 +1214,7 @@ const FeatureEntry::FeatureVariation
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
-@@ -3841,7 +3841,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3864,7 +3864,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -45,7 +45,7 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -4449,7 +4449,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4501,7 +4501,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -54,7 +54,7 @@
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
-@@ -4468,7 +4468,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4520,7 +4520,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
#endif // BUILDFLAG(IS_LINUX)
@@ -63,8 +63,8 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -5159,7 +5159,7 @@ const FeatureEntry kFeatureEntries[] = {
- "OmniboxBundledExperimentV1")},
+@@ -5217,7 +5217,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(omnibox::kZeroSuggestPrefetching)},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@@ -72,8 +72,17 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -6582,7 +6582,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
+@@ -5728,7 +5728,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
+
+-#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)},
+@@ -6657,7 +6657,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -81,7 +90,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -7495,7 +7495,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7551,7 +7551,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -90,7 +99,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -7803,7 +7803,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7862,7 +7862,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -99,3 +108,12 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
+@@ -8428,7 +8428,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ {"document-picture-in-picture-api",
+ flag_descriptions::kDocumentPictureInPictureApiName,
+ flag_descriptions::kDocumentPictureInPictureApiDescription,
diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
index 70b237a4f6d9..ef6940d77ab3 100644
--- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
@@ -1,7 +1,7 @@
---- chrome/browser/after_startup_task_utils.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/after_startup_task_utils.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/after_startup_task_utils.cc
-@@ -105,7 +105,7 @@ void SetBrowserStartupIsComplete() {
-
+@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() {
+ TRACE_EVENT0("startup", "SetBrowserStartupIsComplete");
g_startup_complete_flag.Get().Set();
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
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 6dd743db9c34..cd6ccf427c25 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,6 +1,6 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-04-21 18:48:31 UTC
+--- 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
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
#include "extensions/common/extension.h"
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc
index f752e5299fe7..93a836bedb72 100644
--- a/www/chromium/files/patch-chrome_browser_browser__features.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__features.cc
@@ -1,8 +1,8 @@
---- chrome/browser/browser_features.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/browser_features.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/browser_features.cc
@@ -29,7 +29,7 @@ const base::Feature kColorProviderRedirectionForThemeP
// the browser exits.
- const base::Feature kDestroyProfileOnBrowserClose{
+ const 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)
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
index cf6f1932bf97..cc6db4b95ae8 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/browser_process_impl.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/browser_process_impl.h
-@@ -358,7 +358,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -360,7 +360,7 @@ class BrowserProcessImpl : public BrowserProcess,
// 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_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 03193cbce1e5..47c64cd7ccf3 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -111,13 +111,13 @@
+@@ -112,13 +112,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
-@@ -180,7 +180,7 @@
+@@ -184,7 +184,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"
-@@ -758,7 +758,7 @@ void PopulateChromeFrameBinders(
+@@ -766,7 +766,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));
-@@ -766,7 +766,7 @@ void PopulateChromeFrameBinders(
+@@ -774,7 +774,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -43,7 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
render_frame_host->IsInPrimaryMainFrame()) {
map->Add<blink::mojom::SubAppsService>(
-@@ -821,14 +821,14 @@ void PopulateChromeWebUIFrameBinders(
+@@ -829,14 +829,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -60,8 +60,8 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
-@@ -1177,7 +1177,7 @@ void PopulateChromeWebUIFrameBinders(
- #endif
+@@ -1196,7 +1196,7 @@ void PopulateChromeWebUIFrameBinders(
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
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 6f586fa6e47c..99a2b2c328b8 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -236,11 +236,11 @@
+@@ -237,11 +237,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/breakpad_linux.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -276,7 +276,7 @@
+@@ -277,7 +277,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"
-@@ -1024,7 +1024,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1028,7 +1028,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 .
-@@ -1037,7 +1037,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1041,7 +1041,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -41,7 +41,7 @@
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
-@@ -1059,7 +1059,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1063,7 +1063,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 37b58f44eb8d..e2c4c2e25b91 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -380,7 +380,7 @@
+@@ -387,7 +387,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"
-@@ -456,17 +456,17 @@
+@@ -466,17 +466,17 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -30,7 +30,7 @@
#if !BUILDFLAG(IS_ANDROID)
#include "base/debug/leak_annotations.h"
#include "components/crash/core/app/breakpad_linux.h"
-@@ -474,12 +474,12 @@
+@@ -484,12 +484,12 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@@ -45,7 +45,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)
-@@ -503,11 +503,11 @@
+@@ -513,11 +513,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -59,7 +59,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -898,7 +898,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
+@@ -933,7 +933,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@@ -68,7 +68,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -1418,7 +1418,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1481,7 +1481,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@@ -77,7 +77,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1452,7 +1452,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1520,7 +1520,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.
@@ -86,7 +86,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1473,7 +1473,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1541,7 +1541,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -95,7 +95,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -2242,6 +2242,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2310,6 +2310,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -104,16 +104,16 @@
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2557,7 +2559,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2648,7 +2650,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- // TODO(https://crbug.com/1316129): Re-enable for Lacros.
- // Processes may only query perf_event_open with the BPF sandbox disabled.
- if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
-@@ -3971,7 +3973,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+ // Opt into a hardened stack canary mitigation if it hasn't already been
+ // force-disabled.
+ if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
+@@ -4078,7 +4080,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4398,14 +4400,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4507,14 +4509,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -139,7 +139,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -4438,7 +4440,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4547,7 +4549,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// 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_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index 295332910843..8a6123ba77b7 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -421,7 +421,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -429,7 +429,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 a9cf58e1eece..32c00e3a60e5 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
-@@ -39,7 +39,7 @@ This file specifies browser resources for developer-fa
+@@ -36,7 +36,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_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 45628b84695c..758f98c0a395 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1540,7 +1540,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1511,7 +1511,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
@@ -9,7 +9,7 @@
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
-@@ -1592,7 +1592,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1563,7 +1563,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
-@@ -1699,7 +1699,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1679,7 +1679,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
// Don't download pdf if it is a file URL, as that might cause an infinite
// download loop if Chrome is not the system pdf viewer.
if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
-@@ -1741,7 +1741,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
+@@ -1721,7 +1721,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
download::DownloadItem* download_item) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -36,7 +36,7 @@
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
download_item);
#else
-@@ -1757,7 +1757,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
+@@ -1737,7 +1737,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h
index 39e9bf4a1ce9..35050c88691a 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_commands.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/download/download_commands.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/download/download_commands.h
-@@ -53,7 +53,7 @@ class DownloadCommands {
+@@ -55,7 +55,7 @@ class DownloadCommands {
void ExecuteCommand(Command command);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
index 571caf3b35c3..01e3e2bf72d0 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__file__picker.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_file_picker.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/download/download_file_picker.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/download/download_file_picker.cc
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
#include "content/public/browser/download_manager.h"
#include "content/public/browser/web_contents.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_window.h"
#include "ui/aura/window.h"
-@@ -76,7 +76,7 @@ DownloadFilePicker::DownloadFilePicker(DownloadItem* i
+@@ -81,7 +81,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl
// dialog in Linux. See SelectFileImpl() in select_file_dialog_linux_gtk.cc.
// Here we make owning_window host to browser current active window
// if it is null. https://crbug.com/1301898
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 43b19db0fed8..ad761738f7c6 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,6 +1,6 @@
---- chrome/browser/download/download_item_model.cc.orig 2022-07-28 04:43:52 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -704,7 +704,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -709,7 +709,7 @@ bool DownloadItemModel::IsCommandChecked(
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
return prefs->ShouldOpenPdfInSystemReader();
-@@ -744,7 +744,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -751,7 +751,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
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 6c02c285ce32..1784402fc3d0 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 2022-06-17 14:20:10 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -13,6 +13,7 @@
#include "base/callback_helpers.h"
@@ -8,7 +8,7 @@
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/no_destructor.h"
-@@ -60,6 +61,10 @@
+@@ -61,6 +62,10 @@
#include "chrome/browser/ui/pdf/adobe_reader_info_win.h"
#endif
@@ -19,7 +19,7 @@
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
-@@ -70,7 +75,7 @@ namespace {
+@@ -71,7 +76,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
@@ -28,7 +28,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
-@@ -168,7 +173,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
+@@ -182,7 +187,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -291,7 +296,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -302,7 +307,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)
-@@ -496,7 +501,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -483,7 +488,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;
-@@ -528,7 +533,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -515,7 +520,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();
-@@ -559,7 +564,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+@@ -546,7 +551,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;
-@@ -678,7 +683,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -670,7 +675,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_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
index 11d432acfbc2..4e65f17683c8 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/download/download_prefs.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/download/download_prefs.h
@@ -125,7 +125,7 @@ class DownloadPrefs {
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
@@ -9,7 +9,7 @@
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -186,7 +186,7 @@ class DownloadPrefs {
+@@ -185,7 +185,7 @@ class DownloadPrefs {
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
new file mode 100644
index 000000000000..d167c55d86e6
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
@@ -0,0 +1,16 @@
+--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2022-08-31 12:19:35 UTC
++++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
+@@ -117,11 +117,11 @@ AnalysisServiceSettings::AnalysisServiceSettings(
+ const char* verification_key = kKeyWindowsVerification;
+ #elif BUILDFLAG(IS_MAC)
+ const char* verification_key = kKeyMacVerification;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char* verification_key = kKeyLinuxVerification;
+ #endif
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const base::Value::Dict& dict = settings_value.GetDict();
+ const base::Value::List* signatures =
+ dict.FindListByDottedPath(verification_key);
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index c422c1a6d7ef..a81b4ca28314 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1296,6 +1296,10 @@ static_library("extensions") {
+@@ -1324,6 +1324,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
new file mode 100644
index 000000000000..556de08c9226
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig 2022-08-31 12:19:35 UTC
++++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc
+@@ -4,7 +4,7 @@
+
+ #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h"
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+ #include <memory>
+ #include <utility>
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
new file mode 100644
index 000000000000..cd8c69565344
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2022-08-31 12:19:35 UTC
++++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h
+@@ -7,7 +7,7 @@
+
+ #include "build/build_config.h"
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+ #include <vector>
+
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index 38cc6a034c09..a7f4edd7f522 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,6 +1,24 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-@@ -168,7 +168,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -31,7 +31,7 @@
+ #include "components/reporting/util/statusor.h"
+ #endif
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/strings/string_util.h"
+ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
+ #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h"
+@@ -155,7 +155,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+ return info;
+ }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+ device_signals::SignalsAggregationRequest CreateAggregationRequest(
+ const std::string& user_id,
+@@ -215,7 +215,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
@@ -9,3 +27,12 @@
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
+@@ -655,7 +655,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+ }
+ #endif
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+ // getFileSystemInfo
+
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
index fdafe702d58a..58fe6ee1d198 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
@@ -1,6 +1,15 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
-@@ -52,7 +52,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
+@@ -19,7 +19,7 @@
+ #include "components/reporting/proto/synced/record.pb.h"
+ #include "components/reporting/proto/synced/record_constants.pb.h"
+ #include "components/reporting/util/statusor.h"
+-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/device_signals/core/browser/signals_types.h"
+ #endif // BUILDFLAG(IS_CHROMEOS)
+
+@@ -54,7 +54,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
~EnterpriseReportingPrivateGetDeviceIdFunction() override;
};
@@ -9,3 +18,12 @@
class EnterpriseReportingPrivateGetPersistentSecretFunction
: public ExtensionFunction {
+@@ -264,7 +264,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction
+
+ #endif
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+ class EnterpriseReportingPrivateGetFileSystemInfoFunction
+ : public ExtensionFunction {
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 505f6a6b3b18..a1ef584f7745 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -186,7 +186,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -187,7 +187,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
-@@ -200,7 +200,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_NUMBER;
// 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_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
index 38d3f2c79b14..3d067f932c09 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -53,7 +53,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
@@ -9,10 +9,10 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
-@@ -132,7 +132,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
- #endif
+@@ -122,7 +122,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
+ extensions::SidePanelService::GetFactoryInstance();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
extensions::SystemIndicatorManagerFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 5211293e72de..3fb496df6d63 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -5867,7 +5867,7 @@ const char kSideSearchDSESupportDescription[] =
+@@ -6066,7 +6066,7 @@ const char kSideSearchDSESupportDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
const char kDesktopDetailedLanguageSettingsName[] =
"Detailed Language Settings (Desktop)";
-@@ -5888,7 +5888,7 @@ const char kWebShareDescription[] =
+@@ -6087,7 +6087,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -18,16 +18,16 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -5900,7 +5900,7 @@ const char kOzonePlatformHintDescription[] =
- "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. ";
- #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+@@ -6107,7 +6107,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+ "Bluetooth";
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
-@@ -5913,7 +5913,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
+@@ -6120,7 +6120,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@@ -36,7 +36,16 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -6028,7 +6028,7 @@ const char kElasticOverscrollDescription[] =
+@@ -6129,7 +6129,7 @@ const char kSkipUndecryptablePasswordsDescription[] =
+ "there are undecryptable ones.";
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kAsyncDnsName[] = "Async DNS resolver";
+ const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+@@ -6234,7 +6234,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 33cc38e7e4fd..665cfadce008 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3370,7 +3370,7 @@ extern const char kSideSearchDSESupportDescription[];
+@@ -3477,7 +3477,7 @@ extern const char kSideSearchDSESupportDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,16 +9,16 @@
extern const char kDesktopDetailedLanguageSettingsName[];
extern const char kDesktopDetailedLanguageSettingsDescription[];
-@@ -3386,7 +3386,7 @@ extern const char kWebShareName[];
- extern const char kWebShareDescription[];
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
+@@ -3498,7 +3498,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+ extern const char kWebBluetoothConfirmPairingSupportDescription[];
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3402,7 +3402,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -3514,12 +3514,12 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -27,7 +27,13 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -3483,7 +3483,7 @@ extern const char kElasticOverscrollDescription[];
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kAsyncDnsName[];
+ extern const char kAsyncDnsDescription[];
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+@@ -3595,7 +3595,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
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 e715e8096493..52ac95b6126d 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,4 +1,4 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -58,8 +58,10 @@
@@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -223,7 +225,7 @@ void RecordStartupMetrics() {
+@@ -523,7 +525,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
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 72f274cf1064..04207e746447 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -789,7 +789,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -788,7 +788,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -878,7 +878,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -880,7 +880,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -18,7 +18,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
metrics_service_->RegisterMetricsProvider(
-@@ -1057,7 +1057,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -1065,7 +1065,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 ec676e11d6dc..4cd29aee741b 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -91,7 +91,7 @@
@@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
-@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -174,7 +174,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@@ -18,7 +18,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -474,7 +474,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -479,7 +479,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@@ -27,7 +27,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -546,7 +546,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
std::string());
diff --git a/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
new file mode 100644
index 000000000000..d0022c13238c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2022-08-31 12:19:35 UTC
++++ chrome/browser/new_tab_page/new_tab_page_util.cc
+@@ -11,7 +11,7 @@
+
+ namespace {
+ bool IsOsSupportedForRecipe() {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return true;
+ #else
+ return false;
diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc
deleted file mode 100644
index cc6e40bebaa5..000000000000
--- a/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc
-@@ -16,7 +16,7 @@
- #include "content/public/browser/browser_task_traits.h"
- #include "content/public/browser/browser_thread.h"
-
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- #include "base/memory/memory_pressure_monitor.h"
- #endif
-
-@@ -121,7 +121,7 @@ void HighPMFDiscardPolicy::OnProcessMemoryMetricsAvail
-
- if (should_discard) {
- discard_attempt_in_progress_ = true;
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
- // Record the memory pressure level before discarding a tab.
- content::GetUIThreadTaskRunner({})->PostTask(
- FROM_HERE, base::BindOnce([]() {
diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
index 0e2e20a6d695..0648db76b2a9 100644
--- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/platform_util_linux.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/platform_util_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/platform_util_linux.cc
-@@ -294,7 +294,9 @@ void RunCommand(const std::string& command,
+@@ -295,7 +295,9 @@ void RunCommand(const std::string& command,
base::LaunchOptions options;
options.current_directory = working_directory;
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 243527ebcbe5..be2c80b28e37 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -188,7 +188,7 @@
+@@ -189,7 +189,7 @@
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,16 +9,49 @@
#include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
#endif
-@@ -1566,7 +1566,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -722,7 +722,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ { key::kDefaultGeolocationSetting,
+ prefs::kManagedDefaultGeolocationSetting,
+ base::Value::Type::INTEGER },
+- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ { key::kRequireOnlineRevocationChecksForLocalAnchors,
+ prefs::kCertRevocationCheckingRequiredLocalAnchors,
base::Value::Type::BOOLEAN },
- #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS)
+@@ -1329,7 +1329,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ base::Value::Type::BOOLEAN },
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ { key::kGSSAPILibraryName,
+ prefs::kGSSAPILibraryName,
+ base::Value::Type::STRING },
+@@ -1398,12 +1398,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ prefs::kTotalMemoryLimitMb,
+ base::Value::Type::INTEGER },
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ { key::kBackgroundModeEnabled,
+ prefs::kBackgroundModeEnabled,
+ base::Value::Type::BOOLEAN },
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ { key::kDefaultBrowserSettingEnabled,
+ prefs::kDefaultBrowserSettingEnabled,
+ base::Value::Type::BOOLEAN },
+@@ -1584,7 +1584,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ base::Value::Type::BOOLEAN },
+ #endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1627,7 +1627,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1642,7 +1642,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -27,7 +60,7 @@
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1945,7 +1945,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -1975,7 +1975,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@@ -36,8 +69,17 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -2300,7 +2300,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
- static_cast<int>(variations::RestrictionPolicy::ALL), false));
+@@ -2004,7 +2004,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) || \
+- BUILDFLAG(IS_LINUX)
++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
+ key::kForceBrowserSignin, prefs::kForceBrowserSignin,
+ base::Value::Type::BOOLEAN));
+@@ -2337,7 +2337,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ chrome_schema));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
@@ -45,8 +87,17 @@
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -2319,7 +2319,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
- policy::key::kSpellcheckLanguageBlocklist));
+@@ -2350,7 +2350,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ #endif
+
+ #if BUILDFLAG(ENABLE_SPELLCHECK)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
+ handlers->AddHandler(
+ std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
+@@ -2358,7 +2358,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
-#if BUILDFLAG(IS_LINUX)
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 fa298b162ad2..b5e0be2f6760 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -438,14 +438,14 @@
+@@ -442,14 +442,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
@@ -17,7 +17,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -1221,7 +1221,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
+@@ -1246,7 +1246,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@@ -26,7 +26,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
-@@ -1543,7 +1543,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1567,7 +1567,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
// 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_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
index 6eedca91938a..4dd7268ab5af 100644
--- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/process_singleton_posix.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/process_singleton_posix.cc
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
#endif
-@@ -350,7 +350,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
if (g_disable_prompt)
return g_user_opted_unlock_in_use_profile;
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 222f3898df6a..681e7a96a459 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,15 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -414,7 +414,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -251,7 +251,7 @@
+ #include "chrome/browser/ui/cocoa/screentime/screentime_features.h"
+ #endif
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/idle/idle_service_factory.h"
+ #endif
+
+@@ -428,11 +428,11 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,3 +18,8 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ enterprise_idle::IdleServiceFactory::GetInstance();
+ #endif
+ ModelTypeStoreServiceFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
index 4e1a5b590127..4fe5ad5a16ee 100644
--- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,21 +1,21 @@
---- chrome/browser/renderer_preferences_util.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -37,7 +37,7 @@
#include "ui/views/controls/textfield/textfield.h"
#endif
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
- #include "ui/views/linux_ui/linux_ui.h"
+ #include "ui/linux/linux_ui.h"
@@ -159,7 +159,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
#endif
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- views::LinuxUI* linux_ui = views::LinuxUI::instance();
+-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX)
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+ ui::LinuxUi* linux_ui = ui::LinuxUi::instance();
if (linux_ui) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
@@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
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 d407a2923519..0b426085e4e9 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,4 +1,4 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -27,7 +27,7 @@
<cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
@@ -18,10 +18,10 @@
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]"
-@@ -109,7 +109,7 @@
- pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
- label="$i18n{showBookmarksBar}">
- </settings-toggle-button>
+@@ -135,7 +135,7 @@
+ </div>
+ </template>
+
-<if expr="is_linux">
+<if expr="is_posix">
<div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div>
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
index e40e0db506b1..0a3486ad680a 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
@@ -1,4 +1,4 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends
'prefs.autogenerated.theme.policy.color.controlledBy)',
@@ -9,7 +9,7 @@
/**
* Whether to show the "Custom Chrome Frame" setting.
*/
-@@ -167,7 +167,7 @@ export class SettingsAppearancePageElement extends
+@@ -174,7 +174,7 @@ export class SettingsAppearancePageElement extends
'themeChanged_(' +
'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)',
@@ -18,7 +18,7 @@
// NOTE: this pref only exists on Linux.
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
// </if>
-@@ -186,7 +186,7 @@ export class SettingsAppearancePageElement extends
+@@ -194,7 +194,7 @@ export class SettingsAppearancePageElement extends
private showReaderModeOption_: boolean;
private isForcedTheme_: boolean;
@@ -27,7 +27,7 @@
private showCustomChromeFrame_: boolean;
// </if>
-@@ -264,7 +264,7 @@ export class SettingsAppearancePageElement extends
+@@ -272,7 +272,7 @@ export class SettingsAppearancePageElement extends
this.appearanceBrowserProxy_.useDefaultTheme();
}
@@ -36,7 +36,7 @@
private useSystemThemePrefChanged_(useSystemTheme: boolean) {
this.useSystemTheme_ = useSystemTheme;
}
-@@ -325,10 +325,10 @@ export class SettingsAppearancePageElement extends
+@@ -333,10 +333,10 @@ export class SettingsAppearancePageElement extends
}
let i18nId;
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
index 3b36bfc5147a..543e7266512f 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
@@ -1,6 +1,6 @@
---- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/resources/settings/autofill_page/passwords_shared.css
-@@ -70,7 +70,7 @@ cr-input.password-input::part(input),
+@@ -72,7 +72,7 @@ cr-input.password-input::part(input),
* necessary to prevent Chrome from using the operating system's font
* instead of the Material Design font.
* TODO(dbeam): why not font: inherit? */
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 96f0e2a1f4af..8b9235e59d69 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -187,7 +187,7 @@ function createBrowserSettingsRoutes(): Partial<Settin
r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');
diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
index 31df4ed9f6d6..948b9dd698b5 100644
--- a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
+++ b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
@@ -1,6 +1,6 @@
---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
-@@ -298,7 +298,7 @@
+@@ -248,7 +248,7 @@
consent-confirmation autofocus>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
@@ -9,8 +9,8 @@
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
-@@ -308,7 +308,7 @@
- disabled="[[anyButtonClicked_]]" hidden="[[syncForced_]]">
+@@ -258,7 +258,7 @@
+ disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
@@ -18,7 +18,7 @@
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
-@@ -356,7 +356,7 @@
+@@ -301,7 +301,7 @@
consent-confirmation>
$i18n{syncConfirmationConfirmLabel}
</cr-button>
@@ -27,8 +27,8 @@
<cr-button id="settingsButton" on-click="onGoToSettings_"
disabled="[[anyButtonClicked_]]" consent-confirmation>
$i18n{syncConfirmationSettingsLabel}
-@@ -366,7 +366,7 @@
- disabled="[[anyButtonClicked_]]" hidden="[[syncForced_]]">
+@@ -311,7 +311,7 @@
+ disabled="[[anyButtonClicked_]]">
$i18n{syncConfirmationUndoLabel}
</cr-button>
- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
index 38567566017e..d0d8ac26e5d2 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -20,7 +20,7 @@
#include "content/public/browser/browser_thread.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h"
#endif
-@@ -101,7 +101,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
+@@ -102,7 +102,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
} else if (inspection_type == DownloadFileType::DMG) {
StartExtractDmgFeatures();
#endif
@@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
-@@ -289,7 +289,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+@@ -325,7 +325,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
index b7a83e3882ac..cc574a34bfd2 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.h
@@ -17,7 +17,7 @@
#include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -9,7 +9,7 @@
#include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h"
#endif
-@@ -112,7 +112,7 @@ class FileAnalyzer {
+@@ -105,7 +105,7 @@ class FileAnalyzer {
const safe_browsing::ArchiveAnalyzerResults& archive_results);
#endif
@@ -18,7 +18,7 @@
void StartExtractDocumentFeatures();
void OnDocumentAnalysisFinished(
const DocumentAnalyzerResults& document_results);
-@@ -132,7 +132,7 @@ class FileAnalyzer {
+@@ -128,7 +128,7 @@ class FileAnalyzer {
scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_;
#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 bceba5d45c5e..962d486fa343 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,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
-@@ -433,7 +433,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -437,7 +437,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.
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
index 8bb75a6947c3..2e1346817b96 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
@@ -1,20 +1,20 @@
---- chrome/browser/themes/theme_helper.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/themes/theme_helper.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/themes/theme_helper.cc
-@@ -24,7 +24,7 @@
- #include "ui/native_theme/common_theme.h"
+@@ -18,7 +18,7 @@
+ #include "ui/gfx/image/image.h"
#include "ui/native_theme/native_theme.h"
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/linux_ui/linux_ui.h"
+ #include "ui/linux/linux_ui.h"
#endif
-@@ -498,7 +498,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
+@@ -172,7 +172,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
ui::NativeTheme const* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- if (const auto* linux_ui = views::LinuxUI::instance()) {
+ if (const auto* linux_ui = ui::LinuxUi::instance()) {
// We rely on the fact that the system theme is in use iff `theme_supplier`
// is non-null, but this is cheating. In the future this might not hold
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 ee944889c1f2..9d79343168b3 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/themes/theme_service.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/themes/theme_service.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/themes/theme_service.cc
@@ -72,7 +72,7 @@
#include "extensions/browser/extension_registry_observer.h"
@@ -6,19 +6,10 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/linux_ui/linux_ui.h"
+ #include "ui/linux/linux_ui.h"
+ #include "ui/ozone/public/ozone_platform.h"
#endif
-
-@@ -489,7 +489,7 @@ ThemeService::BrowserThemeProvider::GetColorProviderCo
- native_theme = ui::NativeTheme::GetInstanceForDarkUI();
- } else {
- native_theme = ui::NativeTheme::GetInstanceForNativeUi();
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- if (const auto* linux_ui = views::LinuxUI::instance()) {
- native_theme =
- linux_ui->GetNativeTheme(delegate_->ShouldUseSystemTheme());
-@@ -611,7 +611,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
+@@ -314,7 +314,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseSystemTheme() const {
@@ -27,12 +18,12 @@
return profile_->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
#else
return false;
-@@ -619,7 +619,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
+@@ -322,7 +322,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
}
bool ThemeService::ShouldUseCustomFrame() const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return profile_->GetPrefs()->GetBoolean(prefs::kUseCustomChromeFrame);
- #else
- return true;
+ if (!ui::OzonePlatform::GetInstance()
+ ->GetPlatformRuntimeProperties()
+ .supports_server_side_window_decorations) {
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc
new file mode 100644
index 000000000000..1ace39936c94
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc
@@ -0,0 +1,37 @@
+--- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-08-31 12:19:35 UTC
++++ chrome/browser/themes/theme_service_aura_linux.cc
+@@ -13,7 +13,7 @@
+ #include "ui/gfx/image/image.h"
+ #include "ui/native_theme/native_theme_aura.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+
+@@ -53,14 +53,14 @@ void SystemThemeLinux::StartUsingTheme() {
+ void SystemThemeLinux::StopUsingTheme() {
+ pref_service_->SetBoolean(prefs::kUsesSystemTheme, false);
+ // Have the former theme notify its observers of change.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (auto* linux_ui = ui::LinuxUi::instance())
+ linux_ui->GetNativeTheme(nullptr)->NotifyOnNativeThemeUpdated();
+ #endif
+ }
+
+ bool SystemThemeLinux::GetColor(int id, SkColor* color) const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (auto* linux_ui = ui::LinuxUi::instance()) {
+ return linux_ui->GetColor(
+ id, color, pref_service_->GetBoolean(prefs::kUseCustomChromeFrame));
+@@ -70,7 +70,7 @@ bool SystemThemeLinux::GetColor(int id, SkColor* color
+ }
+
+ bool SystemThemeLinux::GetDisplayProperty(int id, int* result) const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (auto* linux_ui = ui::LinuxUi::instance())
+ return linux_ui->GetDisplayProperty(id, result);
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
index 90d412db52c8..a9d10b0fa2df 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
@@ -1,15 +1,20 @@
---- chrome/browser/themes/theme_service_factory.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/themes/theme_service_factory.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/themes/theme_service_factory.cc
-@@ -25,7 +25,7 @@
+@@ -25,11 +25,11 @@
// 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)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
#include "chrome/browser/themes/theme_service_aura_linux.h"
- #include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -82,7 +82,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+
+@@ -85,7 +85,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc
content::BrowserContext* profile) const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,12 +23,15 @@
using ThemeService = ThemeServiceAuraLinux;
#endif
-@@ -96,7 +96,7 @@ void ThemeServiceFactory::RegisterProfilePrefs(
+@@ -99,9 +99,9 @@ void ThemeServiceFactory::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
// 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)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
bool default_uses_system_theme = false;
-
- const views::LinuxUI* linux_ui = views::LinuxUI::instance();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const ui::LinuxUi* linux_ui = ui::LinuxUi::instance();
+ if (linux_ui)
+ default_uses_system_theme = linux_ui->GetDefaultUsesSystemTheme();
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 7c4696ba8336..8c546ae78914 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,24 +1,24 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,7 @@
+ #include "components/user_manager/user_manager.h"
+ #endif
- // 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)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
#endif
-@@ -320,7 +320,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -285,7 +285,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+ #endif
+ }
- // 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)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
- ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -556,7 +556,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+ auto* linux_ui = ui::LinuxUi::instance();
+@@ -530,7 +530,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;
-@@ -1122,7 +1122,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1093,7 +1093,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 babaefe684e0..e609826ecbed 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,6 +1,15 @@
---- chrome/browser/ui/chrome_pages.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/chrome_pages.cc
-@@ -568,7 +568,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -69,7 +69,7 @@
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/web_applications/web_app_utils.h"
+ #endif
+
+@@ -613,7 +613,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 6fdc2d8d1d80..26cd4d6a5ca9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
@@ -1,15 +1,15 @@
---- chrome/browser/ui/chrome_pages.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/chrome_pages.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/chrome_pages.h
-@@ -26,7 +26,7 @@
- #endif
+@@ -30,7 +30,7 @@ enum class ConsentLevel;
+ } // namespace signin
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/web_applications/web_app_utils.h"
- #endif
-
-@@ -204,7 +204,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+ namespace web_app {
+ enum class AppSettingsPageEntryPoint;
+ } // namespace web_app
+@@ -210,7 +210,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_sharing__hub_sharing__hub__bubble__controller.h b/www/chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
new file mode 100644
index 000000000000..af6ae234c95e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2022-08-31 12:19:35 UTC
++++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
+@@ -37,7 +37,7 @@ class SharingHubBubbleController {
+ virtual bool ShouldOfferOmniboxIcon() = 0;
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ // These two methods return the sets of first- and third-party actions;
+ // first-party actions are internal to Chrome and third-party actions are
+ // other websites or apps.
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 73385d686af5..cdfd16f14a0b 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/signin_view_controller.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/signin_view_controller.cc
-@@ -262,7 +262,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -271,7 +271,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_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h
index 246febfc321f..3255c96a8b69 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h
@@ -1,7 +1,7 @@
---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/signin_view_controller_delegate.h
-@@ -75,7 +75,7 @@ class SigninViewControllerDelegate {
- #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
+@@ -80,7 +80,7 @@ class SigninViewControllerDelegate {
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
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 ec5e0ff2d8e5..aff4e83871ad 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -128,7 +128,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#endif
-@@ -1016,7 +1016,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1017,7 +1017,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@@ -18,7 +18,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) &&
-@@ -1206,7 +1206,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1207,7 +1207,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 d0d8d5354dc3..4241012438fa 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/tab_helpers.cc
@@ -198,7 +198,7 @@
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/autofill_assistant/common_dependencies_chrome.h"
#include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h"
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
-@@ -536,13 +536,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -538,13 +538,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -25,7 +25,7 @@
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
-@@ -557,7 +557,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -559,7 +559,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index db8f379cdb37..3c031535fa20 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/task_manager/task_manager_table_model.cc
-@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(int row,
+@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
? stringifier_->backgrounded_string()
: stringifier_->foregrounded_string();
@@ -9,7 +9,7 @@
case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
return fd_count >= 0 ? base::FormatNumber(fd_count)
-@@ -621,7 +621,7 @@ int TaskManagerTableModel::CompareValues(int row1,
+@@ -621,7 +621,7 @@ int TaskManagerTableModel::CompareValues(size_t row1,
return BooleanCompare(is_proc1_bg, is_proc2_bg);
}
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 1f0bb1f3a1cd..e8222536c418 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
@@ -32,7 +32,7 @@
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
-@@ -238,7 +238,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -236,7 +236,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS},
#endif // !BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
index 87a83c6e9198..3fd43d757d06 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/chrome_views_delegate_linux.cc
@@ -23,7 +23,7 @@ bool IsDesktopEnvironmentUnity() {
return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY;
@@ -9,8 +9,8 @@
int GetWindowIconResourceId() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
switch (chrome::GetChannel()) {
-@@ -52,7 +52,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative
- return ::CreateNativeWidget(native_widget_type, params, delegate);
+@@ -67,7 +67,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative
+ delegate);
}
-#if BUILDFLAG(IS_LINUX)
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 8383d8d732f7..b2768b8cc274 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 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -49,11 +49,11 @@
@@ -11,7 +11,7 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/linux_ui/linux_ui.h"
+ #include "ui/linux/linux_ui.h"
#endif
@@ -62,7 +62,7 @@ namespace {
@@ -23,7 +23,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
-@@ -277,7 +277,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -279,7 +279,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
IsVisibleOnAllWorkspaces());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -32,16 +32,16 @@
// 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()
-@@ -398,7 +398,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -402,7 +402,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const views::LinuxUI* linux_ui = views::LinuxUI::instance();
+ const ui::LinuxUi* linux_ui = ui::LinuxUi::instance();
// Ignore GTK+ for web apps with window-controls-overlay as the
// display_override so the web contents can blend with the overlay by using
-@@ -417,7 +417,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
+@@ -421,7 +421,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
bool need_regenerate = false;
// 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_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
index acec7ddb493f..2331080a4906 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
@@ -15,6 +15,6 @@
BrowserView* browser_view) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- auto* linux_ui = views::LinuxUI::instance();
+ auto* linux_ui = ui::LinuxUi::instance();
auto* profile = browser_view->browser()->profile();
auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
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 4a671eea4f4c..cdcec49b450e 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1968,7 +1968,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -1990,7 +1990,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_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index 9e2f319ba90e..a6a683742921 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -53,7 +53,7 @@
+@@ -55,7 +55,7 @@
#include "ui/views/window/vector_icons/vector_icons.h"
#include "ui/views/window/window_shape.h"
@@ -9,7 +9,7 @@
#include "ui/views/controls/menu/menu_runner.h"
#endif
-@@ -542,7 +542,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
+@@ -552,7 +552,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
OpaqueBrowserFrameView::GetFrameButtonStyle() const {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
return FrameButtonStyle::kMdButton;
#else
return FrameButtonStyle::kImageButton;
-@@ -752,7 +752,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
+@@ -762,7 +762,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
}
void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
index 83585943ccc7..249db1f3ebbb 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h
-@@ -224,7 +224,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
+@@ -226,7 +226,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient
// Background painter for the window frame.
std::unique_ptr<views::FrameBackground> frame_background_;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
index 9934192460ee..e8afc6bd896b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -76,7 +76,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
ui::SimpleMenuModel* model) {
@@ -18,12 +18,12 @@
model->AddSeparator(ui::NORMAL_SEPARATOR);
bool supports_server_side_decorations = true;
#if defined(USE_OZONE) && !BUILDFLAG(IS_CHROMEOS)
-@@ -146,7 +146,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
+@@ -144,7 +144,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
+ model->AddSeparator(ui::NORMAL_SEPARATOR);
+ model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
}
- // 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)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
model->AddSeparator(ui::NORMAL_SEPARATOR);
model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
#endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index dca6a37abb19..f1dfa80f2ddc 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -606,7 +606,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+@@ -607,7 +607,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
index 813a4e82c7ca..9c4bd69e54e2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -140,7 +140,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
- #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
+@@ -154,7 +154,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -9,8 +9,8 @@
// static
std::unique_ptr<views::WebView>
SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
-@@ -419,7 +419,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
- #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
+@@ -436,7 +436,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
index 3cdb605a96fe..ab0ccdebb6aa 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
@@ -1,7 +1,7 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
-@@ -72,7 +72,7 @@ class SigninViewControllerDelegateViews
- #endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
+@@ -75,7 +75,7 @@ class SigninViewControllerDelegateViews
+ #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
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 7ef6da7a9116..e1b0fc513e63 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -480,7 +480,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -479,7 +479,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
// - Chrome OS
// Releasing capture on Ash cancels gestures so avoid it.
@@ -9,7 +9,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -1023,7 +1023,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -1032,7 +1032,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,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.
-@@ -1979,7 +1979,7 @@ void TabDragController::CompleteDrag() {
+@@ -1983,7 +1983,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@@ -27,7 +27,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
-@@ -2375,7 +2375,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2376,7 +2376,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__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
index 6b60931ed6e5..4b979476cb2a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
-@@ -71,7 +71,7 @@ GetMemoryPressureOverride() {
+@@ -72,7 +72,7 @@ GetMemoryPressureOverride() {
// Fetches the Omnibox drop-down widget, or returns null if the drop-down is
// not visible.
void FixWidgetStackOrder(views::Widget* widget, const Browser* browser) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc
index 06b162d7df10..4cf2e449fb75 100644
--- a/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/web_applications/app_browser_controller.cc
-@@ -385,7 +385,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup
+@@ -408,7 +408,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup
}
bool AppBrowserController::ShouldUseSystemTheme() const {
@@ -9,12 +9,3 @@
return browser_->profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
#else
return false;
-@@ -393,7 +393,7 @@ bool AppBrowserController::ShouldUseSystemTheme() cons
- }
-
- bool AppBrowserController::ShouldUseCustomFrame() const {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return browser_->profile()->GetPrefs()->GetBoolean(
- prefs::kUseCustomChromeFrame);
- #else
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 b0fae317f67f..c581db95979e 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 2022-08-02 06:45:26 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -305,7 +305,7 @@
+@@ -308,7 +308,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
-@@ -330,17 +330,17 @@
+@@ -333,17 +333,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
-@@ -693,7 +693,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -696,7 +696,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)
-@@ -1120,7 +1120,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1130,7 +1130,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
#endif // !defined(USE_REAL_DBUS_CLIENTS)
#endif // !defined(OFFICIAL_BUILD)
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -1178,7 +1178,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1188,7 +1188,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)
-@@ -1237,27 +1237,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1248,27 +1248,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -87,6 +87,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- if (base::FeatureList::IsEnabled(features::kDesktopPWAsWebAppSettingsPage) &&
- url.host_piece() == chrome::kChromeUIWebAppSettingsHost) {
+ if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost)
return &NewWebUI<WebAppSettingsUI>;
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
index 3528efb3b7a3..1b5d810e3576 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -325,7 +325,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
bool is_deprecated_app = false;
@@ -9,7 +9,7 @@
is_deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
#endif
-@@ -1434,7 +1434,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
+@@ -1426,7 +1426,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();
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 7fa1bc8cc912..6f7b2a4c6bf7 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/display/screen.h"
#endif
-@@ -137,7 +137,7 @@
+@@ -138,7 +138,7 @@
#include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
#endif
@@ -18,8 +18,8 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -373,7 +373,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
- {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
+@@ -381,7 +381,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+ {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
// 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)
@@ -27,7 +27,7 @@
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -381,7 +381,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@@ -36,7 +36,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
-@@ -402,7 +402,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -413,7 +413,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_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
index 8d4ec88a2bf9..a2ae4e1460e1 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/web_applications/web_app_provider.cc
-@@ -274,7 +274,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
+@@ -265,7 +265,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
protocol_handler_manager.get());
std::unique_ptr<UrlHandlerManager> url_handler_manager;
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 39b7ecb0b197..09f056354317 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 2022-07-22 17:30:31 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -673,7 +673,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+@@ -662,7 +662,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
}
}
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 727a781b7979..99d92c8d1bf8 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/common/chrome_features.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/chrome_features.cc
-@@ -102,7 +102,7 @@ const base::Feature kAsyncDns {
+@@ -90,7 +90,7 @@ const base::Feature kAsyncDns {
};
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// Enables or disables the Autofill survey triggered by opening a prompt to
// save address info.
const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey",
-@@ -117,7 +117,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
+@@ -105,7 +105,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
base::FEATURE_DISABLED_BY_DEFAULT};
#endif
@@ -18,7 +18,7 @@
// Enables the Restart background mode optimization. When all Chrome UI is
// closed and it goes in the background, allows to restart the browser to
// discard memory.
-@@ -293,7 +293,7 @@ const base::Feature kDesktopPWAsDetailedInstallDialog{
+@@ -276,7 +276,7 @@ const base::Feature kDesktopPWAsDetailedInstallDialog{
// Enables or disables Desktop PWAs to be auto-started on OS login.
const base::Feature kDesktopPWAsRunOnOsLogin {
"DesktopPWAsRunOnOsLogin",
@@ -27,16 +27,16 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -309,7 +309,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
+@@ -292,7 +292,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
base::FEATURE_DISABLED_BY_DEFAULT};
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // Serves web app settings at chrome://app-settings/<app-id>.
- const base::Feature kDesktopPWAsWebAppSettingsPage{
- "DesktopPWAsWebAppSettingsPage", base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -329,7 +329,7 @@ const base::Feature kKeepForceInstalledPreinstalledApp
+ // 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.
+@@ -314,7 +314,7 @@ const base::Feature kDisruptiveNotificationPermissionR
const 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
-@@ -345,7 +345,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -330,7 +330,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -54,16 +54,16 @@
true
#else
false
-@@ -624,7 +624,7 @@ const base::Feature kUpdateHistoryEntryPointsInIncogni
- const base::Feature kIPHInWebUIDemo{"IPHInWebUIDemo",
- base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -606,7 +606,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR
+ const base::Feature kUpdateHistoryEntryPointsInIncognito{
+ "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT};
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
COMPONENT_EXPORT(CHROME_FEATURES)
const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -637,7 +637,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -619,7 +619,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 c11bd7f7032c..59570d9f4064 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.h.orig 2022-07-22 17:30:31 UTC
+--- chrome/common/chrome_features.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/chrome_features.h
-@@ -89,7 +89,7 @@ extern const base::Feature kArcPiGhostWindow;
+@@ -81,7 +81,7 @@ extern const base::Feature kAppShimNewCloseBehavior;
COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kAutofillAddressSurvey;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -98,7 +98,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -90,7 +90,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kAutofillPasswordSurvey;
#endif
@@ -18,25 +18,25 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kBackgroundModeAllowRestart;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -223,7 +223,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -210,7 +210,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kDesktopPWAsWebBundles;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::Feature kDesktopPWAsWebAppSettingsPage;
+ extern const base::Feature kChromeAppsDeprecation;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -437,7 +437,7 @@ extern const base::Feature kUpdateHistoryEntryPointsIn
+@@ -424,7 +424,7 @@ extern const base::Feature kIncognitoNtpRevamp;
COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::Feature kIPHInWebUIDemo;
+ extern const base::Feature kUpdateHistoryEntryPointsInIncognito;
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS)
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kLinuxLowMemoryMonitor;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -446,7 +446,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -433,7 +433,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.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index 940ec1a8352a..6293a5fd75a9 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/common/chrome_paths.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/chrome_paths.cc
@@ -49,14 +49,14 @@
@@ -18,7 +18,7 @@
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -183,7 +183,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -27,7 +27,7 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
-@@ -426,10 +426,12 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -421,10 +421,12 @@ bool PathProvider(int key, base::FilePath* result) {
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -41,7 +41,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
-@@ -441,7 +443,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -436,7 +438,7 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
BUILDFLAG(CHROMIUM_BRANDING)) || \
@@ -50,7 +50,7 @@
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
-@@ -449,7 +451,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -444,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
}
#endif
@@ -59,7 +59,7 @@
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
-@@ -493,7 +495,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -488,7 +490,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
#endif
@@ -68,7 +68,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if BUILDFLAG(IS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -507,6 +509,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -502,6 +504,9 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index 2e20ce7c0e08..621d8f4d0ab3 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 2022-07-22 17:30:31 UTC
+--- chrome/common/chrome_switches.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/chrome_switches.cc
-@@ -796,14 +796,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -814,14 +814,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 7b130bd84741..d6e9870f6799 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 2022-07-22 17:30:31 UTC
+--- chrome/common/chrome_switches.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/chrome_switches.h
-@@ -251,12 +251,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -257,12 +257,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_extensions_permissions_chrome__permission__message__rules.cc b/www/chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
new file mode 100644
index 000000000000..71c99c4456e8
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc
@@ -0,0 +1,11 @@
+--- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2022-08-31 12:19:35 UTC
++++ chrome/common/extensions/permissions/chrome_permission_message_rules.cc
+@@ -284,7 +284,7 @@ int GetEnterpriseReportingPrivatePermissionMessageId()
+ }
+ #if BUILDFLAG(IS_WIN)
+ return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN;
+-#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC) or BUILDFLAG(IS_BSD)
+ return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS;
+ #else
+ return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE;
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 8af3895a8b65..29cc1f47fa21 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,4 +1,4 @@
---- chrome/common/pref_names.cc.orig 2022-07-22 17:30:31 UTC
+--- chrome/common/pref_names.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/pref_names.cc
@@ -1222,7 +1222,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
@@ -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";
-@@ -1812,7 +1812,7 @@ const char kDownloadDirUpgraded[] = "download.director
+@@ -1822,7 +1822,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
-@@ -2113,7 +2113,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
+@@ -2119,7 +2119,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
// its isolation requirements.
const char kWebAppsIsolationState[] = "web_apps.isolation_state";
@@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
// Dictionary that maps origins to web apps that can act as URL handlers.
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
-@@ -2243,7 +2243,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2219,7 +2219,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
// requests.
const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
@@ -45,7 +45,7 @@
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3258,7 +3258,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
+@@ -3248,7 +3248,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
const char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index 8b8e4cfa53be..dff7f9b8a7e2 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,4 +1,4 @@
---- chrome/common/pref_names.h.orig 2022-07-22 17:30:31 UTC
+--- chrome/common/pref_names.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/pref_names.h
@@ -382,7 +382,7 @@ extern const char kUseAshProxy[];
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -27,7 +27,7 @@
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -707,7 +707,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
+@@ -706,7 +706,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
-@@ -846,7 +846,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -840,7 +840,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)
-@@ -1111,7 +1111,7 @@ extern const char kBlockAutoplayEnabled[];
+@@ -1109,7 +1109,7 @@ extern const char kBlockAutoplayEnabled[];
#endif
extern const char kSandboxExternalProtocolBlocked[];
diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc
index 0a066eaaf812..e98596ecf9c3 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 2022-07-22 17:30:31 UTC
+--- chrome/common/url_constants.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/url_constants.cc
-@@ -477,7 +477,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
+@@ -489,7 +489,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 a595b87cb079..9ecc7a9582d0 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 2022-07-22 17:30:31 UTC
+--- chrome/common/url_constants.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/url_constants.h
-@@ -447,7 +447,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
+@@ -462,7 +462,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 e35cea15cbab..0aee7e7a68ec 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 2022-07-22 17:30:31 UTC
+--- chrome/common/webui_url_constants.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -454,18 +454,18 @@ const char kOsUIHelpAppURL[] = "os://help-app";
+@@ -473,18 +473,18 @@ const char kOsUIScanningAppURL[] = "os://scanning";
const char kOsUIVersionURL[] = "os://version";
#endif
@@ -22,7 +22,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
-@@ -480,14 +480,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -499,14 +499,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[] =
-@@ -502,7 +502,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -521,7 +521,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";
-@@ -577,7 +577,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -595,7 +595,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
-@@ -782,7 +782,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -801,7 +801,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 b2c295ad77bd..f8d55d53ee94 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 2022-07-22 17:30:31 UTC
+--- chrome/common/webui_url_constants.h.orig 2022-08-31 12:19:35 UTC
+++ chrome/common/webui_url_constants.h
-@@ -388,24 +388,24 @@ extern const char kOsUIHelpAppURL[];
+@@ -403,24 +403,24 @@ extern const char kOsUIScanningAppURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -420,14 +420,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -435,14 +435,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[];
-@@ -439,7 +439,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -454,7 +454,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 ae502ab49cbe..2edf2a22ac89 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 2022-07-22 17:30:31 UTC
+--- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -329,7 +329,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
+@@ -340,7 +340,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_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index c143112d49ad..76b44ad552c4 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 2022-08-17 07:04:17 UTC
+--- chrome/test/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ chrome/test/BUILD.gn
-@@ -9558,7 +9558,7 @@ test("chrome_app_unittests") {
+@@ -9731,7 +9731,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__install.cc b/www/chromium/files/patch-chrome_updater_app_app__install.cc
index 49758d18177d..acec22645cf9 100644
--- a/www/chromium/files/patch-chrome_updater_app_app__install.cc
+++ b/www/chromium/files/patch-chrome_updater_app_app__install.cc
@@ -1,6 +1,6 @@
---- chrome/updater/app/app_install.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/updater/app/app_install.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/updater/app/app_install.cc
-@@ -197,7 +197,7 @@ void AppInstall::WakeCandidate() {
+@@ -211,7 +211,7 @@ void AppInstall::WakeCandidate() {
update_service_internal, base::WrapRefCounted(this)));
}
diff --git a/www/chromium/files/patch-chrome_updater_updater.cc b/www/chromium/files/patch-chrome_updater_updater.cc
index ef2077e3a396..5cf501dd352a 100644
--- a/www/chromium/files/patch-chrome_updater_updater.cc
+++ b/www/chromium/files/patch-chrome_updater_updater.cc
@@ -1,6 +1,6 @@
---- chrome/updater/updater.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/updater/updater.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/updater/updater.cc
-@@ -41,7 +41,7 @@
+@@ -44,7 +44,7 @@
#include "chrome/updater/win/win_util.h"
#elif BUILDFLAG(IS_MAC)
#include "chrome/updater/app/server/mac/server.h"
diff --git a/www/chromium/files/patch-chrome_updater_util.cc b/www/chromium/files/patch-chrome_updater_util.cc
index 4806e48563b4..04aabd8d1115 100644
--- a/www/chromium/files/patch-chrome_updater_util.cc
+++ b/www/chromium/files/patch-chrome_updater_util.cc
@@ -1,6 +1,6 @@
---- chrome/updater/util.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/updater/util.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/updater/util.cc
-@@ -261,7 +261,7 @@ GURL AppendQueryParameter(const GURL& url,
+@@ -263,7 +263,7 @@ GURL AppendQueryParameter(const GURL& url,
return url.ReplaceComponents(replacements);
}
@@ -8,4 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// TODO(crbug.com/1276188) - implement the functions below.
- absl::optional<base::FilePath> GetUpdaterFolderPath(UpdaterScope scope) {
+ absl::optional<base::FilePath> GetBaseInstallDirectory(UpdaterScope scope) {
diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc
index b650922a7624..f22832e46b19 100644
--- a/www/chromium/files/patch-chrome_utility_services.cc
+++ b/www/chromium/files/patch-chrome_utility_services.cc
@@ -1,6 +1,6 @@
---- chrome/utility/services.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/utility/services.cc.orig 2022-08-31 12:19:35 UTC
+++ chrome/utility/services.cc
-@@ -74,7 +74,7 @@
+@@ -77,7 +77,7 @@
#include "chrome/services/file_util/file_util_service.h" // nogncheck
#endif
@@ -9,7 +9,7 @@
#include "chrome/services/file_util/document_analysis_service.h" // nogncheck
#endif
-@@ -249,7 +249,7 @@ auto RunCupsIppParser(
+@@ -261,7 +261,7 @@ auto RunCupsIppParser(
}
#endif
@@ -18,7 +18,7 @@
auto RunDocumentAnalysis(
mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) {
return std::make_unique<DocumentAnalysisService>(std::move(receiver));
-@@ -432,7 +432,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -454,7 +454,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
services.Add(RunFileUtil);
#endif
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index 3e4bf9065dd6..76c6b274c62f 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-07-22 17:30:31 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-08-31 12:19:35 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
-@@ -91,7 +91,7 @@
+@@ -92,7 +92,7 @@
#include "ui/base/ui_base_switches.h"
#include "ui/gl/gl_switches.h"
@@ -9,7 +9,7 @@
#include <fontconfig/fontconfig.h>
#include <signal.h>
#include <sys/prctl.h>
-@@ -278,7 +278,7 @@ class CastViewsDelegate : public views::ViewsDelegate
+@@ -280,7 +280,7 @@ class CastViewsDelegate : public views::ViewsDelegate
#endif // defined(USE_AURA)
@@ -18,7 +18,7 @@
base::FilePath GetApplicationFontsDir() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -324,7 +324,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -326,7 +326,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
{cc::switches::kDisableThreadedAnimation, ""},
#endif // BUILDFLAG(IS_ANDROID)
#endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -27,12 +27,12 @@
#if defined(ARCH_CPU_X86_FAMILY)
// This is needed for now to enable the x11 Ozone platform to work with
// current Linux/NVidia OpenGL drivers.
-@@ -512,7 +512,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -514,7 +514,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
views_delegate_ = std::make_unique<CastViewsDelegate>();
#endif // defined(USE_AURA)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
base::FilePath dir_font = GetApplicationFontsDir();
- const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data());
- if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) {
+ const FcChar8* dir_font_char8 =
+ reinterpret_cast<const FcChar8*>(dir_font.value().data());
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index e397aeb17314..2f59cf8e7b96 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,15 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2022-06-17 14:20:10 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig 2022-08-31 12:19:35 UTC
+++ chromecast/browser/cast_content_browser_client.cc
-@@ -135,7 +135,7 @@
- #include "extensions/common/constants.h" // nogncheck
- #endif
-
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE)
- #include "chromecast/browser/webview/webview_controller.h"
- #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-
-@@ -474,7 +474,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -470,7 +470,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
switches::kAudioOutputChannels));
}
} else if (process_type == switches::kGpuProcess) {
@@ -18,12 +9,3 @@
// Necessary for accelerated 2d canvas. By default on Linux, Chromium
// assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU
// canvas apps.
-@@ -870,7 +870,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation
- handle, general_audience_browsing_service_.get()));
- }
-
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE)
- auto webview_throttle = WebviewController::MaybeGetNavigationThrottle(handle);
- if (webview_throttle) {
- throttles.push_back(std::move(webview_throttle));
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc
deleted file mode 100644
index c93e5a2299f5..000000000000
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2022-03-25 21:59:56 UTC
-+++ chromecast/browser/cast_content_browser_client_receiver_bindings.cc
-@@ -35,7 +35,7 @@
- #include "media/mojo/services/media_service.h" // nogncheck
- #endif // BUILDFLAG(ENABLE_CAST_RENDERER)
-
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE)
- #include "chromecast/browser/webview/js_channel_service.h"
- #include "chromecast/common/mojom/js_channel.mojom.h"
- #endif
-@@ -234,7 +234,7 @@ void CastContentBrowserClient::RunServiceInstance(
- void CastContentBrowserClient::BindHostReceiverForRenderer(
- content::RenderProcessHost* render_process_host,
- mojo::GenericPendingReceiver receiver) {
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE)
- if (auto r = receiver.As<::chromecast::mojom::JsChannelBindingProvider>()) {
- JsChannelService::Create(render_process_host, std::move(r),
- base::ThreadTaskRunnerHandle::Get());
diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
index f70a32aef06a..92eda4a3c9b6 100644
--- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
+++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
@@ -1,6 +1,6 @@
---- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-07-22 17:30:31 UTC
+--- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-08-31 12:19:35 UTC
+++ chromecast/renderer/cast_content_renderer_client.cc
-@@ -191,7 +191,7 @@ void CastContentRendererClient::RenderFrameCreated(
+@@ -190,7 +190,7 @@ void CastContentRendererClient::RenderFrameCreated(
dispatcher->OnRenderFrameCreated(render_frame);
#endif
diff --git a/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc b/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc
index 2f292859d16f..ec3047f887db 100644
--- a/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc
+++ b/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc
@@ -1,6 +1,6 @@
---- components/autofill_assistant/browser/client_context.cc.orig 2022-06-17 14:20:10 UTC
+--- components/autofill_assistant/browser/client_context.cc.orig 2022-08-31 12:19:35 UTC
+++ components/autofill_assistant/browser/client_context.cc
-@@ -20,7 +20,7 @@ ClientContextImpl::ClientContextImpl(const Client* cli
+@@ -23,7 +23,7 @@ ClientContextImpl::ClientContextImpl(const Client* cli
proto_.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID);
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
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 c55baf840559..7be9d677404c 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 2022-07-22 17:30:31 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-08-31 12:19:35 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1983,7 +1983,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -2053,7 +2053,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 7903ec7d423a..b413213afd18 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 2022-07-22 17:30:31 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-08-31 12:19:35 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -223,7 +223,7 @@ const base::FeatureParam<int>
+@@ -232,7 +232,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_cast__channel_cast__message__util.cc b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc
index 5ae76b075f2d..8907c56eca10 100644
--- a/www/chromium/files/patch-components_cast__channel_cast__message__util.cc
+++ b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc
@@ -1,6 +1,6 @@
---- components/cast_channel/cast_message_util.cc.orig 2022-02-28 16:54:41 UTC
+--- components/cast_channel/cast_message_util.cc.orig 2022-08-31 12:19:35 UTC
+++ components/cast_channel/cast_message_util.cc
-@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() {
+@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() {
return 4;
#elif BUILDFLAG(IS_CHROMEOS_ASH)
return 5;
diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
index 20e78250ae4a..539d5ef69911 100644
--- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/app/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+--- components/crash/core/app/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ components/crash/core/app/BUILD.gn
@@ -52,7 +52,7 @@ static_library("app") {
"crashpad.h",
@@ -9,7 +9,7 @@
sources += [
"breakpad_linux.cc",
"breakpad_linux.h",
-@@ -61,6 +61,10 @@ static_library("app") {
+@@ -62,6 +62,10 @@ static_library("app") {
]
}
@@ -20,7 +20,7 @@
defines = [ "CRASH_IMPLEMENTATION" ]
public_deps = [ ":lib" ]
-@@ -88,7 +92,7 @@ static_library("app") {
+@@ -89,7 +93,7 @@ static_library("app") {
libs = [ "log" ]
}
@@ -29,7 +29,7 @@
deps += [
"//base:base_static",
"//components/crash/core/common",
-@@ -96,7 +100,7 @@ static_library("app") {
+@@ -97,7 +101,7 @@ static_library("app") {
]
}
@@ -38,7 +38,7 @@
deps += [ "//third_party/breakpad:client" ]
}
-@@ -216,11 +220,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -217,11 +221,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
# define custom UserStreamDataSources.
executable("chrome_crashpad_handler") {
sources = [ "chrome_crashpad_handler.cc" ]
diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
index 6dc52dff9502..7e4770a332e8 100644
--- a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -1,11 +1,11 @@
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2022-02-07 13:39:41 UTC
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2022-08-31 12:19:35 UTC
+++ components/discardable_memory/service/discardable_shared_memory_manager.cc
-@@ -171,7 +171,7 @@ int64_t GetDefaultMemoryLimit() {
+@@ -171,7 +171,7 @@ uint64_t GetDefaultMemoryLimit() {
// Limits the number of FDs used to 32, assuming a 4MB allocation size.
- int64_t max_default_memory_limit = 128 * kMegabyte;
+ uint64_t max_default_memory_limit = 128 * kMegabyte;
#else
-- int64_t max_default_memory_limit = 512 * kMegabyte;
-+ int64_t max_default_memory_limit = 128 * kMegabyte;
+- uint64_t max_default_memory_limit = 512 * kMegabyte;
++ uint64_t max_default_memory_limit = 128 * kMegabyte;
#endif
// Use 1/8th of discardable memory on low-end devices.
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 48df9a6dfeae..f0429d320a17 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,15 +1,15 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-06-17 14:20:10 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -55,7 +55,7 @@ namespace {
- static constexpr char kChromeProductVersionRegex[] =
- "Chrome/([0-9]+).([0-9]+).([0-9]+).([0-9]+)";
+@@ -80,7 +80,7 @@ const char kDesktop[] =
+ "Safari/537.36";
+ #endif // BUILDFLAG(IS_ANDROID)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
std::string GetMachine() {
struct utsname unixinfo;
uname(&unixinfo);
-@@ -163,7 +163,7 @@ void CheckUserAgentStringOrdering(bool mobile_device)
+@@ -188,7 +188,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 6413065ac7db..6151de64c27b 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 2022-07-22 17:30:31 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig 2022-08-31 12:19:35 UTC
+++ components/feature_engagement/public/feature_configurations.cc
@@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
absl::optional<FeatureConfig> GetClientSideFeatureConfig(
@@ -9,7 +9,7 @@
if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
absl::optional<FeatureConfig> config = FeatureConfig();
config->valid = true;
-@@ -889,7 +889,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -868,7 +868,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
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 bdcff7224d75..fb5b06694eea 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,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2022-07-22 17:30:31 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2022-08-31 12:19:35 UTC
+++ components/feature_engagement/public/feature_constants.cc
@@ -23,7 +23,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy",
base::FEATURE_DISABLED_BY_DEFAULT};
@@ -9,7 +9,7 @@
const base::Feature kIPHDesktopSharedHighlightingFeature{
"IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kIPHDesktopTabGroupsNewGroupFeature{
-@@ -298,7 +298,7 @@ const base::Feature kIPHFollowWhileBrowsingFeature{
+@@ -299,7 +299,7 @@ const base::Feature kIPHFollowWhileBrowsingFeature{
"IPH_FollowWhileBrowsing", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // BUILDFLAG(IS_IOS)
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 3a50e7f75ab7..8c9dbeb6812c 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 2022-07-22 17:30:31 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2022-08-31 12:19:35 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -32,7 +32,7 @@ extern const base::Feature kIPHDummyFeature;
extern const base::Feature kEnableIPH;
@@ -9,7 +9,7 @@
extern const base::Feature kIPHDesktopSharedHighlightingFeature;
extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature;
extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature;
-@@ -180,7 +180,7 @@ extern const base::Feature kIPHPasswordSuggestionsFeat
+@@ -181,7 +181,7 @@ extern const base::Feature kIPHPasswordSuggestionsFeat
extern const base::Feature kIPHFollowWhileBrowsingFeature;
#endif // BUILDFLAG(IS_IOS)
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 3984de4f52dc..5960285a7e4c 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,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig 2022-07-22 17:30:31 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2022-08-31 12:19:35 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -228,7 +228,7 @@ DEFINE_VARIATION_PARAM(kIPHFollowWhileBrowsingFeature,
+@@ -227,7 +227,7 @@ DEFINE_VARIATION_PARAM(kIPHFollowWhileBrowsingFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature,
"IPH_DesktopTabGroupsNewGroup");
DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode");
-@@ -257,7 +257,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int
+@@ -256,7 +256,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -19,7 +19,7 @@
DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature,
"IPH_AutofillVirtualCardSuggestion");
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
-@@ -364,7 +365,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -363,7 +364,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHPasswordSuggestionsFeature),
VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature),
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -28,7 +28,7 @@
VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature),
VARIATION_ENTRY(kIPHFocusModeFeature),
VARIATION_ENTRY(kIPHGlobalMediaControls),
-@@ -387,7 +388,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -386,7 +387,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
index fe893d3cd63c..72fb90ce1dc5 100644
--- a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
+++ b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
@@ -1,6 +1,6 @@
---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2022-03-25 21:59:56 UTC
+--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ components/feed/core/v2/feed_network_impl_unittest.cc
-@@ -678,8 +678,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
+@@ -807,8 +807,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type());
EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type());
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
index ff5f63d24717..bcb0368cd104 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-07-22 17:30:31 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-08-31 12:19:35 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -157,7 +157,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -162,7 +162,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
// Delete the local undecryptable copy when this is MacOS only.
#if BUILDFLAG(IS_MAC)
return true;
@@ -9,7 +9,7 @@
return base::FeatureList::IsEnabled(
features::kSyncUndecryptablePasswordsLinux);
#else
-@@ -166,7 +166,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -171,7 +171,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
}
bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
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 cd21cf8a64f7..9e519fe9075a 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 2022-07-22 17:30:31 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2022-08-31 12:19:35 UTC
+++ components/password_manager/core/common/password_manager_features.cc
-@@ -70,7 +70,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{
+@@ -71,7 +71,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{
const base::Feature kFillOnAccountSelect = {"fill-on-account-select",
base::FEATURE_DISABLED_BY_DEFAULT};
@@ -9,18 +9,17 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
const base::Feature kForceInitialSyncWhenDecryptionFails = {
-@@ -164,7 +164,7 @@ const base::Feature kRecoverFromNeverSaveAndroid = {
- const base::Feature kSecondaryServerFieldPredictions = {
- "SecondaryServerFieldPredictions", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -183,14 +183,14 @@ const base::Feature kEnableBiometricAuthenticationInSe
+ base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Displays at least the decryptable and never saved logins in the password
// manager
const base::Feature kSkipUndecryptablePasswords = {
-@@ -176,7 +176,7 @@ const base::Feature kSkipUndecryptablePasswords = {
- const base::Feature kSupportForAddPasswordsInSettings = {
- "SupportForAddPasswordsInSettings", base::FEATURE_ENABLED_BY_DEFAULT};
+ "SkipUndecryptablePasswords", base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
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 c1ca462e09da..de8a68edf23d 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,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2022-07-22 17:30:31 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2022-08-31 12:19:35 UTC
+++ components/password_manager/core/common/password_manager_features.h
@@ -31,7 +31,7 @@ extern const base::Feature KEnablePasswordGenerationFo
extern const base::Feature kEnablePasswordManagerWithinFencedFrame;
@@ -9,15 +9,14 @@
extern const base::Feature kForceInitialSyncWhenDecryptionFails;
#endif
extern const base::Feature kInferConfirmationPasswordField;
-@@ -51,11 +51,11 @@ extern const base::Feature kPasswordsAccountStorageRev
- extern const base::Feature kPasswordScriptsFetching;
- extern const base::Feature kRecoverFromNeverSaveAndroid;
- extern const base::Feature kSecondaryServerFieldPredictions;
+@@ -58,10 +58,10 @@ extern const base::Feature kSecondaryServerFieldPredic
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+ extern const base::Feature kEnableBiometricAuthenticationInSettings;
+ #endif
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
extern const base::Feature kSkipUndecryptablePasswords;
#endif
- extern const base::Feature kSupportForAddPasswordsInSettings;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
extern const base::Feature kSyncUndecryptablePasswordsLinux;
diff --git a/www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc b/www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc
index a3acfb0f31d5..049516814c6a 100644
--- a/www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc
+++ b/www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc
@@ -1,6 +1,6 @@
---- components/permissions/prediction_service/prediction_common.cc.orig 2022-02-28 16:54:41 UTC
+--- components/permissions/prediction_service/prediction_common.cc.orig 2022-08-31 12:19:35 UTC
+++ components/permissions/prediction_service/prediction_common.cc
-@@ -36,7 +36,7 @@ int BucketizeValue(int count) {
+@@ -33,7 +33,7 @@ int BucketizeValue(int count) {
ClientFeatures_Platform GetCurrentPlatformProto() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP;
#elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
return permissions::ClientFeatures_Platform_PLATFORM_MOBILE;
-@@ -47,7 +47,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() {
+@@ -44,7 +44,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() {
ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
index 0a9241a18d31..f29db6c7c658 100644
--- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
@@ -1,6 +1,6 @@
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-03-25 21:59:56 UTC
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-08-31 12:19:35 UTC
+++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -342,7 +342,7 @@ class PolicyTestCase {
+@@ -334,7 +334,7 @@ class PolicyTestCase {
const std::string os("chromeos_lacros");
#elif BUILDFLAG(IS_IOS)
const std::string os("ios");
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index 2b1a3183decf..5b673ee979f0 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-07-22 17:30:31 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-09-02 08:32:00 UTC
+++ components/policy/core/common/cloud/cloud_policy_util.cc
@@ -20,7 +20,7 @@
#endif
@@ -9,7 +9,7 @@
#include <pwd.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -35,10 +35,14 @@
+@@ -35,10 +35,15 @@
#import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
#endif
@@ -19,13 +19,14 @@
#endif
+#if BUILDFLAG(IS_FREEBSD)
++#include <sys/param.h>
+#define HOST_NAME_MAX MAXHOSTNAMELEN
+#endif
+
#include <utility>
#include "base/check.h"
-@@ -82,7 +86,7 @@ namespace em = enterprise_management;
+@@ -82,7 +87,7 @@ namespace em = enterprise_management;
std::string GetMachineName() {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -34,7 +35,7 @@
char hostname[HOST_NAME_MAX];
if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
return hostname;
-@@ -140,7 +144,7 @@ std::string GetMachineName() {
+@@ -140,7 +145,7 @@ std::string GetMachineName() {
std::string GetOSVersion() {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -43,7 +44,7 @@
return base::SysInfo::OperatingSystemVersion();
#elif BUILDFLAG(IS_WIN)
base::win::OSInfo::VersionNumber version_number =
-@@ -163,7 +167,7 @@ std::string GetOSArchitecture() {
+@@ -163,7 +168,7 @@ std::string GetOSArchitecture() {
}
std::string GetOSUsername() {
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index da0949d31b26..5b9fa629c388 100644
--- a/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig 2022-07-22 17:30:31 UTC
+--- components/policy/resources/policy_templates.json.orig 2022-08-31 12:19:35 UTC
+++ components/policy/resources/policy_templates.json
-@@ -1440,7 +1440,7 @@
+@@ -1442,7 +1442,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -9,7 +9,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -2568,7 +2568,7 @@
+@@ -2570,7 +2570,7 @@
'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -4334,7 +4334,7 @@
+@@ -4336,7 +4336,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -27,7 +27,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -4363,7 +4363,7 @@
+@@ -4365,7 +4365,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -36,7 +36,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -5327,7 +5327,7 @@
+@@ -5331,7 +5331,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -45,7 +45,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -5388,7 +5388,7 @@
+@@ -5392,7 +5392,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -54,7 +54,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -5454,7 +5454,7 @@
+@@ -5458,7 +5458,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -10680,7 +10680,7 @@
+@@ -10875,7 +10875,7 @@
'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -72,7 +72,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -10774,7 +10774,7 @@
+@@ -10969,7 +10969,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -81,7 +81,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -12777,7 +12777,7 @@
+@@ -13011,7 +13011,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -90,7 +90,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -13635,7 +13635,7 @@
+@@ -13869,7 +13869,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -99,7 +99,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -20602,7 +20602,7 @@
+@@ -20892,7 +20892,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -108,7 +108,7 @@
'features': {
'can_be_recommended': False,
'dynamic_refresh': True,
-@@ -20633,7 +20633,7 @@
+@@ -20923,7 +20923,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -117,7 +117,7 @@
'deprecated': True,
'features': {
'can_be_recommended': False,
-@@ -20667,7 +20667,7 @@
+@@ -20957,7 +20957,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -126,7 +126,7 @@
'features': {
'can_be_recommended': False,
'dynamic_refresh': True,
-@@ -21437,7 +21437,7 @@
+@@ -21729,7 +21729,7 @@
'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -135,7 +135,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -25751,7 +25751,7 @@
+@@ -26348,7 +26348,7 @@
'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -144,7 +144,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -27095,7 +27095,7 @@ If this policy is left unset, privacy screen is disabl
+@@ -27731,7 +27731,7 @@ If this policy is left unset, privacy screen is disabl
'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -153,7 +153,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -27119,7 +27119,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google
+@@ -27755,7 +27755,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google
'owners': ['file://chrome/browser/notifications/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -162,7 +162,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -28217,7 +28217,7 @@ If you disable this policy, web page scrolling to spec
+@@ -28853,7 +28853,7 @@ If you disable this policy, web page scrolling to spec
'owners': ['asumaneev@google.com'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -171,7 +171,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -29463,7 +29463,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -30101,7 +30101,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
},
],
'default': True,
@@ -180,7 +180,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -29596,7 +29596,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -30234,7 +30234,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
'owners': ['mattm@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
index 8d0c97ec9447..34527ee1ce8e 100644
--- a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
+++ b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc
@@ -1,20 +1,11 @@
---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-05-19 14:06:27 UTC
+--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-08-31 12:19:35 UTC
+++ components/startup_metric_utils/browser/startup_metric_utils.cc
-@@ -308,7 +308,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time
-
+@@ -311,7 +311,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time
// Enabling this logic on OS X causes a significant performance regression.
- // https://crbug.com/601270
+ // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are
+ // ignored on Mac main thread.
-#if !BUILDFLAG(IS_APPLE)
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
static bool statics_initialized = false;
-
- base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL;
-@@ -322,7 +322,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time
- static const base::Time time_base = base::Time::Now();
- static const base::TimeTicks trace_ticks_base = base::TimeTicks::Now();
-
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
if (!statics_initialized) {
- base::PlatformThread::SetCurrentThreadPriority(previous_priority);
- }
+ statics_initialized = true;
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 b2576b2c3f7a..2f24572550cb 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 2022-07-22 17:30:31 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1142,7 +1142,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1156,7 +1156,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 7f2280fe28ea..906ba665dc49 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,8 +1,8 @@
---- components/viz/service/display/skia_renderer.cc.orig 2022-07-22 17:30:31 UTC
+--- components/viz/service/display/skia_renderer.cc.orig 2022-08-31 12:19:35 UTC
+++ components/viz/service/display/skia_renderer.cc
-@@ -1021,7 +1021,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1024,7 +1024,7 @@ void SkiaRenderer::ClearFramebuffer() {
if (current_frame()->current_render_pass->has_transparent_background) {
- ClearCanvas(SkColorSetARGB(0, 0, 0, 0));
+ ClearCanvas(SkColors::kTransparent);
} else {
-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
+#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc
index eca4a882dc87..05ecbeb93d7c 100644
--- a/www/chromium/files/patch-content_app_content__main.cc
+++ b/www/chromium/files/patch-content_app_content__main.cc
@@ -1,7 +1,7 @@
---- content/app/content_main.cc.orig 2022-04-21 18:48:31 UTC
+--- content/app/content_main.cc.orig 2022-08-31 12:19:35 UTC
+++ content/app/content_main.cc
-@@ -260,7 +260,7 @@ RunContentProcess(ContentMainParams params,
- base::allocator::InstallDanglingRawPtrChecks();
+@@ -259,7 +259,7 @@ RunContentProcess(ContentMainParams params,
+ #endif
base::EnableTerminationOnOutOfMemory();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
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 9d293294cde9..f892589ed3e0 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,4 +1,4 @@
---- content/app/content_main_runner_impl.cc.orig 2022-07-22 17:30:31 UTC
+--- content/app/content_main_runner_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ content/app/content_main_runner_impl.cc
@@ -128,13 +128,13 @@
#include "base/posix/global_descriptors.h"
@@ -27,7 +27,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
#include "content/browser/android/battery_metrics.h"
-@@ -360,7 +364,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -358,7 +362,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -36,7 +36,7 @@
#if BUILDFLAG(ENABLE_PLUGINS)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -396,7 +400,7 @@ void PreloadLibraryCdms() {
+@@ -394,7 +398,7 @@ void PreloadLibraryCdms() {
}
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
@@ -45,7 +45,7 @@
void PreSandboxInit() {
// Pre-acquire resources needed by BoringSSL. See
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
-@@ -412,6 +416,11 @@ void PreSandboxInit() {
+@@ -410,6 +414,11 @@ void PreSandboxInit() {
#endif
InitializeWebRtcModule();
@@ -57,7 +57,7 @@
// Set the android SkFontMgr for blink. We need to ensure this is done
// before the sandbox is initialized to allow the font manager to access
// font configuration files on disk.
-@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
+@@ -592,7 +601,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -80,7 +80,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -964,6 +972,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -965,6 +973,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
}
#endif
@@ -97,7 +97,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
-@@ -1021,7 +1039,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1024,7 +1042,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
mojo::core::InitFeatures();
}
@@ -106,7 +106,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
-@@ -1054,6 +1072,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1057,6 +1075,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 d9eff69f81e7..1e5968c8314e 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 2022-07-22 17:30:31 UTC
+--- content/browser/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ content/browser/BUILD.gn
-@@ -2419,6 +2419,13 @@ source_set("browser") {
+@@ -2435,6 +2435,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 7fe1499926cb..b023672c445c 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2022-07-22 17:30:31 UTC
+--- content/browser/browser_main_loop.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/browser_main_loop.cc
-@@ -241,6 +241,12 @@
+@@ -240,6 +240,12 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
@@ -13,7 +13,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -524,6 +530,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -523,6 +529,12 @@ int BrowserMainLoop::EarlyInitialization() {
// by now since a thread to start the ServiceManager has been created
// before the browser main loop starts.
DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,17 +26,8 @@
#endif
// GLib's spawning of new processes is buggy, so it's important that at this
-@@ -551,7 +563,7 @@ int BrowserMainLoop::EarlyInitialization() {
-
- // Up the priority of the UI thread unless it was already high (since Mac
- // and recent versions of Android (O+) do this automatically).
--#if !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
- if (base::FeatureList::IsEnabled(
- features::kBrowserUseDisplayThreadPriority) &&
- base::PlatformThread::GetCurrentThreadPriority() <
-@@ -562,7 +574,7 @@ int BrowserMainLoop::EarlyInitialization() {
- #endif // !BUILDFLAG(IS_MAC)
+@@ -554,7 +566,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing);
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
index 2bc019e81334..ee97b07c800c 100644
--- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
+++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
@@ -1,4 +1,4 @@
---- content/browser/download/download_manager_impl.cc.orig 2022-06-17 14:20:10 UTC
+--- content/browser/download/download_manager_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/download/download_manager_impl.cc
@@ -91,7 +91,7 @@
#include "third_party/blink/public/common/storage_key/storage_key.h"
@@ -9,7 +9,7 @@
#include "base/nix/xdg_util.h"
#endif
-@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl
+@@ -218,7 +218,7 @@ class DownloadItemFactoryImpl : public download::Downl
}
};
@@ -18,7 +18,7 @@
base::FilePath GetTemporaryDownloadDirectory() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share");
-@@ -656,7 +656,7 @@ bool DownloadManagerImpl::InterceptDownload(
+@@ -654,7 +654,7 @@ bool DownloadManagerImpl::InterceptDownload(
base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() {
base::FilePath default_download_directory;
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
index 5add7191a5d9..f9ccc0daa54b 100644
--- 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
@@ -1,6 +1,6 @@
---- content/browser/media/frameless_media_interface_proxy.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/media/frameless_media_interface_proxy.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/media/frameless_media_interface_proxy.cc
-@@ -15,7 +15,7 @@
+@@ -16,7 +16,7 @@
#include "media/mojo/mojom/renderer_extensions.mojom.h"
#include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
@@ -9,12 +9,12 @@
#include "content/public/browser/stable_video_decoder_factory.h"
#include "media/base/media_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -64,7 +64,7 @@ void FramelessMediaInterfaceProxy::CreateVideoDecoder(
+@@ -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)) {
- // TODO(b/195769334): for now, we're using the same
- // StableVideoDecoderFactory. However, we should be using a separate
+ if (!render_process_host_) {
+ if (!stable_vd_factory_remote_.is_bound()) {
diff --git a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
new file mode 100644
index 000000000000..4c30fea1acf7
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
@@ -0,0 +1,20 @@
+--- content/browser/media/frameless_media_interface_proxy.h.orig 2022-08-31 12:19:35 UTC
++++ content/browser/media/frameless_media_interface_proxy.h
+@@ -19,7 +19,7 @@
+ #include "mojo/public/cpp/bindings/receiver_set.h"
+ #include "mojo/public/cpp/bindings/remote.h"
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
+@@ -99,7 +99,7 @@ class FramelessMediaInterfaceProxy final
+ // Connections to the renderer.
+ mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Connection to the StableVideoDecoderFactory that lives in a utility
+ // process. This is only used for out-of-process video decoding and only when
+ // the FramelessMediaInterfaceProxy is created without a RenderProcessHost
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
index 983c990f29ad..4dd973eb0f7f 100644
--- a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
+++ b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
@@ -1,6 +1,6 @@
---- content/browser/media/media_interface_proxy.cc.orig 2022-06-17 14:20:10 UTC
+--- content/browser/media/media_interface_proxy.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/media/media_interface_proxy.cc
-@@ -74,7 +74,7 @@
+@@ -73,7 +73,7 @@
#include "media/mojo/services/mojo_renderer_service.h" // nogncheck
#endif
@@ -9,12 +9,12 @@
#include "content/public/browser/stable_video_decoder_factory.h"
#include "media/base/media_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -294,7 +294,7 @@ void MediaInterfaceProxy::CreateVideoDecoder(
+@@ -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)) {
- // TODO(b/195769334): for now, we're using the same
- // StableVideoDecoderFactory. However, we should be using a separate
+ render_frame_host().GetProcess()->CreateStableVideoDecoder(
+ oop_video_decoder.InitWithNewPipeAndPassReceiver());
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 55cc6c74c2a8..e4db469b146e 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 2022-07-22 17:30:31 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -289,7 +289,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__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
index 2479b1bac7a5..48ad581f1bc9 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_message_filter.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/renderer_host/render_message_filter.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/renderer_host/render_message_filter.cc
@@ -66,7 +66,7 @@
#if BUILDFLAG(IS_MAC)
@@ -15,15 +15,15 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void RenderMessageFilter::SetThreadPriorityOnFileThread(
+ void RenderMessageFilter::SetThreadTypeOnWorkerThread(
base::PlatformThreadId ns_tid,
- base::ThreadPriority priority) {
-@@ -149,7 +149,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea
+ base::ThreadType thread_type) {
+@@ -149,7 +149,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread(
}
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void RenderMessageFilter::SetThreadPriority(int32_t ns_tid,
- base::ThreadPriority priority) {
+ void RenderMessageFilter::SetThreadType(int32_t ns_tid,
+ base::ThreadType thread_type) {
constexpr base::TaskTraits kTraits = {
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
index e64358b3d03c..9b037a8d3664 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
@@ -1,19 +1,18 @@
---- content/browser/renderer_host/render_message_filter.h.orig 2022-02-28 16:54:41 UTC
+--- content/browser/renderer_host/render_message_filter.h.orig 2022-08-31 12:19:35 UTC
+++ content/browser/renderer_host/render_message_filter.h
-@@ -78,14 +78,14 @@ class RenderMessageFilter
+@@ -78,13 +78,13 @@ class RenderMessageFilter
void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override;
void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override;
void HasGpuProcess(HasGpuProcessCallback callback) override;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void SetThreadPriority(int32_t ns_tid,
- base::ThreadPriority priority) override;
+ void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override;
#endif
void OnResolveProxy(const GURL& url, IPC::Message* reply_msg);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid,
- base::ThreadPriority priority);
+ void SetThreadTypeOnWorkerThread(base::PlatformThreadId ns_tid,
+ base::ThreadType thread_type);
#endif
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 e4dc45c1b621..a55262854c34 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,7 +1,7 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-07-22 17:30:31 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -211,7 +211,7 @@
- #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
+@@ -213,7 +213,7 @@
+ #include "content/browser/hid/hid_service.h"
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
-@@ -1139,7 +1139,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1143,7 +1143,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;
-@@ -1226,7 +1226,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1230,7 +1230,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
return;
}
@@ -27,7 +27,16 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -3211,6 +3211,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -2108,7 +2108,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector(
+ std::move(receiver));
+ }
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void RenderProcessHostImpl::CreateStableVideoDecoder(
+ mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
+ if (!stable_video_decoder_factory_remote_.is_bound()) {
+@@ -3229,6 +3229,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
@@ -35,3 +44,12 @@
switches::kDisableV8IdleTasks,
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
switches::kDisableWebGLImageChromium,
+@@ -4702,7 +4703,7 @@ void RenderProcessHostImpl::ResetIPC() {
+ coordinator_connector_receiver_.reset();
+ tracing_registration_.reset();
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ stable_video_decoder_factory_remote_.reset();
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
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 6f02871f63b0..8927d39f950c 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,15 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-07-22 17:30:31 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-08-31 12:19:35 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -470,7 +470,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -85,7 +85,7 @@
+ #include "third_party/blink/public/mojom/hid/hid.mojom-forward.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
+@@ -474,7 +474,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Sets this RenderProcessHost to be guest only. For Testing only.
void SetForGuestsOnlyForTesting();
@@ -9,3 +18,21 @@
// Launch the zygote early in the browser startup.
static void EarlyZygoteLaunch();
#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC)
+@@ -673,7 +673,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+ mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver)
+ override;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void CreateStableVideoDecoder(
+ mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver)
+ override;
+@@ -1128,7 +1128,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+ // RenderProcessHost. This is destroyed early in ResetIPC() method.
+ std::unique_ptr<PermissionServiceContext> permission_service_context_;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Connection to the StableVideoDecoderFactory that lives in a utility
+ // process. This is only used for out-of-process video decoding.
+ mojo::Remote<media::stable::mojom::StableVideoDecoderFactory>
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 dfd28e777fb7..6c2e69e7f4de 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,14 +1,14 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-07-22 17:30:31 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -114,7 +114,7 @@
#include "ui/gfx/gdi_util.h"
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
- #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
+ #include "ui/linux/linux_ui.h"
@@ -439,7 +439,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
if (manager)
return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM();
@@ -18,7 +18,7 @@
BrowserAccessibilityManager* manager =
host()->GetOrCreateRootBrowserAccessibilityManager();
if (manager && manager->GetRoot())
-@@ -1579,7 +1579,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1573,7 +1573,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) {
-@@ -2397,7 +2397,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2393,7 +2393,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,12 +36,12 @@
return NeedsInputGrab();
#else
return false;
-@@ -2574,7 +2574,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2570,7 +2570,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate =
- ui::GetTextEditKeyBindingsDelegate();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ auto* linux_ui = ui::LinuxUi::instance();
std::vector<ui::TextEditCommandAuraLinux> commands;
+ if (!event.skip_in_browser && linux_ui && event.os_event &&
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 3dda48e8eb46..331011c60ada 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 2022-05-19 14:06:27 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-08-31 12:19:35 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
+@@ -243,7 +243,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index aac99b7f3e98..61555808678c 100644
--- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-06-17 14:20:10 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-08-31 12:19:35 UTC
+++ content/browser/web_contents/web_contents_view_aura.cc
-@@ -159,7 +159,7 @@ class WebDragSourceAura : public content::WebContentsO
+@@ -160,7 +160,7 @@ class WebDragSourceAura : public content::WebContentsO
raw_ptr<aura::Window> window_;
};
@@ -9,7 +9,7 @@
// Fill out the OSExchangeData with a file contents, synthesizing a name if
// necessary.
void PrepareDragForFileContents(const DropData& drop_data,
-@@ -242,7 +242,7 @@ void PrepareDragData(const DropData& drop_data,
+@@ -243,7 +243,7 @@ void PrepareDragData(const DropData& drop_data,
if (!drop_data.download_metadata.empty())
PrepareDragForDownload(drop_data, provider, web_contents);
#endif
@@ -18,7 +18,7 @@
// We set the file contents before the URL because the URL also sets file
// contents (to a .URL shortcut). We want to prefer file content data over
// a shortcut so we add it first.
-@@ -1343,7 +1343,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1345,7 +1345,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
// Linux window managers like to handle raise-on-click themselves. If we
// raise-on-click manually, this may override user settings that prevent
// focus-stealing.
diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc
index 415ff4285227..3dd5ba59982c 100644
--- a/www/chromium/files/patch-content_child_child__process.cc
+++ b/www/chromium/files/patch-content_child_child__process.cc
@@ -1,6 +1,6 @@
---- content/child/child_process.cc.orig 2022-07-22 17:30:31 UTC
+--- content/child/child_process.cc.orig 2022-08-31 12:19:35 UTC
+++ content/child/child_process.cc
-@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr
+@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_
DCHECK(!g_lazy_child_process_tls.Pointer()->Get());
g_lazy_child_process_tls.Pointer()->Set(this);
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index f1fa7ceea492..f91ce9cf9f98 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 2022-07-22 17:30:31 UTC
+--- content/common/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ content/common/BUILD.gn
-@@ -402,6 +402,9 @@ if (is_linux || is_chromeos) {
+@@ -400,6 +400,9 @@ if (is_linux || is_chromeos) {
public = [ "set_process_title_linux.h" ]
sources = [ "set_process_title_linux.cc" ]
deps = [ "//base" ]
diff --git a/www/chromium/files/patch-content_common_font__list__unittest.cc b/www/chromium/files/patch-content_common_font__list__unittest.cc
index 996f152fc989..763fd8114fa1 100644
--- a/www/chromium/files/patch-content_common_font__list__unittest.cc
+++ b/www/chromium/files/patch-content_common_font__list__unittest.cc
@@ -1,11 +1,11 @@
---- content/common/font_list_unittest.cc.orig 2022-05-19 14:06:27 UTC
+--- content/common/font_list_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ content/common/font_list_unittest.cc
-@@ -50,7 +50,7 @@ TEST(FontList, GetFontList) {
- EXPECT_TRUE(HasFontWithName(*fonts, "MS Gothic", "MS Gothic"));
- EXPECT_TRUE(HasFontWithName(*fonts, "Segoe UI", "Segoe UI"));
- EXPECT_TRUE(HasFontWithName(*fonts, "Verdana", "Verdana"));
+@@ -48,7 +48,7 @@ TEST(FontList, GetFontList) {
+ EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic"));
+ EXPECT_TRUE(HasFontWithName(fonts, "Segoe UI", "Segoe UI"));
+ EXPECT_TRUE(HasFontWithName(fonts, "Verdana", "Verdana"));
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- EXPECT_TRUE(HasFontWithName(*fonts, "Arimo", "Arimo"));
+ EXPECT_TRUE(HasFontWithName(fonts, "Arimo", "Arimo"));
#else
- EXPECT_TRUE(HasFontWithName(*fonts, "Arial", "Arial"));
+ EXPECT_TRUE(HasFontWithName(fonts, "Arial", "Arial"));
diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc
index 84da00b6b5d8..87e855b40a2b 100644
--- a/www/chromium/files/patch-content_common_user__agent.cc
+++ b/www/chromium/files/patch-content_common_user__agent.cc
@@ -1,6 +1,6 @@
---- content/common/user_agent.cc.orig 2022-05-19 14:06:27 UTC
+--- content/common/user_agent.cc.orig 2022-08-31 12:19:35 UTC
+++ content/common/user_agent.cc
-@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() {
+@@ -41,7 +41,7 @@ std::string GetUserAgentPlatform() {
return "";
#elif BUILDFLAG(IS_MAC)
return "Macintosh; ";
@@ -9,7 +9,16 @@
return "X11; "; // strange, but that's what Firefox uses
#elif BUILDFLAG(IS_ANDROID)
return "Linux; ";
-@@ -260,6 +260,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
+@@ -63,7 +63,7 @@ std::string GetUnifiedPlatform() {
+ return "Windows NT 10.0; Win64; x64";
+ #elif BUILDFLAG(IS_FUCHSIA)
+ return "Fuchsia";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return "X11; Linux x86_64";
+ #else
+ #error Unsupported platform
+@@ -275,6 +275,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons
"Android %s", os_version.c_str()
#elif BUILDFLAG(IS_FUCHSIA)
"Fuchsia"
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index ab88635089ef..5330461d3ca7 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_main.cc.orig 2022-07-22 17:30:31 UTC
+--- content/gpu/gpu_main.cc.orig 2022-08-31 12:19:35 UTC
+++ content/gpu/gpu_main.cc
@@ -86,7 +86,7 @@
#include "sandbox/win/src/sandbox.h"
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -404,17 +404,19 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -396,17 +396,19 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
@@ -57,7 +57,7 @@
// SandboxLinux::InitializeSandbox() must always be called
// with only one thread.
-@@ -449,11 +451,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -453,11 +455,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
*base::CommandLine::ForCurrentProcess()),
base::BindOnce(GpuProcessPreSandboxHook), sandbox_options);
diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
index 3c19495edadf..d73204977f54 100644
--- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-07-22 17:30:31 UTC
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ content/gpu/gpu_sandbox_hook_linux.cc
@@ -114,6 +114,7 @@ void AddStandardChromeOsPermissions(
permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath));
@@ -8,7 +8,7 @@
void AddV4L2GpuPermissions(
std::vector<BrokerFilePermission>* permissions,
const sandbox::policy::SandboxSeccompBPF::Options& options) {
-@@ -431,8 +432,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
+@@ -434,8 +435,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
AddStandardGpuPermissions(&permissions);
return permissions;
}
@@ -19,7 +19,7 @@
// Preload the Mali library.
if (UseChromecastSandboxAllowlist()) {
for (const char* path : kAllowedChromecastPaths) {
-@@ -474,6 +477,7 @@ void LoadArmGpuLibraries() {
+@@ -477,6 +480,7 @@ void LoadArmGpuLibraries() {
dlopen(driver_paths[i], dlopen_flag);
}
}
@@ -27,7 +27,7 @@
}
bool LoadAmdGpuLibraries() {
-@@ -539,12 +543,14 @@ void LoadV4L2Libraries(
+@@ -542,12 +546,14 @@ void LoadV4L2Libraries(
}
void LoadChromecastV4L2Libraries() {
@@ -42,7 +42,7 @@
}
bool LoadLibrariesForGpu(
-@@ -571,6 +577,7 @@ bool LoadLibrariesForGpu(
+@@ -575,6 +581,7 @@ bool LoadLibrariesForGpu(
return true;
}
@@ -50,7 +50,7 @@
sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
const sandbox::policy::SandboxLinux::Options& options) {
sandbox::syscall_broker::BrokerCommandSet command_set;
-@@ -593,13 +600,17 @@ bool BrokerProcessPreSandboxHook(
+@@ -597,13 +604,17 @@ bool BrokerProcessPreSandboxHook(
SetProcessTitleFromCommandLine(nullptr);
return true;
}
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
new file mode 100644
index 000000000000..537f27e85500
--- /dev/null
+++ b/www/chromium/files/patch-content_public_browser_render__process__host.h
@@ -0,0 +1,20 @@
+--- content/public/browser/render_process_host.h.orig 2022-08-31 12:19:35 UTC
++++ content/public/browser/render_process_host.h
+@@ -53,7 +53,7 @@
+ #include "content/public/browser/android/child_process_importance.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h"
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
+@@ -621,7 +621,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S
+ const blink::StorageKey& storage_key,
+ mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ virtual void CreateStableVideoDecoder(
+ mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder>
+ receiver) = 0;
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 c54655b82251..62cff14b0bf2 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig 2022-07-22 17:30:31 UTC
+--- content/public/common/content_features.cc.orig 2022-08-31 12:19:35 UTC
+++ content/public/common/content_features.cc
@@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess {
"AudioServiceOutOfProcess",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1035,7 +1035,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
+@@ -1057,7 +1057,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
const base::Feature kWebAssemblyCodeProtection{
"WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -27,7 +27,7 @@
// Use memory protection keys in userspace (PKU) (if available) to protect code
// JITed for WebAssembly. Fall back to traditional memory protection if
// WebAssemblyCodeProtection is also enabled.
-@@ -1071,7 +1071,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
+@@ -1093,7 +1093,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
const 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
-@@ -1147,7 +1147,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{
+@@ -1163,7 +1163,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{
// 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 a318696d7b6a..5537a0b3c98c 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 2022-07-22 17:30:31 UTC
+--- content/public/common/content_features.h.orig 2022-08-31 12:19:35 UTC
+++ content/public/common/content_features.h
-@@ -259,7 +259,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture;
+@@ -273,7 +273,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture;
CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay;
CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline;
CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection;
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 7e743c1f4e24..ffca2971df12 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_switches.cc.orig 2022-07-22 17:30:31 UTC
+--- content/public/common/content_switches.cc.orig 2022-08-31 12:19:35 UTC
+++ content/public/common/content_switches.cc
@@ -369,6 +369,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] =
// builds.
@@ -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.
-@@ -972,7 +974,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -974,7 +976,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_test_mock__render__process__host.h b/www/chromium/files/patch-content_public_test_mock__render__process__host.h
new file mode 100644
index 000000000000..27118bec225f
--- /dev/null
+++ b/www/chromium/files/patch-content_public_test_mock__render__process__host.h
@@ -0,0 +1,11 @@
+--- content/public/test/mock_render_process_host.h.orig 2022-08-31 12:19:35 UTC
++++ content/public/test/mock_render_process_host.h
+@@ -257,7 +257,7 @@ class MockRenderProcessHost : public RenderProcessHost
+ const blink::StorageKey& storage_key,
+ mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver)
+ override {}
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void CreateStableVideoDecoder(
+ mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver)
+ override {}
diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
index 18b5da418b1b..4911097effe3 100644
--- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc
+++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
@@ -1,4 +1,4 @@
---- content/public/test/mock_render_thread.cc.orig 2022-07-22 17:30:31 UTC
+--- content/public/test/mock_render_thread.cc.orig 2022-08-31 12:19:35 UTC
+++ content/public/test/mock_render_thread.cc
@@ -63,7 +63,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
std::move(callback).Run(false);
@@ -6,6 +6,6 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void SetThreadPriority(int32_t platform_thread_id,
- base::ThreadPriority thread_priority) override {}
+ void SetThreadType(int32_t platform_thread_id,
+ base::ThreadType thread_type) override {}
#endif
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 3ed21c265bec..b1872c9ad869 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig 2022-07-22 17:30:31 UTC
+--- content/renderer/render_thread_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -187,7 +187,7 @@
+@@ -190,7 +190,7 @@
#if BUILDFLAG(IS_MAC)
#include <malloc/malloc.h>
@@ -9,25 +9,16 @@
#include <malloc.h>
#endif
-@@ -669,7 +669,7 @@ void RenderThreadImpl::Init() {
- DCHECK(parsed_num_raster_threads) << string_value;
- DCHECK_GT(num_raster_threads, 0);
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- categorized_worker_pool_->SetBackgroundingCallback(
- main_thread_scheduler_->DefaultTaskRunner(),
- base::BindOnce(
-@@ -692,7 +692,7 @@ void RenderThreadImpl::Init() {
+@@ -670,7 +670,7 @@ void RenderThreadImpl::Init() {
base::DiscardableMemoryAllocator::SetInstance(
discardable_memory_allocator_.get());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (base::FeatureList::IsEnabled(
- blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
- render_message_filter()->SetThreadPriority(
-@@ -1039,7 +1039,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+ render_message_filter()->SetThreadType(
+ ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing);
+ #endif
+@@ -1040,7 +1040,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
const bool enable_video_decode_accelerator =
@@ -36,7 +27,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1050,7 +1050,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1051,7 +1051,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
const bool enable_video_encode_accelerator =
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 cd7e92e4f28e..096a2befcfec 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,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-07-22 17:30:31 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -110,7 +110,7 @@
+@@ -109,7 +109,7 @@
#if BUILDFLAG(IS_MAC)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
-@@ -179,7 +179,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
main_thread_scheduler_(main_thread_scheduler) {
// RenderThread may not exist in some tests.
if (RenderThreadImpl::current()) {
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -189,7 +189,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -27,17 +27,16 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -278,7 +278,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
+@@ -261,7 +261,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory(
/*terminate_sync_load_event=*/nullptr);
}
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+// pledge
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
- void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
- base::PlatformThreadId thread_id) {
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id,
+ base::ThreadType thread_type) {
if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
-@@ -293,7 +294,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
+@@ -276,7 +276,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
}
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 1696ad00b92b..c998c1595db4 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,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2022-07-22 17:30:31 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2022-08-31 12:19:35 UTC
+++ content/renderer/renderer_blink_platform_impl.h
@@ -29,7 +29,7 @@
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -9,7 +9,16 @@
#include "components/services/font/public/cpp/font_loader.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
-@@ -253,7 +253,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -171,7 +171,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+ const blink::WebURL& top_document_web_url) override;
+ gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
+ blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void SetThreadType(base::PlatformThreadId thread_id,
+ base::ThreadType) override;
+ #endif
+@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
const gpu::GPUInfo& gpu_info) const;
@@ -18,7 +27,7 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -275,7 +275,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -260,7 +260,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
mutable base::WaitableEvent io_thread_id_ready_event_;
base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index 8abb1411df77..e8201c71a322 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 2022-07-22 17:30:31 UTC
+--- content/shell/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ content/shell/BUILD.gn
-@@ -880,7 +880,7 @@ group("content_shell_crash_test") {
+@@ -885,7 +885,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_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
index 936eb5d2e183..0a0bda17b633 100644
--- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
+++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
@@ -1,6 +1,6 @@
---- content/shell/app/shell_main_delegate.cc.orig 2022-02-28 16:54:41 UTC
+--- content/shell/app/shell_main_delegate.cc.orig 2022-08-31 12:19:35 UTC
+++ content/shell/app/shell_main_delegate.cc
-@@ -211,7 +211,7 @@ void ShellMainDelegate::PreSandboxStartup() {
+@@ -208,7 +208,7 @@ void ShellMainDelegate::PreSandboxStartup() {
// Reporting for sub-processes will be initialized in ZygoteForked.
if (process_type != switches::kZygoteProcess) {
crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index f3be501ed62b..e138f1e76632 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,4 +1,4 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-06-17 14:20:10 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig 2022-08-31 12:19:35 UTC
+++ content/shell/browser/shell_browser_main_parts.cc
@@ -50,7 +50,7 @@
#include "net/base/network_change_notifier.h"
@@ -15,8 +15,8 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/linux_ui/linux_ui.h" // nogncheck
- #include "ui/views/linux_ui/linux_ui_factory.h" // nogncheck
+ #include "ui/linux/linux_ui.h" // nogncheck
+ #include "ui/linux/linux_ui_factory.h" // nogncheck
#endif
@@ -129,7 +129,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
}
@@ -33,7 +33,7 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- views::LinuxUI::SetInstance(CreateLinuxUi());
+ ui::LinuxUi::SetInstance(ui::CreateLinuxUi());
#endif
}
@@ -196,7 +196,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
@@ -42,6 +42,6 @@
off_the_record_browser_context_.reset();
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- views::LinuxUI::SetInstance(nullptr);
+ ui::LinuxUi::SetInstance(nullptr);
#endif
performance_manager_lifetime_.reset();
diff --git a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc
index 1889f5641698..011b925684c7 100644
--- a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc
+++ b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc
@@ -1,4 +1,4 @@
---- content/shell/utility/shell_content_utility_client.cc.orig 2022-02-28 16:54:41 UTC
+--- content/shell/utility/shell_content_utility_client.cc.orig 2022-08-31 12:19:35 UTC
+++ content/shell/utility/shell_content_utility_client.cc
@@ -32,7 +32,7 @@
#include "sandbox/policy/sandbox.h"
@@ -9,7 +9,7 @@
#include "content/test/sandbox_status_service.h"
#endif
-@@ -142,7 +142,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow
+@@ -143,7 +143,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow
binders->Add<mojom::PowerMonitorTest>(
base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver),
base::ThreadTaskRunnerHandle::Get());
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index c635fb7ee1aa..07a7e8e769df 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 2022-07-22 17:30:31 UTC
+--- content/test/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ content/test/BUILD.gn
-@@ -2025,7 +2025,7 @@ static_library("run_all_unittests") {
+@@ -2037,7 +2037,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -2994,7 +2994,7 @@ test("content_unittests") {
+@@ -3006,7 +3006,7 @@ test("content_unittests") {
deps += [ "//third_party/boringssl" ]
}
diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc
index 4039ac0d91d7..1285d3f1dd34 100644
--- a/www/chromium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig 2022-05-19 14:06:27 UTC
+--- content/zygote/zygote_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ content/zygote/zygote_linux.cc
@@ -1,6 +1,7 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -8,7 +8,7 @@
#include "content/zygote/zygote_linux.h"
-@@ -654,3 +655,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
+@@ -653,3 +654,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick
}
} // namespace content
diff --git a/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni b/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni
index 13d396c003b1..0fcfccc24b76 100644
--- a/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni
+++ b/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni
@@ -1,9 +1,9 @@
---- device/bluetooth/cast_bluetooth.gni.orig 2022-07-22 17:30:31 UTC
+--- device/bluetooth/cast_bluetooth.gni.orig 2022-08-31 12:19:35 UTC
+++ device/bluetooth/cast_bluetooth.gni
@@ -2,5 +2,5 @@ import("//build/config/features.gni")
declare_args() {
force_cast_bluetooth = false
-- use_bluez = (is_linux && !is_castos) || is_chromeos
+- use_bluez = (is_linux && !is_castos && use_dbus) || is_chromeos
+ use_bluez = use_dbus && !is_bsd
}
diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
index f9658546a82c..ed8cc6dc8673 100644
--- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-07-22 17:30:31 UTC
+--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-08-31 12:19:35 UTC
+++ extensions/browser/browser_context_keyed_service_factories.cc
-@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+@@ -89,7 +89,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
IdleManagerFactory::GetInstance();
ManagementAPI::GetFactoryInstance();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -8,4 +8,4 @@
+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
NetworkingPrivateEventRouterFactory::GetInstance();
#endif
- PowerAPI::GetFactoryInstance();
+ OffscreenDocumentManager::GetFactory();
diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc
index 0a57a4b83be4..6902f2fbbcc7 100644
--- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc
+++ b/www/chromium/files/patch-extensions_browser_extension__prefs.cc
@@ -1,6 +1,6 @@
---- extensions/browser/extension_prefs.cc.orig 2022-06-17 14:20:10 UTC
+--- extensions/browser/extension_prefs.cc.orig 2022-08-31 12:19:35 UTC
+++ extensions/browser/extension_prefs.cc
-@@ -2270,7 +2270,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
+@@ -2295,7 +2295,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
registry->RegisterDictionaryPref(kInstallSignature);
registry->RegisterListPref(kExternalUninstalls);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json
index bb7d227d3afc..d9fa79a621fe 100644
--- a/www/chromium/files/patch-extensions_common_api___permission__features.json
+++ b/www/chromium/files/patch-extensions_common_api___permission__features.json
@@ -1,6 +1,6 @@
---- extensions/common/api/_permission_features.json.orig 2022-07-22 17:30:31 UTC
+--- extensions/common/api/_permission_features.json.orig 2022-08-31 12:19:35 UTC
+++ extensions/common/api/_permission_features.json
-@@ -140,7 +140,7 @@
+@@ -134,7 +134,7 @@
{
"channel": "stable",
"extension_types": ["platform_app"],
@@ -9,7 +9,7 @@
"allowlist": [
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169
"A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169
-@@ -453,7 +453,7 @@
+@@ -433,7 +433,7 @@
}, {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
@@ -18,12 +18,12 @@
"allowlist": [
"0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683
-@@ -497,7 +497,7 @@
+@@ -475,7 +475,7 @@
"networkingPrivate": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
-- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"],
-+ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"],
+- "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia"],
++ "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"],
"allowlist": [
// DO NOT ADD ANY MORE ENTRIES HERE.
// networkingPrivate is being migrated to networking.onc.
diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json
new file mode 100644
index 000000000000..03df612028d0
--- /dev/null
+++ b/www/chromium/files/patch-extensions_common_api_runtime.json
@@ -0,0 +1,12 @@
+--- extensions/common/api/runtime.json.orig 2022-08-31 12:19:35 UTC
++++ extensions/common/api/runtime.json
+@@ -86,7 +86,8 @@
+ "cros",
+ "linux",
+ "openbsd",
+- "fuchsia"
++ "fuchsia",
++ "freebsd"
+ ]
+ },
+ {
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc
index 09ac8cc34952..3aa8772d1998 100644
--- a/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-02-28 16:54:41 UTC
+--- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-08-31 12:19:35 UTC
+++ extensions/shell/browser/shell_browser_main_parts.cc
-@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
+@@ -147,7 +147,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
switches::kAppShellAllowRoaming)) {
network_controller_->SetCellularAllowRoaming(true);
}
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc
deleted file mode 100644
index 5c0d9b0cdef5..000000000000
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpu/command_buffer/service/shared_image_backing_factory_ozone.cc.orig 2022-06-17 14:20:10 UTC
-+++ gpu/command_buffer/service/shared_image_backing_factory_ozone.cc
-@@ -218,7 +218,7 @@ bool SharedImageBackingFactoryOzone::IsSupported(
- !CanImportGpuMemoryBufferToVulkan(gmb_type)) {
- return false;
- }
--#elif BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
- !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST)
- bool used_by_skia = (usage & SHARED_IMAGE_USAGE_RASTER) ||
- (usage & SHARED_IMAGE_USAGE_DISPLAY);
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index f5ba7d5d4726..bf3c0d389709 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-07-22 17:30:31 UTC
-+++ gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
-@@ -703,7 +703,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-08-31 12:19:35 UTC
++++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
+@@ -643,7 +643,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan
// TODO(penghuang): verify the scanout is the right usage for video playback.
// crbug.com/1280798
constexpr auto kSupportedUsages =
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
index 855c9b131c6c..d431ffabdde8 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,18 +1,18 @@
---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-06-17 14:20:10 UTC
-+++ gpu/command_buffer/service/external_vk_image_backing.cc
-@@ -30,7 +30,7 @@
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2022-08-31 12:19:35 UTC
++++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
+@@ -31,7 +31,7 @@
#include "ui/gl/gl_version_info.h"
#include "ui/gl/scoped_binders.h"
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
- #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
+ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
#endif
-@@ -571,7 +571,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
- MemoryTypeTracker* tracker,
- WGPUDevice wgpuDevice,
- WGPUBackendType backend_type) {
+@@ -576,7 +576,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
+ MemoryTypeTracker* tracker,
+ WGPUDevice wgpuDevice,
+ WGPUBackendType backend_type) {
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
auto wgpu_format = viz::ToWGPUFormat(format());
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__gl__texture.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc
index 14cd81729e57..0d9e1677ec36 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__gl__texture.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc
@@ -1,9 +1,9 @@
---- gpu/command_buffer/service/shared_image_backing_gl_texture.cc.orig 2022-05-19 14:06:27 UTC
-+++ gpu/command_buffer/service/shared_image_backing_gl_texture.cc
-@@ -257,7 +257,7 @@ void SharedImageBackingGLTexture::InitializeGLTexture(
+--- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2022-08-31 12:19:35 UTC
++++ gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc
+@@ -254,7 +254,7 @@ void GLTextureImageBacking::InitializeGLTexture(
}
- void SharedImageBackingGLTexture::CreateEGLImage() {
+ void GLTextureImageBacking::CreateEGLImage() {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD)
SharedContextState* shared_context_state = factory()->GetSharedContextState();
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc
index 4ac1f38c195d..beaa79f3b778 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__gl__texture.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image_backing_factory_gl_texture.cc.orig 2022-05-19 14:06:27 UTC
-+++ gpu/command_buffer/service/shared_image_backing_factory_gl_texture.cc
-@@ -145,7 +145,7 @@ bool SharedImageBackingFactoryGLTexture::IsSupported(
+--- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2022-08-31 12:19:35 UTC
++++ gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc
+@@ -152,7 +152,7 @@ bool GLTextureImageBackingFactory::IsSupported(
// Linux and ChromeOS support WebGPU/Compat on GL. All other platforms
// do not support WebGPU on GL.
if (usage & SHARED_IMAGE_USAGE_WEBGPU) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
index 39fa3dfeeca7..ffb5de6d8283 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc
@@ -1,15 +1,15 @@
---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-07-22 17:30:31 UTC
-+++ gpu/command_buffer/service/shared_image_factory.cc
-@@ -50,7 +50,7 @@
- #endif
+--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2022-08-31 12:19:35 UTC
++++ gpu/command_buffer/service/shared_image/shared_image_factory.cc
+@@ -52,7 +52,7 @@
+ #include "ui/ozone/public/surface_factory_ozone.h"
#endif
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \
BUILDFLAG(ENABLE_VULKAN)
- #include "gpu/command_buffer/service/external_vk_image_factory.h"
- #include "gpu/command_buffer/service/shared_image_backing_factory_ozone.h"
-@@ -86,7 +86,7 @@ namespace gpu {
+ #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h"
+ #include "gpu/command_buffer/service/shared_image/ozone_image_backing_factory.h"
+@@ -88,7 +88,7 @@ namespace gpu {
namespace {
@@ -18,12 +18,12 @@
bool ShouldUseExternalVulkanImageFactory() {
#if BUILDFLAG(ENABLE_VULKAN)
-@@ -381,7 +381,7 @@ SharedImageFactory::SharedImageFactory(
+@@ -398,7 +398,7 @@ SharedImageFactory::SharedImageFactory(
factories_.push_back(std::move(external_vk_image_factory));
}
#elif defined(USE_OZONE)
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
// Desktop Linux, not ChromeOS.
- if (ShouldUseOzoneFactory()) {
+ if (ShouldUseOzoneImageBackingFactory()) {
auto ozone_factory =
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_wrapped__sk__image.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc
index f5cfd6b362c3..9fec5a1c4390 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_wrapped__sk__image.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/wrapped_sk_image.cc.orig 2022-07-22 17:30:31 UTC
-+++ gpu/command_buffer/service/wrapped_sk_image.cc
-@@ -277,7 +277,7 @@ class WrappedSkImage : public ClearTrackingSharedImage
+--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2022-08-31 12:19:35 UTC
++++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc
+@@ -257,7 +257,7 @@ class WrappedSkImage : public ClearTrackingSharedImage
DCHECK_NE(format(), viz::ResourceFormat::ETC1);
auto mipmap = usage() & SHARED_IMAGE_USAGE_MIPMAP ? GrMipMapped::kYes
: GrMipMapped::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 123f41ddaeea..e1768508b31d 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 2022-07-22 17:30:31 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1064,7 +1064,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1065,7 +1065,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
if (gr_context_type_ != GrContextType::kVulkan &&
use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
index c96914bd19c3..46ba20bbc2eb 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-06-17 14:20:10 UTC
+--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
-@@ -29,7 +29,7 @@
+@@ -28,7 +28,7 @@
#include "ui/gl/gl_image.h"
#include "ui/gl/test/gl_image_test_support.h"
@@ -9,7 +9,7 @@
#include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
#include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h"
#endif
-@@ -72,7 +72,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa
+@@ -71,7 +71,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa
GLManager gl_;
};
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 799726bb8c36..e9be7c9d9a0d 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 2022-05-19 14:06:27 UTC
+--- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ headless/lib/browser/headless_web_contents_impl.cc
-@@ -57,7 +57,7 @@ namespace headless {
+@@ -59,7 +59,7 @@ namespace headless {
namespace {
void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) {
diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
index cec690e3e992..5143aeaa1dd4 100644
--- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- headless/lib/headless_content_main_delegate.cc.orig 2022-03-25 21:59:56 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig 2022-08-31 12:19:35 UTC
+++ headless/lib/headless_content_main_delegate.cc
-@@ -336,7 +336,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -337,7 +337,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
if (process_type != switches::kZygoteProcess) {
g_headless_crash_client.Pointer()->set_crash_dumps_dir(
options()->crash_dumps_dir);
diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc
index 6413a38b2057..92f2550756ea 100644
--- a/www/chromium/files/patch-media_audio_audio__input__device.cc
+++ b/www/chromium/files/patch-media_audio_audio__input__device.cc
@@ -1,6 +1,6 @@
---- media/audio/audio_input_device.cc.orig 2022-05-19 14:06:27 UTC
+--- media/audio/audio_input_device.cc.orig 2022-08-31 12:19:35 UTC
+++ media/audio/audio_input_device.cc
-@@ -260,7 +260,7 @@ void AudioInputDevice::OnStreamCreated(
+@@ -259,7 +259,7 @@ void AudioInputDevice::OnStreamCreated(
// here. See comments in AliveChecker and PowerObserverHelper for details and
// todos.
if (detect_dead_stream_ == DeadStreamDetection::kEnabled) {
diff --git a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
index b6a27b9fd517..d63a0a618adc 100644
--- a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
+++ b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
@@ -1,6 +1,6 @@
---- media/audio/sndio/audio_manager_sndio.cc.orig 2022-07-22 17:30:31 UTC
+--- media/audio/sndio/audio_manager_sndio.cc.orig 2022-08-31 12:19:35 UTC
+++ media/audio/sndio/audio_manager_sndio.cc
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,181 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -70,9 +70,13 @@
+ const std::string& device_id) {
+ static const int kDefaultInputBufferSize = 1024;
+
++ int user_buffer_size = GetUserBufferSize();
++ int buffer_size = user_buffer_size ?
++ user_buffer_size : kDefaultInputBufferSize;
++
+ return AudioParameters(
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
-+ kDefaultSampleRate, kDefaultInputBufferSize);
++ kDefaultSampleRate, buffer_size);
+}
+
+AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index 58d0d7fb8170..f48027af0e95 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig 2022-07-22 17:30:31 UTC
+--- media/base/media_switches.cc.orig 2022-08-31 12:19:35 UTC
+++ media/base/media_switches.cc
@@ -10,7 +10,7 @@
#include "components/system_media_controls/linux/buildflags/buildflags.h"
@@ -9,16 +9,16 @@
#include "base/cpu.h"
#endif
-@@ -448,7 +448,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
+@@ -452,7 +452,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
+ // Show toolbar button that opens dialog for controlling media sessions.
const base::Feature kGlobalMediaControls {
"GlobalMediaControls",
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS_LACROS)
-+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -480,7 +480,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
+@@ -490,7 +490,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
const 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
-@@ -517,7 +517,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
+@@ -527,7 +527,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT};
@@ -36,7 +36,7 @@
// Enable vaapi video decoding on linux. This is already enabled by default on
// chromeos, but needs an experiment on linux.
const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder",
-@@ -932,7 +932,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod
+@@ -947,7 +947,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod
"DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT};
#endif // BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index 9068fb415bc0..6744f42c0b11 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 2022-07-22 17:30:31 UTC
+--- media/base/media_switches.h.orig 2022-08-31 12:19:35 UTC
+++ media/base/media_switches.h
-@@ -198,7 +198,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
+@@ -203,7 +203,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream;
MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
MEDIA_EXPORT extern const base::Feature kUseR16Texture;
@@ -9,7 +9,7 @@
MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux;
MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux;
MEDIA_EXPORT extern const base::Feature kVaapiIgnoreDriverChecks;
-@@ -304,7 +304,7 @@ MEDIA_EXPORT extern const base::FeatureParam<
+@@ -310,7 +310,7 @@ MEDIA_EXPORT extern const base::FeatureParam<
MEDIA_EXPORT extern const base::Feature kDeprecateLowUsageCodecs;
#endif
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index d0642f48a2a6..64db61be1f87 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,4 +1,4 @@
---- media/base/video_frame.h.orig 2022-05-19 14:06:27 UTC
+--- media/base/video_frame.h.orig 2022-08-31 12:19:35 UTC
+++ media/base/video_frame.h
@@ -41,7 +41,7 @@
#include "base/mac/scoped_cftyperef.h"
@@ -9,7 +9,7 @@
#include "base/files/scoped_file.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -83,7 +83,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers.
STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer.
STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory.
@@ -18,7 +18,7 @@
// TODO(mcasas): Consider turning this type into STORAGE_NATIVE
// based on the idea of using this same enum value for both DMA
// buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -281,7 +281,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -280,7 +280,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
base::TimeDelta timestamp);
@@ -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
-@@ -540,7 +540,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -539,7 +539,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
-@@ -744,7 +744,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -743,7 +743,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_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
index c59998c5fc7f..780c60a0c5a2 100644
--- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,4 +1,4 @@
---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2022-02-07 13:39:41 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2022-08-31 12:19:35 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.cc
@@ -4,8 +4,10 @@
@@ -11,7 +11,7 @@
#include <poll.h>
#include <sys/fcntl.h>
#include <sys/ioctl.h>
-@@ -25,10 +27,10 @@
+@@ -27,10 +29,10 @@
using media::mojom::MeteringMode;
@@ -24,7 +24,7 @@
// TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
// format is introduced to kernel.
-@@ -660,7 +662,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
+@@ -666,7 +668,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
@@ -33,7 +33,7 @@
int num_retries = 0;
for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
++num_retries) {
-@@ -670,7 +672,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
+@@ -676,7 +678,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
return num_retries != kMaxIOCtrlRetries;
}
diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
index a4602fc3e3e2..c68ed9405cfa 100644
--- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
+++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h
@@ -1,6 +1,6 @@
---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2022-05-19 14:06:27 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2022-08-31 12:19:35 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.h
-@@ -85,10 +85,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+@@ -86,10 +86,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
// device file descriptor or (re)starting streaming, can fail but works after
// retrying (https://crbug.com/670262). Returns false if the |request| ioctl
// fails too many times.
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 e525343d6ed4..d77465c0c41d 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 2022-07-22 17:30:31 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-08-31 12:19:35 UTC
+++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -656,7 +656,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -742,7 +742,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
}
}
@@ -9,7 +9,7 @@
// Linux should always use a custom allocator (to allocate buffers using
// libva) and a PlatformVideoFramePool.
CHECK(allocator.has_value());
-@@ -678,7 +678,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -764,7 +764,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
#error "Unsupported platform"
#endif
diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
index 271b45919fa8..e97b3e579545 100644
--- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
+++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
@@ -1,6 +1,6 @@
---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-06-17 14:20:10 UTC
+--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-08-31 12:19:35 UTC
+++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -103,7 +103,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+@@ -111,7 +111,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
return vea_factory_functions;
#if BUILDFLAG(USE_VAAPI)
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 390fa72f23d0..79770e8e22f0 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-07-22 17:30:31 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-08-31 12:19:35 UTC
+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -592,7 +592,7 @@ VADisplayState::VADisplayState()
+@@ -742,7 +742,7 @@ VADisplayState::VADisplayState()
bool VADisplayState::Initialize() {
base::AutoLock auto_lock(va_lock_);
diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni
index 76a1bb96dc42..8d551025baa7 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,21 +1,24 @@
---- media/media_options.gni.orig 2022-07-22 17:30:31 UTC
+--- media/media_options.gni.orig 2022-08-31 12:19:35 UTC
+++ media/media_options.gni
-@@ -123,9 +123,12 @@ declare_args() {
+@@ -158,12 +158,15 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
- # video builds).
+ # Alsa should be used on all non-Android, non-Mac POSIX systems - with the
+ # exception of CastOS desktop builds.
+ #
+ # TODO(crbug.com/1336055): Remove legacy target_cpu hack used for targeting
+ # desktop Chromecast builds.
- if (is_posix && !is_android && !is_mac &&
+ if (is_posix && !is_android && !is_mac && !is_bsd &&
- (!is_castos || is_cast_audio_only)) {
+ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
+ is_cast_audio_only)) {
use_alsa = true
-
-@@ -140,6 +143,10 @@ declare_args() {
- if (!use_cras && !is_chromecast && !is_asan && !is_tsan) {
+@@ -179,6 +182,10 @@ declare_args() {
+ if (!use_cras && !is_castos && !is_asan && !is_tsan) {
use_pulseaudio = true
}
+ }
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 173df8d18e87..69e7b0dc733f 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 2022-05-19 14:06:27 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-08-31 12:19:35 UTC
+++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -795,7 +795,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -797,7 +797,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
}
bool is_software_backed_video_frame = !video_frame->HasTextures();
@@ -9,3 +9,21 @@
is_software_backed_video_frame &= !video_frame->HasDmaBufs();
#endif
+@@ -1223,7 +1223,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+ frame_resources->plane_resources[gpu_memory_buffer_plane]
+ .gpu_memory_buffer.get();
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ is_webgpu_compatible &= (gpu_memory_buffer != nullptr);
+ if (is_webgpu_compatible) {
+ is_webgpu_compatible &=
+@@ -1243,7 +1243,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+ gpu::SHARED_IMAGE_USAGE_GLES2 | gpu::SHARED_IMAGE_USAGE_RASTER |
+ gpu::SHARED_IMAGE_USAGE_DISPLAY | gpu::SHARED_IMAGE_USAGE_SCANOUT;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // TODO(crbug.com/1241537): Always add the flag once the
+ // OzoneImageBacking is by default turned on.
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
index 21112bf23cde..0073f4d92e33 100644
--- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
+++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter.cc.orig 2022-05-19 14:06:27 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig 2022-08-31 12:19:35 UTC
+++ media/video/video_encode_accelerator_adapter.cc
-@@ -98,7 +98,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
+@@ -128,7 +128,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
if (is_rgb)
config.input_format = PIXEL_FORMAT_I420;
@@ -9,9 +9,9 @@
if (storage_type == VideoFrame::STORAGE_DMABUFS ||
storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) {
if (is_rgb)
-@@ -239,7 +239,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
- auto vea_config =
- SetUpVeaConfig(profile_, options_, format, first_frame->storage_type());
+@@ -297,7 +297,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
+ SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(),
+ supported_rc_modes_);
-#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_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
index 1dab820380c4..c5af29cbe3b4 100644
--- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
+++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc
@@ -1,6 +1,6 @@
---- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-05-19 14:06:27 UTC
+--- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-08-31 12:19:35 UTC
+++ media/video/video_encode_accelerator_adapter_test.cc
-@@ -378,7 +378,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
+@@ -395,7 +395,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
vea()->SetEncodingCallback(base::BindLambdaForTesting(
[&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) {
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index d4100bd05ca0..26ce1de85b90 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 2022-07-22 17:30:31 UTC
+--- net/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ net/BUILD.gn
@@ -104,7 +104,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1199,6 +1199,15 @@ component("net") {
+@@ -1193,6 +1193,15 @@ component("net") {
]
}
@@ -25,16 +25,16 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1331,7 +1340,7 @@ component("net") {
+@@ -1325,7 +1334,7 @@ component("net") {
}
}
-- if (is_android || is_chromeos_ash) {
-+ if (is_android || is_chromeos_ash || is_bsd) {
+- 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",
-@@ -1364,7 +1373,7 @@ component("net") {
+@@ -1358,7 +1367,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
@@ -43,7 +43,7 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -4372,7 +4381,7 @@ test("net_unittests") {
+@@ -4363,7 +4372,7 @@ test("net_unittests") {
]
}
@@ -52,7 +52,7 @@
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
-@@ -4447,6 +4456,10 @@ test("net_unittests") {
+@@ -4438,6 +4447,10 @@ test("net_unittests") {
"//url:buildflags",
]
@@ -63,7 +63,7 @@
if (enable_websockets) {
deps += [ "//net/server:tests" ]
}
-@@ -4519,7 +4532,7 @@ test("net_unittests") {
+@@ -4509,7 +4522,7 @@ test("net_unittests") {
]
}
@@ -72,7 +72,7 @@
sources += [ "tools/quic/quic_simple_server_test.cc" ]
}
-@@ -4661,7 +4674,7 @@ test("net_unittests") {
+@@ -4650,7 +4663,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 04e02abc4641..e4cdad7aea2a 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -1,15 +1,15 @@
---- net/base/network_change_notifier.cc.orig 2022-07-22 17:30:31 UTC
+--- net/base/network_change_notifier.cc.orig 2022-08-31 12:19:35 UTC
+++ net/base/network_change_notifier.cc
-@@ -39,7 +39,7 @@
+@@ -37,7 +37,7 @@
#include "net/base/network_change_notifier_linux.h"
#elif BUILDFLAG(IS_APPLE)
#include "net/base/network_change_notifier_mac.h"
--#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID)
-+#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+-#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"
#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);
@@ -18,4 +18,4 @@
+ /*dns_config_notifier*/nullptr);
#else
NOTIMPLEMENTED();
- return NULL;
+ return nullptr;
diff --git a/www/chromium/files/patch-net_base_network__change__notifier__posix.cc b/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
index a1f3285c9076..bb4a31bf79fa 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier__posix.cc
@@ -1,11 +1,11 @@
---- net/base/network_change_notifier_posix.cc.orig 2022-05-19 14:06:27 UTC
+--- 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
NetworkChangeNotifier::NetworkChangeCalculatorParams
NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() {
NetworkChangeCalculatorParams params;
--#if BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
+-#if BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Delay values arrived at by simple experimentation and adjusted so as to
// produce a single signal when switching between network connections.
params.ip_address_offline_delay_ = base::Milliseconds(4000);
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 c8472c49856e..911f00c845be 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,7 +1,7 @@
---- net/cert/cert_verify_proc_unittest.cc.orig 2022-07-22 17:30:31 UTC
+--- net/cert/cert_verify_proc_unittest.cc.orig 2022-08-31 12:19:35 UTC
+++ net/cert/cert_verify_proc_unittest.cc
-@@ -232,7 +232,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
- CERT_VERIFY_PROC_MAC, CERT_VERIFY_PROC_BUILTIN
+@@ -234,7 +234,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
+ CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS
#elif BUILDFLAG(IS_WIN)
CERT_VERIFY_PROC_WIN, CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS
-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h
index 185185621f0e..bb22a55a1656 100644
--- a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h
+++ b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h
@@ -1,6 +1,6 @@
---- net/disk_cache/blockfile/disk_format.h.orig 2021-04-14 18:41:07 UTC
+--- net/disk_cache/blockfile/disk_format.h.orig 2022-08-31 12:19:35 UTC
+++ net/disk_cache/blockfile/disk_format.h
-@@ -149,7 +149,9 @@ struct RankingsNode {
+@@ -153,7 +153,9 @@ struct RankingsNode {
};
#pragma pack(pop)
diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix.cc
index 65ef568454c5..a1cd09892744 100644
--- a/www/chromium/files/patch-net_dns_dns__config__service__posix.cc
+++ b/www/chromium/files/patch-net_dns_dns__config__service__posix.cc
@@ -1,6 +1,6 @@
---- net/dns/dns_config_service_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- net/dns/dns_config_service_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ net/dns/dns_config_service_posix.cc
-@@ -33,6 +33,11 @@
+@@ -34,6 +34,11 @@
#include "net/dns/dns_config_watcher_mac.h"
#endif
@@ -12,7 +12,7 @@
namespace net {
namespace internal {
-@@ -129,6 +134,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi
+@@ -130,6 +135,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi
bool Watch() override {
CheckOnCorrectSequence();
diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc
index e4872a750520..a767afdd63c3 100644
--- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc
+++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc
@@ -1,4 +1,4 @@
---- net/dns/host_resolver_proc.cc.orig 2022-03-25 21:59:56 UTC
+--- net/dns/host_resolver_proc.cc.orig 2022-08-31 12:19:35 UTC
+++ net/dns/host_resolver_proc.cc
@@ -19,10 +19,6 @@
#include "net/dns/dns_util.h"
@@ -11,7 +11,7 @@
namespace net {
HostResolverProc* HostResolverProc::default_proc_ = nullptr;
-@@ -192,7 +188,7 @@ int SystemHostResolverCall(const std::string& host,
+@@ -193,7 +189,7 @@ int SystemHostResolverCall(const std::string& host,
base::BlockingType::WILL_BLOCK);
#if BUILDFLAG(IS_POSIX) && \
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
index 11fe27ffa0ba..e88d1d86144b 100644
--- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -1,6 +1,6 @@
---- net/http/http_auth_gssapi_posix.cc.orig 2022-04-21 18:48:31 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig 2022-08-31 12:19:35 UTC
+++ net/http/http_auth_gssapi_posix.cc
-@@ -369,8 +369,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+@@ -368,8 +368,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
static const char* const kDefaultLibraryNames[] = {
#if BUILDFLAG(IS_APPLE)
"/System/Library/Frameworks/GSS.framework/GSS"
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
index 4622cadf1a61..a5df8462e3a1 100644
--- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h
@@ -1,6 +1,6 @@
---- net/http/http_auth_gssapi_posix.h.orig 2022-02-28 16:54:41 UTC
+--- net/http/http_auth_gssapi_posix.h.orig 2022-08-31 12:19:35 UTC
+++ net/http/http_auth_gssapi_posix.h
-@@ -20,6 +20,9 @@
+@@ -21,6 +21,9 @@
#if BUILDFLAG(IS_APPLE)
#include <GSS/gssapi.h>
#elif BUILDFLAG(IS_FREEBSD)
diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service.cc
index 17d870c0dd12..5ec93c1dc7f2 100644
--- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service.cc
@@ -1,29 +1,35 @@
---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-07-22 17:30:31 UTC
-+++ net/proxy_resolution/configured_proxy_resolution_service.cc
-@@ -53,7 +53,7 @@
+--- net/proxy_resolution/proxy_config_service.cc.orig 2022-08-31 12:19:35 UTC
++++ net/proxy_resolution/proxy_config_service.cc
+@@ -18,20 +18,20 @@
+ #include "net/proxy_resolution/proxy_config_service_ios.h"
#elif BUILDFLAG(IS_MAC)
#include "net/proxy_resolution/proxy_config_service_mac.h"
- #include "net/proxy_resolution/proxy_resolver_mac.h"
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "net/proxy_resolution/proxy_config_service_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "net/proxy_resolution/proxy_config_service_android.h"
-@@ -65,7 +65,7 @@ namespace net {
+ #endif
- namespace {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "net/traffic_annotation/network_traffic_annotation.h"
+ #endif
+ namespace net {
+
+ namespace {
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
semantics {
-@@ -1417,7 +1417,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
+@@ -108,7 +108,7 @@ ProxyConfigService::CreateSystemProxyConfigService(
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
return std::make_unique<UnsetProxyConfigService>();
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
- new ProxyConfigServiceLinux());
+ std::make_unique<ProxyConfigServiceLinux>());
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 03b4e20201aa..d9765b7019b3 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,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-07-22 17:30:31 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ net/proxy_resolution/proxy_config_service_linux.cc
@@ -6,7 +6,9 @@
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <map>
-@@ -500,6 +502,7 @@ bool SettingGetterImplGSettings::CheckVersion(
+@@ -502,6 +504,7 @@ bool SettingGetterImplGSettings::CheckVersion(
}
#endif // defined(USE_GIO)
@@ -18,7 +18,7 @@
// 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) {
-@@ -1028,6 +1031,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1030,6 +1033,7 @@ class SettingGetterImplKDE : public ProxyConfigService
// events on.
scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
};
@@ -26,7 +26,7 @@
} // namespace
-@@ -1245,9 +1249,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1246,9 +1250,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::nix::DESKTOP_ENVIRONMENT_KDE3:
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
case base::nix::DESKTOP_ENVIRONMENT_KDE5:
diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
index fe7296201230..a9e21cf2f83d 100644
--- a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
+++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
@@ -1,6 +1,6 @@
---- net/traffic_annotation/network_traffic_annotation.h.orig 2022-02-28 16:54:41 UTC
+--- net/traffic_annotation/network_traffic_annotation.h.orig 2022-08-31 12:19:35 UTC
+++ net/traffic_annotation/network_traffic_annotation.h
-@@ -371,7 +371,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
+@@ -372,7 +372,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
} // namespace net
// Placeholder for unannotated usages.
@@ -9,7 +9,7 @@
#define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \
net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
#endif
-@@ -385,7 +385,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
+@@ -386,7 +386,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if !BUILDFLAG(IS_WIN) && \
diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.cc b/www/chromium/files/patch-net_url__request_url__fetcher.cc
deleted file mode 100644
index 46b8f7eed7de..000000000000
--- a/www/chromium/files/patch-net_url__request_url__fetcher.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/url_request/url_fetcher.cc.orig 2022-02-28 16:54:41 UTC
-+++ net/url_request/url_fetcher.cc
-@@ -26,7 +26,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if !BUILDFLAG(IS_WIN) && \
-- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- // static
- std::unique_ptr<URLFetcher> URLFetcher::Create(
- const GURL& url,
diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h
deleted file mode 100644
index 2e9466c0dd77..000000000000
--- a/www/chromium/files/patch-net_url__request_url__fetcher.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/url_request/url_fetcher.h.orig 2022-03-25 21:59:56 UTC
-+++ net/url_request/url_fetcher.h
-@@ -344,7 +344,7 @@ class NET_EXPORT URLFetcher {
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if (!BUILDFLAG(IS_WIN) && \
-- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) || \
-+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))) || \
- BUILDFLAG(IS_CHROMEOS)
- // |url| is the URL to send the request to. It must be valid.
- // |request_type| is the type of request to make.
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index eee552e5fb3e..150e61cc6af9 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,11 +1,11 @@
---- net/url_request/url_request_context_builder.cc.orig 2022-07-22 17:30:31 UTC
+--- net/url_request/url_request_context_builder.cc.orig 2022-08-31 12:19:35 UTC
+++ net/url_request/url_request_context_builder.cc
-@@ -500,7 +500,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -503,7 +503,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD)
// TODO(willchan): Switch to using this code when
- // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s
+ // ProxyConfigService::CreateSystemProxyConfigService()'s
// signature doesn't suck.
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index 3e69490c010e..321f1dbab4ca 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig 2022-04-21 18:48:31 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig 2022-08-31 12:19:35 UTC
+++ pdf/pdfium/pdfium_engine.cc
-@@ -82,7 +82,7 @@
+@@ -81,7 +81,7 @@
#include "gin/public/cppgc.h"
#endif
@@ -9,7 +9,7 @@
#include "pdf/pdfium/pdfium_font_linux.h"
#endif
-@@ -517,7 +517,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon
+@@ -516,7 +516,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon
FPDF_InitLibraryWithConfig(&config);
diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc
index d9a7f028fbc1..9a3a389af72f 100644
--- a/www/chromium/files/patch-printing_print__settings__conversion.cc
+++ b/www/chromium/files/patch-printing_print__settings__conversion.cc
@@ -1,6 +1,6 @@
---- printing/print_settings_conversion.cc.orig 2022-05-19 14:06:27 UTC
+--- printing/print_settings_conversion.cc.orig 2022-08-31 12:19:35 UTC
+++ printing/print_settings_conversion.cc
-@@ -215,7 +215,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
+@@ -256,7 +256,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
settings->set_is_modifiable(is_modifiable.value());
}
diff --git a/www/chromium/files/patch-printing_printing__context__linux.cc b/www/chromium/files/patch-printing_printing__context__linux.cc
new file mode 100644
index 000000000000..fe3f223db114
--- /dev/null
+++ b/www/chromium/files/patch-printing_printing__context__linux.cc
@@ -0,0 +1,38 @@
+--- printing/printing_context_linux.cc.orig 2022-08-31 12:19:35 UTC
++++ printing/printing_context_linux.cc
+@@ -19,7 +19,7 @@
+ #include "printing/units.h"
+
+ // Avoid using LinuxUi on Fuchsia.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+
+@@ -68,7 +68,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
+
+ ResetSettings();
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (!ui::LinuxUi::instance())
+ return mojom::ResultCode::kSuccess;
+
+@@ -81,7 +81,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
+ }
+
+ gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (ui::LinuxUi::instance())
+ return ui::LinuxUi::instance()->GetPdfPaperSize(this);
+ #endif
+@@ -94,7 +94,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS
+ DCHECK(!printer_settings.show_system_dialog);
+ DCHECK(!in_print_job_);
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (!ui::LinuxUi::instance())
+ return mojom::ResultCode::kSuccess;
+
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 33fed8324975..71281ce12fd0 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-07-22 17:30:31 UTC
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-08-31 12:19:35 UTC
+++ remoting/codec/webrtc_video_encoder_vpx.cc
-@@ -86,7 +86,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
+@@ -89,7 +89,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_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
index 0ca314158c65..1639529b5e14 100644
--- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
+++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,6 +1,6 @@
---- remoting/host/me2me_desktop_environment.cc.orig 2022-05-19 14:06:27 UTC
+--- remoting/host/me2me_desktop_environment.cc.orig 2022-08-31 12:19:35 UTC
+++ remoting/host/me2me_desktop_environment.cc
-@@ -146,7 +146,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
+@@ -148,7 +148,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
// Otherwise, if the session is shared with the local user start monitoring
// the local input and create the in-session UI.
diff --git a/www/chromium/files/patch-remoting_host_policy__watcher.cc b/www/chromium/files/patch-remoting_host_policy__watcher.cc
new file mode 100644
index 000000000000..f21c4790a83c
--- /dev/null
+++ b/www/chromium/files/patch-remoting_host_policy__watcher.cc
@@ -0,0 +1,11 @@
+--- remoting/host/policy_watcher.cc.orig 2022-08-31 12:19:35 UTC
++++ remoting/host/policy_watcher.cc
+@@ -177,7 +177,7 @@ std::unique_ptr<base::DictionaryValue> PolicyWatcher::
+ auto result = std::make_unique<base::DictionaryValue>();
+ result->SetBoolKey(key::kRemoteAccessHostFirewallTraversal, true);
+ result->SetBoolKey(key::kRemoteAccessHostRequireCurtain, false);
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ result->SetBoolKey(key::kRemoteAccessHostMatchUsername, false);
+ #endif
+ result->Set(key::kRemoteAccessHostClientDomainList,
diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
index 7ebdc841da3f..9e73fa2e6ae5 100644
--- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
+++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,4 +1,4 @@
---- remoting/host/remoting_me2me_host.cc.orig 2022-06-17 14:20:10 UTC
+--- remoting/host/remoting_me2me_host.cc.orig 2022-08-31 12:19:35 UTC
+++ remoting/host/remoting_me2me_host.cc
@@ -124,7 +124,7 @@
#include "remoting/host/mac/permission_utils.h"
@@ -52,7 +52,7 @@
std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
#endif
std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -758,7 +758,7 @@ void HostProcess::StartOnNetworkThread() {
+@@ -753,7 +753,7 @@ void HostProcess::StartOnNetworkThread() {
void HostProcess::ShutdownOnNetworkThread() {
DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
config_watcher_.reset();
@@ -61,7 +61,7 @@
cert_watcher_.reset();
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
}
-@@ -817,7 +817,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -812,7 +812,7 @@ void HostProcess::CreateAuthenticatorFactory() {
DCHECK(third_party_auth_config_.token_url.is_valid());
DCHECK(third_party_auth_config_.token_validation_url.is_valid());
@@ -70,7 +70,7 @@
if (!cert_watcher_) {
cert_watcher_ = std::make_unique<CertificateWatcher>(
base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -927,7 +927,7 @@ void HostProcess::StartOnUiThread() {
+@@ -922,7 +922,7 @@ void HostProcess::StartOnUiThread() {
base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
@@ -79,7 +79,7 @@
// If an audio pipe is specific on the command-line then initialize
// AudioCapturerLinux to capture from it.
base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
-@@ -998,7 +998,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -993,7 +993,7 @@ void HostProcess::ShutdownOnUiThread() {
// It is now safe for the HostProcess to be deleted.
self_ = nullptr;
@@ -88,7 +88,7 @@
// Cause the global AudioPipeReader to be freed, otherwise the audio
// thread will remain in-use and prevent the process from exiting.
// TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1006,7 +1006,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -1001,7 +1001,7 @@ void HostProcess::ShutdownOnUiThread() {
AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -97,7 +97,16 @@
context_->input_task_runner()->PostTask(
FROM_HERE,
base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
-@@ -1711,7 +1711,7 @@ void HostProcess::StartHost() {
+@@ -1328,7 +1328,7 @@ bool HostProcess::OnUsernamePolicyUpdate(base::Diction
+ // Returns false: never restart the host after this policy update.
+ DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ absl::optional<bool> host_username_match_required =
+ policies->FindBoolKey(policy::key::kRemoteAccessHostMatchUsername);
+ if (!host_username_match_required.has_value())
+@@ -1712,7 +1712,7 @@ void HostProcess::StartHost() {
// The feature is enabled for all Googlers using a supported platform.
desktop_environment_options_.set_enable_remote_open_url(is_googler_);
@@ -106,7 +115,7 @@
desktop_environment_options_.set_enable_remote_webauthn(is_googler_);
#endif
-@@ -1744,7 +1744,7 @@ void HostProcess::StartHost() {
+@@ -1745,7 +1745,7 @@ void HostProcess::StartHost() {
host_status_logger_ = std::make_unique<HostStatusLogger>(
host_->status_monitor(), log_to_server_.get());
@@ -115,7 +124,7 @@
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->HasSwitch(kEnableUtempter))
host_utmp_logger_ =
-@@ -1915,7 +1915,7 @@ int HostProcessMain() {
+@@ -1916,7 +1916,7 @@ int HostProcessMain() {
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
@@ -124,7 +133,7 @@
#if defined(REMOTING_USE_X11)
// Initialize Xlib for multi-threaded use, allowing non-Chromium code to
// use X11 safely (such as the WebRTC capturer, GTK ...)
-@@ -1961,7 +1961,7 @@ int HostProcessMain() {
+@@ -1962,7 +1962,7 @@ int HostProcessMain() {
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
net::NetworkChangeNotifier::CreateIfNeeded());
diff --git a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc
index 36de6e32f65f..e7f7b86054de 100644
--- a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc
+++ b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc
@@ -1,6 +1,6 @@
---- remoting/host/setup/start_host_main.cc.orig 2022-02-28 16:54:41 UTC
+--- remoting/host/setup/start_host_main.cc.orig 2022-08-31 12:19:35 UTC
+++ remoting/host/setup/start_host_main.cc
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
#include <unistd.h>
#endif // BUILDFLAG(IS_POSIX)
@@ -9,7 +9,7 @@
#include "remoting/host/setup/daemon_controller_delegate_linux.h"
#include "remoting/host/setup/start_host_as_root.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -126,7 +126,7 @@ void OnDone(HostStarter::Result result) {
+@@ -125,7 +125,7 @@ void OnDone(HostStarter::Result result) {
} // namespace
int StartHostMain(int argc, char** argv) {
@@ -18,7 +18,7 @@
// Minimize the amount of code that runs as root on Posix systems.
if (getuid() == 0) {
return remoting::StartHostAsRoot(argc, argv);
-@@ -163,7 +163,7 @@ int StartHostMain(int argc, char** argv) {
+@@ -162,7 +162,7 @@ int StartHostMain(int argc, char** argv) {
// for the account which generated |code|.
std::string host_owner = command_line->GetSwitchValueASCII("host-owner");
diff --git a/www/chromium/files/patch-sandbox_BUILD.gn b/www/chromium/files/patch-sandbox_BUILD.gn
index 108ac6980ab9..6b1329566d7d 100644
--- a/www/chromium/files/patch-sandbox_BUILD.gn
+++ b/www/chromium/files/patch-sandbox_BUILD.gn
@@ -1,6 +1,6 @@
---- sandbox/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- sandbox/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ sandbox/BUILD.gn
-@@ -36,7 +36,7 @@ group("sandbox") {
+@@ -49,7 +49,7 @@ group("sandbox") {
"//sandbox/mac:system_services",
"//sandbox/mac/mojom",
]
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 75a1cdaffb46..13168c3fac61 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,4 +1,4 @@
---- services/cert_verifier/cert_verifier_creation.cc.orig 2022-06-17 14:20:10 UTC
+--- services/cert_verifier/cert_verifier_creation.cc.orig 2022-08-31 12:19:35 UTC
+++ services/cert_verifier/cert_verifier_creation.cc
@@ -12,7 +12,7 @@
#include "net/cert_net/cert_net_fetcher_url_request.h"
@@ -9,16 +9,16 @@
BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#include "net/cert/cert_verify_proc_builtin.h"
#include "net/cert/internal/system_trust_store.h"
-@@ -94,7 +94,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce
- scoped_refptr<net::CertNetFetcher> cert_net_fetcher,
- const net::ChromeRootStoreData* root_store_data) override {
- scoped_refptr<net::CertVerifyProc> verify_proc;
--#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -119,7 +119,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce
+ 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
-@@ -272,6 +272,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
+@@ -294,6 +294,7 @@ bool IsUsingChromeRootStore(
bool IsUsingCertNetFetcher() {
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc b/www/chromium/files/patch-services_device_compute__pressure_cpu__probe.cc
index 8ea22305922e..5572a0dfcbc9 100644
--- a/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc
+++ b/www/chromium/files/patch-services_device_compute__pressure_cpu__probe.cc
@@ -1,6 +1,6 @@
---- content/browser/compute_pressure/cpu_probe.cc.orig 2022-03-25 21:59:56 UTC
-+++ content/browser/compute_pressure/cpu_probe.cc
-@@ -53,6 +53,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() {
+--- services/device/compute_pressure/cpu_probe.cc.orig 2022-08-31 12:19:35 UTC
++++ services/device/compute_pressure/cpu_probe.cc
+@@ -55,6 +55,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() {
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
return CpuProbeLinux::Create();
#else
diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
index e4ec8aa2cd76..5b90667a5e8f 100644
--- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -1,6 +1,6 @@
---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2022-04-21 18:48:31 UTC
+--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ services/device/time_zone_monitor/time_zone_monitor_linux.cc
-@@ -136,7 +136,11 @@ class TimeZoneMonitorLinuxImpl
+@@ -137,7 +137,11 @@ class TimeZoneMonitorLinuxImpl
// false positives are harmless, assuming the false positive rate is
// reasonable.
const char* const kFilesToWatch[] = {
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index 85e273769ebf..55702619e13f 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 2022-06-17 14:20:10 UTC
+--- services/network/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ services/network/BUILD.gn
-@@ -332,7 +332,6 @@ if (is_linux || is_chromeos) {
+@@ -327,7 +327,6 @@ if (is_linux || is_chromeos) {
]
deps = [
"//base:base",
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index 5b6a4e94b1db..8e29c702aacb 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,11 +1,11 @@
---- services/network/network_service.cc.orig 2022-03-25 21:59:56 UTC
+--- services/network/network_service.cc.orig 2022-08-31 12:19:35 UTC
+++ services/network/network_service.cc
@@ -82,7 +82,7 @@
#include "third_party/boringssl/src/include/openssl/cpu.h"
#endif
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \
- !BUILDFLAG(IS_CHROMECAST)
+-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \
++#if ((BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)) || \
+ BUILDFLAG(IS_CHROMEOS_LACROS)
+
#include "components/os_crypt/key_storage_config_linux.h"
- #endif
diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc
deleted file mode 100644
index 0db160132971..000000000000
--- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2022-06-17 14:20:10 UTC
-+++ services/tracing/public/cpp/perfetto/perfetto_config.cc
-@@ -125,7 +125,7 @@ void AddDataSourceConfigs(
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_CHROMEOS_ASH) || \
-- (BUILDFLAG(IS_CHROMECAST) && BUILDFLAG(IS_LINUX))
-+ (BUILDFLAG(IS_CHROMECAST) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)))
- if (source_names.empty() ||
- source_names.count(tracing::mojom::kSystemTraceDataSourceName) == 1) {
- AddDataSourceConfig(
diff --git a/www/chromium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom b/www/chromium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom
index 0932c940affa..cdf01cc60b82 100644
--- a/www/chromium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom
+++ b/www/chromium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom
@@ -1,6 +1,6 @@
---- services/video_capture/public/mojom/video_capture_service.mojom.orig 2022-02-07 13:39:41 UTC
+--- services/video_capture/public/mojom/video_capture_service.mojom.orig 2022-08-31 12:19:35 UTC
+++ services/video_capture/public/mojom/video_capture_service.mojom
-@@ -21,10 +21,10 @@ interface AcceleratorFactory {
+@@ -24,10 +24,10 @@ interface AcceleratorFactory {
pending_receiver<chromeos_camera.mojom.MjpegDecodeAccelerator> jda);
};
diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
index 387488bd6863..5e462114f712 100644
--- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
+++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_config.h
@@ -1,6 +1,6 @@
---- third_party/abseil-cpp/absl/base/config.h.orig 2022-05-19 14:06:27 UTC
+--- third_party/abseil-cpp/absl/base/config.h.orig 2022-08-31 12:19:35 UTC
+++ third_party/abseil-cpp/absl/base/config.h
-@@ -448,7 +448,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -447,7 +447,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
// POSIX.1-2001.
#ifdef ABSL_HAVE_SCHED_YIELD
#error ABSL_HAVE_SCHED_YIELD cannot be directly set
@@ -10,7 +10,7 @@
#define ABSL_HAVE_SCHED_YIELD 1
#endif
-@@ -463,7 +464,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -462,7 +463,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
// platforms.
#ifdef ABSL_HAVE_SEMAPHORE_H
#error ABSL_HAVE_SEMAPHORE_H cannot be directly set
diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
index 34a830d59012..1ba92f604910 100644
--- a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
+++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
@@ -1,12 +1,11 @@
---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-05-19 14:06:27 UTC
+--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-08-31 12:19:35 UTC
+++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
-@@ -32,7 +32,8 @@
- #endif
+@@ -33,7 +33,7 @@
- #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
-- !defined(__native_client__) && !defined(__asmjs__) && !defined(__wasm__)
-+ !defined(__native_client__) && !defined(__asmjs__) && !defined(__wasm__) && \
-+ !defined(__FreeBSD__)
+ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
+ !defined(__native_client__) && !defined(__asmjs__) && \
+- !defined(__wasm__) && !defined(__HAIKU__)
++ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__FreeBSD__)
#define ABSL_HAVE_ELF_MEM_IMAGE 1
#endif
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 627bc209fa67..bbc369cd3eaf 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 2022-07-22 17:30:31 UTC
+--- third_party/angle/BUILD.gn.orig 2022-09-01 05:13:41 UTC
+++ third_party/angle/BUILD.gn
-@@ -223,7 +223,6 @@ config("extra_warnings") {
+@@ -247,7 +247,6 @@ config("extra_warnings") {
"-Wtautological-type-limit-compare",
"-Wundefined-reinterpret-cast",
"-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
"-Wsuggest-destructor-override",
"-Wsuggest-override",
-@@ -401,7 +400,7 @@ angle_static_library("angle_common") {
+@@ -425,7 +424,7 @@ angle_static_library("angle_common") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
@@ -17,7 +17,7 @@
libs = [ "dl" ]
}
-@@ -522,6 +521,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -551,6 +550,9 @@ angle_static_library("angle_gpu_info_util") {
"Xi",
"Xext",
]
@@ -27,3 +27,21 @@
}
if (angle_use_wayland && angle_has_build) {
+@@ -1068,12 +1070,12 @@ if (angle_use_wayland) {
+ "wayland-client",
+ "wayland-egl",
+ ]
++ } else {
++ include_dirs = [
++ "$wayland_dir/egl",
++ "$wayland_dir/src",
++ ]
+ }
+-
+- include_dirs = [
+- "$wayland_dir/egl",
+- "$wayland_dir/src",
+- ]
+ }
+
+ group("angle_wayland") {
diff --git a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp
deleted file mode 100644
index 43f8ba375f95..000000000000
--- a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-05-19 14:06:27 UTC
-+++ third_party/angle/src/common/system_utils_posix.cpp
-@@ -201,7 +201,9 @@ void *OpenSystemLibraryWithExtensionAndGetError(const
- int extraFlags = 0;
- if (searchType == SearchType::AlreadyLoaded)
- {
-+#if !defined(__OpenBSD__)
- extraFlags = RTLD_NOLOAD;
-+#endif
- }
-
- std::string fullPath = directory + libraryName;
diff --git a/www/chromium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn b/www/chromium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn
new file mode 100644
index 000000000000..fd2cae225029
--- /dev/null
+++ b/www/chromium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn
@@ -0,0 +1,11 @@
+--- third_party/angle/src/common/vulkan/BUILD.gn.orig 2022-09-01 05:13:41 UTC
++++ third_party/angle/src/common/vulkan/BUILD.gn
+@@ -33,7 +33,7 @@ if (angle_enable_vulkan || angle_build_vulkan_system_i
+ if (angle_shared_libvulkan) {
+ defines = [ "ANGLE_SHARED_LIBVULKAN=1" ]
+ }
+- if (angle_use_wayland) {
++ if (angle_use_wayland && !use_system_libwayland) {
+ include_dirs = [ "$wayland_dir/src" ]
+ }
+ configs = [ "$angle_root:angle_vulkan_wayland_config" ]
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 7ee489108a0d..2cd765850710 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,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-07-22 17:30:31 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-08-31 12:19:35 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
@@ -55,7 +55,7 @@
# include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -36,7 +36,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
{
-@@ -1955,7 +1955,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -1978,7 +1978,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 ae00ae38d0b4..31370a611d9b 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 2022-07-22 17:30:31 UTC
+--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-08-31 12:19:35 UTC
+++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1391,7 +1391,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1399,7 +1399,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_src_third__party_volk_BUILD.gn b/www/chromium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn
new file mode 100644
index 000000000000..4220124fd028
--- /dev/null
+++ b/www/chromium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn
@@ -0,0 +1,11 @@
+--- third_party/angle/src/third_party/volk/BUILD.gn.orig 2022-09-01 05:13:41 UTC
++++ third_party/angle/src/third_party/volk/BUILD.gn
+@@ -20,7 +20,7 @@ source_set("volk") {
+ public_configs = [ ":volk_config" ]
+ configs += [ "$angle_root:angle_no_cfi_icall" ]
+ public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ]
+- if (angle_use_wayland) {
++ if (angle_use_wayland && !use_system_libwayland) {
+ include_dirs = [ "$wayland_dir/src" ]
+ }
+ }
diff --git a/www/chromium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc b/www/chromium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc
new file mode 100644
index 000000000000..1e81c1656d84
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/common/privacy_budget/active_sampling.cc.orig 2022-08-31 12:19:35 UTC
++++ third_party/blink/common/privacy_budget/active_sampling.cc
+@@ -24,7 +24,7 @@ namespace blink {
+ bool IdentifiabilityActiveSampler::IsFontFamilyAvailable(const char* family,
+ SkFontMgr* fm) {
+ base::ScopedAllowBaseSyncPrimitives allow;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ return !!fm->legacyMakeTypeface(family, SkFontStyle());
+ #else
+ sk_sp<SkFontStyleSet> set(fm->matchFamily(family));
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
new file mode 100644
index 000000000000..b12402e13c57
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_public_platform_platform.h
@@ -0,0 +1,11 @@
+--- third_party/blink/public/platform/platform.h.orig 2022-08-31 12:19:35 UTC
++++ third_party/blink/public/platform/platform.h
+@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+ return nullptr;
+ }
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // This is called after the thread is created, so the embedder
+ // can initiate an IPC to change its thread type (on Linux we can't
+ // increase the nice value, so we need to ask the browser process). This
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 bd02eeff8f3f..32136a740d9d 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,6 +1,6 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-07-22 17:30:31 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -73,12 +73,12 @@
+@@ -74,12 +74,12 @@
#include "third_party/blink/renderer/controller/oom_intervention_impl.h"
#endif
@@ -15,7 +15,7 @@
#include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
#include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
#endif
-@@ -166,7 +166,7 @@ void InitializeCommon(Platform* platform, mojo::Binder
+@@ -172,7 +172,7 @@ void InitializeCommon(Platform* platform, mojo::Binder
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -24,12 +24,12 @@
// Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring.
if (UserLevelMemoryPressureSignalGenerator::Enabled())
UserLevelMemoryPressureSignalGenerator::Instance();
-@@ -240,7 +240,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
- main_thread->GetTaskRunner());
+@@ -251,7 +251,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+ main_thread->GetTaskRunner());
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- binders.Add(ConvertToBaseRepeatingCallback(
- CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
- main_thread->GetTaskRunner());
+ binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
+ ConvertToBaseRepeatingCallback(
+ CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index ff0aa2880c70..96eb69ebf024 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-07-22 17:30:31 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -401,7 +401,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
const blink::RendererPreferences& prefs) {
@@ -9,7 +9,7 @@
if (!prefs.should_antialias_text) {
// When anti-aliasing is off, GTK maps all non-zero hinting settings to
// 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3203,7 +3203,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3212,7 +3212,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
renderer_preferences_.use_subpixel_positioning);
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
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 4b8ae3a6d627..1e47f49f242e 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 2022-07-22 17:30:31 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6331,7 +6331,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6341,7 +6341,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
MoveCaretStaysHorizontallyAlignedWhenMoved
#endif
// TODO(crbug.com/1317375): Build these tests on all platforms.
@@ -9,9 +9,9 @@
TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) {
RegisterMockedHttpURLLoad("move_caret.html");
-@@ -6710,7 +6710,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) {
- TEST_F(CompositedSelectionBoundsTest, SVGTextWithFragments) {
- RunTest("composited_selection_bounds_svg_text_with_fragments.html");
+@@ -6737,7 +6737,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
+ TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
+ RunTest("composited_selection_bounds_large_selection_noscroll.html");
}
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
index cb1cb611fb66..0e63bbaa8d0d 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc
@@ -1,7 +1,7 @@
---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-02-28 16:54:41 UTC
+--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc
-@@ -34,7 +34,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul
- namespace {
+@@ -34,7 +34,7 @@ namespace {
+ AudioDeviceFactory* g_factory_override = nullptr;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
index 0986b5111949..fcf5b237594b 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -288,7 +288,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS
+@@ -284,7 +284,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
SetupRenderer(kDefaultOutputDeviceId);
renderer_proxy_->Start();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
index fb15f518017d..4302eb32e30d 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
@@ -1,11 +1,11 @@
---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-06-17 14:20:10 UTC
+--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
-@@ -378,7 +378,7 @@ class AudioWorkletThreadPriorityTest
+@@ -379,7 +379,7 @@ class AudioWorkletThreadPriorityTest
// TODO(crbug.com/1022888): The worklet thread priority is always NORMAL
// on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (expected_priority == base::ThreadPriority::REALTIME_AUDIO ||
- expected_priority == base::ThreadPriority::DISPLAY) {
- EXPECT_EQ(actual_priority, base::ThreadPriority::NORMAL);
+ if (expected_priority == base::ThreadPriorityForTest::kRealtimeAudio ||
+ expected_priority == base::ThreadPriorityForTest::kDisplay) {
+ EXPECT_EQ(actual_priority, base::ThreadPriorityForTest::kNormal);
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 cd5ab78446e0..691b2cb7205e 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 2022-07-22 17:30:31 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6100,7 +6100,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6103,7 +6103,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
constexpr bool kAllowZeroCopyImages = true;
#endif
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 db6da3f5b6da..acdddbd32336 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 2022-07-22 17:30:31 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1880,7 +1880,7 @@ static_library("test_support") {
+@@ -1893,7 +1893,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_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
index bb6dc6e01c3d..242cb93569d6 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.cc
@@ -75,7 +75,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
@@ -9,7 +9,7 @@
float FontCache::device_scale_factor_ = 1.0;
#endif
-@@ -120,7 +120,7 @@ FontCache::~FontCache() = default;
+@@ -142,7 +142,7 @@ FontCache::~FontCache() {
FontPlatformData* FontCache::SystemFontPlatformData(
const FontDescription& font_description) {
const AtomicString& family = FontCache::SystemFontFamily();
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index 20600175b40f..3f922ca56ce5 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-03-25 21:59:56 UTC
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/platform/fonts/font_description.cc
@@ -39,7 +39,7 @@
#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
@@ -9,7 +9,7 @@
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
#endif
-@@ -262,7 +262,7 @@ FontCacheKey FontDescription::CacheKey(
+@@ -270,7 +270,7 @@ FontCacheKey FontDescription::CacheKey(
static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3
static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
index 1e36a597ee4d..ad3145a82b30 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2022-07-22 17:30:31 UTC
+--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/platform/fonts/font_platform_data.cc
-@@ -46,7 +46,7 @@
+@@ -48,7 +48,7 @@
namespace blink {
namespace {
@@ -9,7 +9,7 @@
// Getting the system font render style takes a significant amount of time on
// Linux because looking up fonts using fontconfig can be very slow. We fetch
// the render style for each font family and text size, while it's very
-@@ -120,7 +120,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t
+@@ -122,7 +122,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t
style_ = WebFontRenderStyle::GetDefault();
#if !BUILDFLAG(IS_WIN)
WebFontRenderStyle system_style;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
index 33e51bdf717a..4dc586769b44 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
@@ -1,13 +1,14 @@
---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-06-17 14:20:10 UTC
+--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
-@@ -76,7 +76,11 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
+@@ -76,8 +76,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
- // Once we are using RAF, this thread is driving Display updates. Update
- // priority accordingly.
+ // Once we are using RAF, this thread is driving user interactive display
+ // updates. Update priority accordingly.
+ // pledge(2)
+ // stop this baloney
+#if !defined(OS_OPENBSD)
- base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
+ base::PlatformThread::SetCurrentThreadType(
+ base::ThreadType::kDisplayCritical);
+#endif
mojo::Remote<mojom::blink::EmbeddedFrameSinkProvider> provider;
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 79663fd3c3be..5931bd6cd3f6 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,4 +1,4 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-07-22 17:30:31 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -33,7 +33,7 @@
// shipped stable can have its runtime flag removed soon after.
@@ -9,7 +9,7 @@
},
// "implied_by" or "depends_on" specifies relationship to other features:
-@@ -1069,7 +1069,7 @@
+@@ -1049,7 +1049,7 @@
depends_on: ["FileSystemAccess"],
status: {"Android": "test", "default": "experimental"},
origin_trial_feature_name: "FileHandling",
@@ -18,7 +18,7 @@
},
{
name: "FileHandlingIcons",
-@@ -2403,7 +2403,7 @@
+@@ -2357,7 +2357,7 @@
{
name: "U2FSecurityKeyAPI",
origin_trial_feature_name: "U2FSecurityKeyAPI",
@@ -27,7 +27,7 @@
origin_trial_type: "deprecation",
},
{
-@@ -2422,7 +2422,7 @@
+@@ -2372,7 +2372,7 @@
{
name: "UnrestrictedSharedArrayBuffer",
origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -35,8 +35,8 @@
+ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
},
{
- name: "URLPattern",
-@@ -2444,7 +2444,7 @@
+ name: "URLPatternCompareComponent",
+@@ -2390,7 +2390,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.
@@ -44,19 +44,19 @@
+ origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win", "openbsd", "freebsd"],
},
{
- name: "UUID",
-@@ -2569,12 +2569,12 @@
+ name: "V8IdleTasks",
+@@ -2510,12 +2510,12 @@
name: "WebAppUrlHandling",
status: "experimental",
origin_trial_feature_name: "WebAppUrlHandling",
- origin_trial_os: ["win", "mac", "linux"],
-+ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"]
++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"],
},
{
name: "WebAppWindowControlsOverlay",
origin_trial_feature_name: "WebAppWindowControlsOverlay",
- origin_trial_os: ["win", "mac", "linux", "chromeos"],
+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
- status: "experimental",
+ status: "stable",
},
{
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
index 15b77f0efb40..663a0aae4c12 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc
@@ -1,12 +1,11 @@
---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-03-25 21:59:56 UTC
+--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/blink/renderer/platform/scheduler/common/thread.cc
-@@ -99,7 +99,8 @@ void Thread::CreateAndSetCompositorThread() {
+@@ -97,7 +97,7 @@ void Thread::CreateAndSetCompositorThread() {
std::make_unique<scheduler::CompositorThread>(params);
compositor_thread->Init();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+// pledge(2)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD)
- if (base::FeatureList::IsEnabled(
- features::kBlinkCompositorUseDisplayThreadPriority)) {
- compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult(
+ compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult(
+ FROM_HERE, base::BindOnce(&base::PlatformThread::CurrentId),
+ base::BindOnce([](base::PlatformThreadId compositor_thread_id) {
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
new file mode 100644
index 000000000000..34387530f409
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-08-31 12:19:35 UTC
++++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc
+@@ -256,7 +256,7 @@ void CategorizedWorkerPool::Start(int num_normal_threa
+ "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(),
+ base::BindOnce([](base::PlatformThreadId thread_id) {
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
index e2d6396942c6..efaa7aaa5485 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc
@@ -1,4 +1,4 @@
---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2022-04-21 18:48:31 UTC
+--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/crashpad/crashpad/util/posix/signals.cc
@@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = {
#if defined(SIGEMT)
@@ -18,7 +18,7 @@
SIGIO,
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
};
-@@ -232,8 +232,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi
+@@ -251,8 +251,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi
// remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c
// psignal_internal().
(code > 0 &&
diff --git a/www/chromium/files/patch-base_third__party_libevent_event.h b/www/chromium/files/patch-third__party_libevent_event.h
index 282a35d03ee9..b1bb1532bc63 100644
--- a/www/chromium/files/patch-base_third__party_libevent_event.h
+++ b/www/chromium/files/patch-third__party_libevent_event.h
@@ -1,5 +1,5 @@
---- base/third_party/libevent/event.h.orig 2022-05-28 07:21:18 UTC
-+++ base/third_party/libevent/event.h
+--- third_party/libevent/event.h.orig 2022-08-31 12:19:35 UTC
++++ third_party/libevent/event.h
@@ -1,3 +1,6 @@
+#if defined(USE_SYSTEM_LIBEVENT)
+#include <event.h>
diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
index 4a11214c1ef5..f201ad28c782 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc
@@ -1,4 +1,4 @@
---- third_party/perfetto/src/base/unix_socket.cc.orig 2022-02-07 13:39:41 UTC
+--- third_party/perfetto/src/base/unix_socket.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/perfetto/src/base/unix_socket.cc
@@ -42,7 +42,7 @@
#include <unistd.h>
@@ -9,7 +9,7 @@
#include <sys/ucred.h>
#endif
-@@ -791,9 +791,13 @@ void UnixSocket::ReadPeerCredentialsPosix() {
+@@ -790,9 +790,13 @@ void UnixSocket::ReadPeerCredentialsPosix() {
return;
PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore);
diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
index 59a98a420b53..e1d30f002c39 100644
--- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
+++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc
@@ -1,6 +1,6 @@
---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -3040,7 +3040,8 @@ bool TracingServiceImpl::SnapshotClocks(
+@@ -3037,7 +3037,8 @@ bool TracingServiceImpl::SnapshotClocks(
#if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
!PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc
new file mode 100644
index 000000000000..5ecfe8529421
--- /dev/null
+++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc
@@ -0,0 +1,12 @@
+--- third_party/protobuf/src/google/protobuf/arenastring.cc.orig 2022-09-01 14:18:43 UTC
++++ third_party/protobuf/src/google/protobuf/arenastring.cc
+@@ -64,7 +64,9 @@ constexpr size_t kNewAlign = alignof(std::max_align_t)
+ #endif
+ constexpr size_t kStringAlign = alignof(std::string);
+
++#if !(defined(__FreeBSD__) && defined(__i386__))
+ static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, "");
++#endif
+ static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, "");
+
+ } // namespace
diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
index 8e1fb1266848..249b75357b53 100644
--- a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
+++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
@@ -1,6 +1,6 @@
---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2022-02-07 13:39:41 UTC
+--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2022-08-31 12:19:35 UTC
+++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
-@@ -118,7 +118,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
+@@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
#undef GOOGLE_PROTOBUF_PLATFORM_ERROR
diff --git a/www/chromium/files/patch-third__party_ruy_BUILD.gn b/www/chromium/files/patch-third__party_ruy_BUILD.gn
new file mode 100644
index 000000000000..f7f2d074ca7a
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ruy_BUILD.gn
@@ -0,0 +1,11 @@
+--- third_party/ruy/BUILD.gn.orig 2022-08-31 12:19:35 UTC
++++ third_party/ruy/BUILD.gn
+@@ -11,7 +11,7 @@ use_cpuinfo =
+ # cpuinfo is not supported on Windows on ARM yet.
+ !(is_win && current_cpu == "arm64") &&
+ # cpuinfo is not supported on fuchsia.
+- !is_fuchsia &&
++ !is_fuchsia && !is_bsd &&
+ # There's a few arm architectures that are not supported by cpuinfo,
+ # especially amongst ChromeOS devices.
+ # See //third_party/cpuinfo/src/src/arm/linux/cp.h.
diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
index 91b14b4d0c6a..038a9bb56bab 100644
--- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,6 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2022-06-17 14:20:10 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2022-08-31 12:19:35 UTC
+++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -41451,7 +41451,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -42090,7 +42090,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
memset(zBuf, 0, nBuf);
randomnessPid = osGetpid(0);
#if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -13,7 +13,7 @@
int fd, got;
fd = robust_open("/dev/urandom", O_RDONLY, 0);
if( fd<0 ){
-@@ -41466,6 +41471,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -42105,6 +42110,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
robust_close(0, fd, __LINE__);
}
}
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_System_SharedLibrary.hpp b/www/chromium/files/patch-third__party_swiftshader_src_System_SharedLibrary.hpp
deleted file mode 100644
index c419247cebd0..000000000000
--- a/www/chromium/files/patch-third__party_swiftshader_src_System_SharedLibrary.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/swiftshader/src/System/SharedLibrary.hpp.orig 2022-02-07 13:39:41 UTC
-+++ third_party/swiftshader/src/System/SharedLibrary.hpp
-@@ -96,7 +96,7 @@ inline void *loadLibrary(const char *path)
-
- inline void *getLibraryHandle(const char *path)
- {
--# ifdef __ANDROID__
-+# if defined(__ANDROID__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- // bionic doesn't support RTLD_NOLOAD before L
- return dlopen(path, RTLD_NOW | RTLD_LOCAL);
- # else
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_BUILD.gn
deleted file mode 100644
index 317ba7d023ba..000000000000
--- a/www/chromium/files/patch-third__party_swiftshader_src_Vulkan_BUILD.gn
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/swiftshader/src/Vulkan/BUILD.gn.orig 2022-07-22 17:30:31 UTC
-+++ third_party/swiftshader/src/Vulkan/BUILD.gn
-@@ -48,6 +48,10 @@ config("swiftshader_libvulkan_private_config") {
- defines = [ "VK_EXPORT=" ]
- }
-
-+ if (is_openbsd) {
-+ defines -= [ "VK_USE_PLATFORM_WAYLAND_KHR" ]
-+ }
-+
- if (is_clang) {
- cflags = [
- "-Wno-unused-private-field",
diff --git a/www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn
index c96728a728f3..ddde1f45eb4c 100644
--- a/www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn
+++ b/www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn
@@ -1,18 +1,11 @@
---- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+--- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ third_party/swiftshader/src/WSI/BUILD.gn
-@@ -53,6 +53,15 @@ swiftshader_source_set("WSI") {
- ]
- }
+@@ -84,7 +84,7 @@ swiftshader_source_set("WSI") {
+ "../Vulkan:swiftshader_libvulkan_headers",
+ ]
-+ if (is_openbsd) {
-+ sources -= [
-+ "WaylandSurfaceKHR.cpp",
-+ "WaylandSurfaceKHR.hpp",
-+ "libWaylandClient.cpp",
-+ "libWaylandClient.hpp",
-+ ]
-+ }
-+
- if (is_win) {
- sources += [
- "Win32SurfaceKHR.cpp",
+- if (is_linux && !use_system_libwayland) {
++ if (is_linux && !use_system_libwayland && !is_openbsd) {
+ # Use third-party targets
+ deps += [ "$wayland_gn_dir:wayland_client" ]
+ }
diff --git a/www/chromium/files/patch-third__party_tflite_features.gni b/www/chromium/files/patch-third__party_tflite_features.gni
index a40a3129fe38..0c9ee5b5655a 100644
--- a/www/chromium/files/patch-third__party_tflite_features.gni
+++ b/www/chromium/files/patch-third__party_tflite_features.gni
@@ -1,9 +1,11 @@
---- third_party/tflite/features.gni.orig 2022-06-17 14:20:10 UTC
+--- third_party/tflite/features.gni.orig 2022-08-31 12:19:35 UTC
+++ third_party/tflite/features.gni
-@@ -7,5 +7,5 @@ import("//build/config/chrome_build.gni")
+@@ -7,7 +7,7 @@ import("//build/config/chrome_build.gni")
declare_args() {
# This enables building TFLite with XNNPACK. Currently only available for
# Linux x64.
-- build_tflite_with_xnnpack = is_linux && target_cpu == "x64"
+- build_tflite_with_xnnpack = is_linux && current_cpu == "x64"
+ build_tflite_with_xnnpack = (is_linux && target_cpu == "x64") && !is_bsd
- }
+
+ # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp.
+ build_tflite_with_ruy = true
diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h
deleted file mode 100644
index c70316197e2c..000000000000
--- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/vulkan-deps/vulkan-loader/src/loader/allocation.h.orig 2022-07-22 17:30:31 UTC
-+++ third_party/vulkan-deps/vulkan-loader/src/loader/allocation.h
-@@ -60,7 +60,7 @@ void loader_free_with_instance_fallback(const VkAlloca
- void *loader_realloc_with_instance_fallback(const VkAllocationCallbacks *pAllocator, const struct loader_instance *instance,
- void *pMemory, size_t orig_size, size_t size, VkSystemAllocationScope allocation_scope);
-
--#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__)
- #define loader_stack_alloc(size) alloca(size)
- #elif defined(_WIN32)
- #define loader_stack_alloc(size) _alloca(size)
diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h
new file mode 100644
index 000000000000..516a4ce51dbc
--- /dev/null
+++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h
@@ -0,0 +1,16 @@
+--- third_party/vulkan-deps/vulkan-loader/src/loader/stack_allocation.h.orig 2022-09-01 05:13:41 UTC
++++ third_party/vulkan-deps/vulkan-loader/src/loader/stack_allocation.h
+@@ -30,11 +30,11 @@
+
+ #if defined(_WIN32)
+ #include <malloc.h>
+-#else
++#elif !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+
+-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define loader_stack_alloc(size) alloca(size)
+ #elif defined(_WIN32)
+ #define loader_stack_alloc(size) _alloca(size)
diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
index 22112a260116..20f3cf4e561a 100644
--- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
+++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
@@ -1,4 +1,4 @@
---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-07-22 17:30:31 UTC
+--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-08-31 12:19:35 UTC
+++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h
@@ -43,7 +43,7 @@
#include "dlopen_fuchsia.h"
@@ -9,16 +9,25 @@
#include <unistd.h>
// Note: The following file is for dynamic loading:
#include <dlfcn.h>
-@@ -103,7 +103,7 @@
- // Override layer information
- #define VK_OVERRIDE_LAYER_NAME "VK_LAYER_LUNARG_override"
+@@ -98,7 +98,7 @@
+ #define LAYERS_PATH_ENV "VK_LAYER_PATH"
+ #define ENABLED_LAYERS_ENV "VK_INSTANCE_LAYERS"
-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__)
/* Linux-specific common code: */
// VK Library Filenames, Paths, etc.:
-@@ -194,6 +194,15 @@ static inline char *loader_platform_executable_path(ch
+@@ -219,7 +219,7 @@ static inline void loader_platform_thread_once_fn(pthr
+
+ #endif
+
+-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+
+ // File IO
+ static inline bool loader_platform_file_exists(const char *path) {
+@@ -277,6 +277,15 @@ static inline char *loader_platform_executable_path(ch
if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buffer, &size, NULL, 0) < 0) {
return NULL;
}
diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
index 0ac2932d9a5d..5ce6afbb0be2 100644
--- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+--- third_party/webrtc/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ third_party/webrtc/BUILD.gn
-@@ -204,6 +204,9 @@ config("common_inherited_config") {
+@@ -205,6 +205,9 @@ config("common_inherited_config") {
if (is_linux || is_chromeos) {
defines += [ "WEBRTC_LINUX" ]
}
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
index 7e0fad19444e..d68887cf10e4 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+--- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ third_party/webrtc/rtc_base/BUILD.gn
-@@ -1231,7 +1231,7 @@ rtc_library("rtc_base") {
+@@ -1243,7 +1243,7 @@ rtc_library("rtc_base") {
sources += [ "mac_ifaddrs_converter.cc" ]
}
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
index 3e730c66508a..884bb821858d 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,6 +1,6 @@
---- third_party/webrtc/rtc_base/network.cc.orig 2022-06-17 14:20:10 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig 2022-08-31 12:19:35 UTC
+++ third_party/webrtc/rtc_base/network.cc
-@@ -266,7 +266,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
+@@ -269,7 +269,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
}
#endif
diff --git a/www/chromium/files/patch-tools_generate__stubs_rules.gni b/www/chromium/files/patch-tools_generate__stubs_rules.gni
index eaaeaa37cd1b..a3e779c1b0a6 100644
--- a/www/chromium/files/patch-tools_generate__stubs_rules.gni
+++ b/www/chromium/files/patch-tools_generate__stubs_rules.gni
@@ -1,6 +1,6 @@
---- tools/generate_stubs/rules.gni.orig 2022-02-07 13:39:41 UTC
+--- tools/generate_stubs/rules.gni.orig 2022-08-31 12:19:35 UTC
+++ tools/generate_stubs/rules.gni
-@@ -96,7 +96,6 @@ template("generate_stubs") {
+@@ -110,7 +110,6 @@ template("generate_stubs") {
"${target_gen_dir}/${invoker.output_name}.cc",
"${target_gen_dir}/${invoker.output_name}.h",
]
diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
index 1c8470cce02b..58ad2b72b2e0 100644
--- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig 2022-07-22 17:30:31 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig 2022-08-31 12:19:35 UTC
+++ tools/json_schema_compiler/feature_compiler.py
-@@ -267,6 +267,8 @@ FEATURE_GRAMMAR = ({
+@@ -268,6 +268,8 @@ FEATURE_GRAMMAR = ({
'mac': 'Feature::MACOSX_PLATFORM',
'win': 'Feature::WIN_PLATFORM',
'fuchsia': 'Feature::FUCHSIA_PLATFORM',
diff --git a/www/chromium/files/patch-ui_aura_screen__ozone.cc b/www/chromium/files/patch-ui_aura_screen__ozone.cc
index 95bea0388bb1..681854e1e5c0 100644
--- a/www/chromium/files/patch-ui_aura_screen__ozone.cc
+++ b/www/chromium/files/patch-ui_aura_screen__ozone.cc
@@ -1,32 +1,11 @@
---- ui/aura/screen_ozone.cc.orig 2022-08-15 13:11:31 UTC
+--- ui/aura/screen_ozone.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/aura/screen_ozone.cc
-@@ -4,6 +4,8 @@
-
- #include "ui/aura/screen_ozone.h"
-
-+#include <memory>
-+
- #include "ui/aura/client/screen_position_client.h"
- #include "ui/aura/window.h"
- #include "ui/aura/window_tree_host.h"
-@@ -107,9 +109,17 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons
+@@ -109,7 +109,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons
return platform_screen_->GetPrimaryDisplay();
}
-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
--bool ScreenOzone::SetScreenSaverSuspended(bool suspend) {
-- return platform_screen_->SetScreenSaverSuspended(suspend);
+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-+ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone(
-+ std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender> suspender)
-+ : suspender_(std::move(suspender)) {}
-+
-+ScreenOzone::ScreenSaverSuspenderOzone::~ScreenSaverSuspenderOzone() = default;
-+
-+std::unique_ptr<display::Screen::ScreenSaverSuspender>
-+ScreenOzone::SuspendScreenSaver() {
-+ return std::make_unique<ScreenSaverSuspenderOzone>(
-+ platform_screen_->SuspendScreenSaver());
- }
- #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-
+ ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone(
+ std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender> suspender)
+ : suspender_(std::move(suspender)) {}
diff --git a/www/chromium/files/patch-ui_aura_screen__ozone.h b/www/chromium/files/patch-ui_aura_screen__ozone.h
index 536fc0ed5cd2..3fdc33b27305 100644
--- a/www/chromium/files/patch-ui_aura_screen__ozone.h
+++ b/www/chromium/files/patch-ui_aura_screen__ozone.h
@@ -1,57 +1,20 @@
---- ui/aura/screen_ozone.h.orig 2022-08-15 13:11:31 UTC
+--- ui/aura/screen_ozone.h.orig 2022-08-31 12:19:35 UTC
+++ ui/aura/screen_ozone.h
-@@ -11,11 +11,8 @@
- #include "build/chromeos_buildflags.h"
- #include "ui/aura/aura_export.h"
- #include "ui/display/screen.h"
-+#include "ui/ozone/public/platform_screen.h"
-
--namespace ui {
--class PlatformScreen;
--}
--
- namespace aura {
-
- // display::Screen implementation on top of ui::PlatformScreen provided by
-@@ -48,6 +45,10 @@ class AURA_EXPORT ScreenOzone : public display::Screen
+@@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen
display::Display GetDisplayMatching(
const gfx::Rect& match_rect) const override;
display::Display GetPrimaryDisplay() const override;
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-+ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver()
-+ override;
-+#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
- bool IsScreenSaverActive() const override;
- base::TimeDelta CalculateIdleTime() const override;
- void AddObserver(display::DisplayObserver* observer) override;
-@@ -65,11 +66,27 @@ class AURA_EXPORT ScreenOzone : public display::Screen
- protected:
+ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver()
+ override;
+ #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+@@ -68,7 +68,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen
ui::PlatformScreen* platform_screen() { return platform_screen_.get(); }
+ private:
-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-- bool SetScreenSaverSuspended(bool suspend) override;
-+ private:
+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-+ class ScreenSaverSuspenderOzone
-+ : public display::Screen::ScreenSaverSuspender {
-+ public:
-+ explicit ScreenSaverSuspenderOzone(
-+ std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender>
-+ suspender);
-+
-+ ScreenSaverSuspenderOzone(const ScreenSaverSuspenderOzone&) = delete;
-+ ScreenSaverSuspenderOzone& operator=(const ScreenSaverSuspenderOzone&) =
-+ delete;
-+
-+ ~ScreenSaverSuspenderOzone() override;
-+
-+ private:
-+ std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender>
-+ suspender_;
-+ };
- #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-
-- private:
- gfx::AcceleratedWidget GetAcceleratedWidgetForWindow(
- aura::Window* window) const;
-
+ class ScreenSaverSuspenderOzone
+ : public display::Screen::ScreenSaverSuspender {
+ public:
diff --git a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc
index 660cd0441366..f37ee332384b 100644
--- a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc
+++ b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc
@@ -1,6 +1,6 @@
---- ui/base/ime/dummy_text_input_client.cc.orig 2022-07-22 17:30:31 UTC
+--- ui/base/ime/dummy_text_input_client.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/base/ime/dummy_text_input_client.cc
-@@ -156,7 +156,7 @@ bool DummyTextInputClient::ShouldDoLearning() {
+@@ -158,7 +158,7 @@ bool DummyTextInputClient::ShouldDoLearning() {
return false;
}
diff --git a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h
index 64607ef8821e..fd686d8daf7d 100644
--- a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h
+++ b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h
@@ -1,6 +1,6 @@
---- ui/base/ime/dummy_text_input_client.h.orig 2022-02-28 16:54:41 UTC
+--- ui/base/ime/dummy_text_input_client.h.orig 2022-08-31 12:19:35 UTC
+++ ui/base/ime/dummy_text_input_client.h
-@@ -63,7 +63,7 @@ class DummyTextInputClient : public TextInputClient {
+@@ -65,7 +65,7 @@ class DummyTextInputClient : public TextInputClient {
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc
index b6b545bddb38..822b436c8185 100644
--- a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc
+++ b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc
@@ -1,6 +1,6 @@
---- ui/base/ime/fake_text_input_client.cc.orig 2022-02-28 16:54:41 UTC
+--- ui/base/ime/fake_text_input_client.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/base/ime/fake_text_input_client.cc
-@@ -161,7 +161,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
+@@ -163,7 +163,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
return false;
}
diff --git a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h
index aa3aa8b32a7c..a93ff5c8c763 100644
--- a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h
+++ b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h
@@ -1,6 +1,6 @@
---- ui/base/ime/fake_text_input_client.h.orig 2022-02-28 16:54:41 UTC
+--- ui/base/ime/fake_text_input_client.h.orig 2022-08-31 12:19:35 UTC
+++ ui/base/ime/fake_text_input_client.h
-@@ -69,7 +69,7 @@ class FakeTextInputClient : public TextInputClient {
+@@ -71,7 +71,7 @@ class FakeTextInputClient : public TextInputClient {
void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override;
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
index 2b686551d206..792c782a234f 100644
--- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
+++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
@@ -1,4 +1,4 @@
---- ui/base/ime/init/input_method_initializer.cc.orig 2022-02-28 16:54:41 UTC
+--- ui/base/ime/init/input_method_initializer.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/base/ime/init/input_method_initializer.cc
@@ -10,7 +10,7 @@
#include "build/chromeos_buildflags.h"
@@ -6,33 +6,24 @@
#if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- #include "base/check.h"
- #include "ui/base/ime/linux/fake_input_method_context_factory.h"
+ #include "ui/base/ime/linux/fake_input_method_context.h"
+ #include "ui/base/ime/linux/linux_input_method_context_factory.h"
#elif BUILDFLAG(IS_WIN)
-@@ -20,7 +20,7 @@
-
- namespace {
-
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- const ui::LinuxInputMethodContextFactory*
- g_linux_input_method_context_factory_for_testing;
- #endif
-@@ -43,7 +43,7 @@ void ShutdownInputMethod() {
+@@ -34,7 +34,7 @@ void ShutdownInputMethod() {
void InitializeInputMethodForTesting() {
#if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- if (!g_linux_input_method_context_factory_for_testing)
- g_linux_input_method_context_factory_for_testing =
- new FakeInputMethodContextFactory();
-@@ -61,7 +61,7 @@ void InitializeInputMethodForTesting() {
+ GetInputMethodContextFactoryForTest() =
+ base::BindRepeating([](LinuxInputMethodContextDelegate* delegate)
+ -> std::unique_ptr<LinuxInputMethodContext> {
+@@ -47,7 +47,7 @@ void InitializeInputMethodForTesting() {
void ShutdownInputMethodForTesting() {
#if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- const LinuxInputMethodContextFactory* factory =
- LinuxInputMethodContextFactory::instance();
- CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing)
+ // The function owns the factory (as a static variable that's returned by
+ // reference), so setting this to an empty factory will free the old one.
+ GetInputMethodContextFactoryForTest() = LinuxInputMethodContextFactory();
diff --git a/www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc b/www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
new file mode 100644
index 000000000000..92d34787a833
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc
@@ -0,0 +1,20 @@
+--- ui/base/ime/linux/linux_input_method_context_factory.cc.orig 2022-08-31 12:19:35 UTC
++++ ui/base/ime/linux/linux_input_method_context_factory.cc
+@@ -9,7 +9,7 @@
+ #include "build/build_config.h"
+ #include "ui/base/ime/linux/fake_input_method_context.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #include "ui/linux/linux_ui_delegate.h"
+ #endif
+@@ -37,7 +37,7 @@ std::unique_ptr<LinuxInputMethodContext> CreateLinuxIn
+ if (auto context = factory.Run(delegate))
+ return context;
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Finally, let the toolkit create the context.
+ if (auto* linux_ui = LinuxUi::instance()) {
+ if (auto context = linux_ui->CreateInputMethodContext(delegate))
diff --git a/www/chromium/files/patch-ui_base_ime_text__input__client.h b/www/chromium/files/patch-ui_base_ime_text__input__client.h
index 2e2adad0131d..dc5dd1c6bd73 100644
--- a/www/chromium/files/patch-ui_base_ime_text__input__client.h
+++ b/www/chromium/files/patch-ui_base_ime_text__input__client.h
@@ -1,6 +1,6 @@
---- ui/base/ime/text_input_client.h.orig 2022-05-19 14:06:27 UTC
+--- ui/base/ime/text_input_client.h.orig 2022-08-31 12:19:35 UTC
+++ ui/base/ime/text_input_client.h
-@@ -238,7 +238,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient {
+@@ -240,7 +240,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient {
// fields that are considered 'private' (e.g. in incognito tabs).
virtual bool ShouldDoLearning() = 0;
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc
index adf3c834b4e5..19ffbdf18f51 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.cc.orig 2022-08-17 07:04:17 UTC
+--- ui/base/ui_base_features.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/base/ui_base_features.cc
-@@ -180,7 +180,7 @@ const base::Feature kExperimentalFlingAnimation {
+@@ -189,7 +189,7 @@ const base::Feature kExperimentalFlingAnimation {
// of lacros-chrome is complete.
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
@@ -9,7 +9,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -278,7 +278,7 @@ bool IsForcedColorsEnabled() {
+@@ -287,7 +287,7 @@ bool IsForcedColorsEnabled() {
// milestones.
const base::Feature kEyeDropper {
"EyeDropper",
diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
index 9cdedd2a2db9..37279a2027ae 100644
--- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
+++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,6 +1,6 @@
---- ui/base/webui/web_ui_util.cc.orig 2022-05-19 14:06:27 UTC
+--- ui/base/webui/web_ui_util.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/base/webui/web_ui_util.cc
-@@ -226,7 +226,7 @@ std::string GetFontFamily() {
+@@ -225,7 +225,7 @@ std::string GetFontFamily() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc
new file mode 100644
index 000000000000..5f74cdcc345e
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.cc
@@ -0,0 +1,11 @@
+--- ui/base/x/x11_cursor_factory.cc.orig 2022-08-31 12:19:35 UTC
++++ ui/base/x/x11_cursor_factory.cc
+@@ -56,7 +56,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create
+ }
+
+ void X11CursorFactory::ObserveThemeChanges() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ auto* linux_ui = LinuxUi::instance();
+ DCHECK(linux_ui);
+ cursor_theme_observation_.Observe(linux_ui);
diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__factory.h b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.h
new file mode 100644
index 000000000000..7be12caf40af
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_x_x11__cursor__factory.h
@@ -0,0 +1,20 @@
+--- ui/base/x/x11_cursor_factory.h.orig 2022-08-31 12:19:35 UTC
++++ ui/base/x/x11_cursor_factory.h
+@@ -16,7 +16,7 @@
+ #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h"
+ #include "ui/linux/cursor_theme_manager_observer.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+
+@@ -59,7 +59,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory
+
+ std::map<mojom::CursorType, scoped_refptr<X11Cursor>> default_cursors_;
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::ScopedObservation<LinuxUi,
+ CursorThemeManagerObserver,
+ &LinuxUi::AddCursorThemeObserver,
diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc
index 87c8db6e1496..2e4a19fde0eb 100644
--- a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc
+++ b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc
@@ -1,6 +1,15 @@
---- ui/base/x/x11_cursor_loader.cc.orig 2022-05-19 14:06:27 UTC
+--- ui/base/x/x11_cursor_loader.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/base/x/x11_cursor_loader.cc
-@@ -136,7 +136,11 @@ std::string CursorPathFromLibXcursor() {
+@@ -33,7 +33,7 @@
+ #include "ui/gfx/x/xproto.h"
+ #include "ui/gfx/x/xproto_util.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+
+@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() {
void operator()(void* ptr) const { dlclose(ptr); }
};
@@ -12,3 +21,21 @@
if (!lib)
return "";
+@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile(
+ const std::string& rm_xcursor_theme) {
+ constexpr const char kDefaultTheme[] = "default";
+ std::string themes[] = {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // The toolkit theme has the highest priority.
+ LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName()
+ : std::string(),
+@@ -444,7 +448,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const
+ if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0)
+ return size;
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Let the toolkit have the next say.
+ auto* linux_ui = LinuxUi::instance();
+ size = linux_ui ? linux_ui->GetCursorThemeSize() : 0;
diff --git a/www/chromium/files/patch-ui_base_x_x11__util.h b/www/chromium/files/patch-ui_base_x_x11__util.h
deleted file mode 100644
index 0d6634107a84..000000000000
--- a/www/chromium/files/patch-ui_base_x_x11__util.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui/base/x/x11_util.h.orig 2022-08-15 13:11:31 UTC
-+++ ui/base/x/x11_util.h
-@@ -337,7 +337,9 @@ COMPONENT_EXPORT(UI_BASE_X) bool IsCompositingManagerP
- COMPONENT_EXPORT(UI_BASE_X) bool IsX11WindowFullScreen(x11::Window window);
-
- // Suspends or resumes the X screen saver, and returns whether the operation was
--// successful. Must be called on the UI thread.
-+// successful. Must be called on the UI thread. If called multiple times with
-+// |suspend| set to true, the screen saver is not un-suspended until this method
-+// is called an equal number of times with |suspend| set to false.
- COMPONENT_EXPORT(UI_BASE_X) bool SuspendX11ScreenSaver(bool suspend);
-
- // Returns true if the window manager supports the given hint.
diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h
index 3e982fd3bd14..ced7b4ba0bee 100644
--- a/www/chromium/files/patch-ui_color_color__id.h
+++ b/www/chromium/files/patch-ui_color_color__id.h
@@ -1,6 +1,6 @@
---- ui/color/color_id.h.orig 2022-07-22 17:30:31 UTC
+--- ui/color/color_id.h.orig 2022-08-31 12:19:35 UTC
+++ ui/color/color_id.h
-@@ -209,7 +209,7 @@
+@@ -238,7 +238,7 @@
E_CPONLY(kColorNativeColor6) \
E_CPONLY(kColorNativeBaseColor) \
E_CPONLY(kColorNativeSecondaryColor)
diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc
index 037ec1f60f9b..8eb37d0ce037 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.cc
+++ b/www/chromium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig 2022-06-17 14:20:10 UTC
+--- ui/compositor/compositor.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/compositor/compositor.cc
-@@ -857,7 +857,7 @@ void Compositor::OnResume() {
+@@ -850,7 +850,7 @@ void Compositor::OnResume() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h
index b1c58b9246b6..0df1df33f9ea 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.h
+++ b/www/chromium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig 2022-06-17 14:20:10 UTC
+--- ui/compositor/compositor.h.orig 2022-08-31 12:19:35 UTC
+++ ui/compositor/compositor.h
-@@ -411,7 +411,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -414,7 +414,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-ui_display_screen.cc b/www/chromium/files/patch-ui_display_screen.cc
index ef832b6d1b8f..c8c3aaee115d 100644
--- a/www/chromium/files/patch-ui_display_screen.cc
+++ b/www/chromium/files/patch-ui_display_screen.cc
@@ -1,34 +1,11 @@
---- ui/display/screen.cc.orig 2022-08-15 13:11:31 UTC
+--- ui/display/screen.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/display/screen.cc
-@@ -84,27 +84,12 @@ void Screen::SetDisplayForNewWindows(int64_t display_i
+@@ -84,7 +84,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i
display_id_for_new_windows_ = display_id;
}
-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
--std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() {
-- SetScreenSaverSuspended(true);
-- screen_saver_suspension_count_++;
-- return base::WrapUnique(new Screen::ScreenSaverSuspender(this));
--}
+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-+Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default;
-
--Screen::ScreenSaverSuspender::~ScreenSaverSuspender() {
-- // Check that this suspender still refers to the active screen. Particularly
-- // in tests, the screen might be destructed before the suspender.
-- if (screen_ == GetScreen()) {
-- screen_->screen_saver_suspension_count_--;
-- if (screen_->screen_saver_suspension_count_ == 0) {
-- screen_->SetScreenSaverSuspended(false);
-- }
-- }
--}
--
--bool Screen::SetScreenSaverSuspended(bool suspend) {
-+std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() {
- NOTIMPLEMENTED_LOG_ONCE();
-- return false;
-+ return nullptr;
- }
- #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+ Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default;
+ std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() {
diff --git a/www/chromium/files/patch-ui_display_screen.h b/www/chromium/files/patch-ui_display_screen.h
index 7156108d309d..9afb7829a325 100644
--- a/www/chromium/files/patch-ui_display_screen.h
+++ b/www/chromium/files/patch-ui_display_screen.h
@@ -1,6 +1,6 @@
---- ui/display/screen.h.orig 2022-08-15 13:11:31 UTC
+--- ui/display/screen.h.orig 2022-08-31 12:19:35 UTC
+++ ui/display/screen.h
-@@ -128,33 +128,27 @@ class DISPLAY_EXPORT Screen {
+@@ -129,7 +129,7 @@ class DISPLAY_EXPORT Screen {
// (both of which may or may not be `nearest_id`).
display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const;
@@ -9,57 +9,7 @@
// Object which suspends the platform-specific screensaver for the duration of
// its existence.
class ScreenSaverSuspender {
- public:
-- ScreenSaverSuspender(const Screen&) = delete;
-- ScreenSaverSuspender& operator=(const Screen&) = delete;
-+ ScreenSaverSuspender() = default;
-
-- // Notifies |screen_| that this instance is being destructed, and causes its
-- // platform-specific screensaver to be un-suspended if this is the last such
-- // remaining instance.
-- ~ScreenSaverSuspender();
-+ ScreenSaverSuspender(const ScreenSaverSuspender&) = delete;
-+ ScreenSaverSuspender& operator=(const ScreenSaverSuspender&) = delete;
-
-- private:
-- friend class Screen;
--
-- explicit ScreenSaverSuspender(Screen* screen) : screen_(screen) {}
--
-- Screen* screen_;
-+ // Causes the platform-specific screensaver to be un-suspended iff this is
-+ // the last remaining instance.
-+ virtual ~ScreenSaverSuspender() = 0;
- };
-
- // Suspends the platform-specific screensaver until the returned
-- // |ScreenSaverSuspender| is destructed. This method allows stacking multiple
-- // overlapping calls, such that the platform-specific screensaver will not be
-- // un-suspended until all returned |SreenSaverSuspender| instances have been
-- // destructed.
-- std::unique_ptr<ScreenSaverSuspender> SuspendScreenSaver();
-+ // |ScreenSaverSuspender| is destructed, or returns nullptr if suspension
-+ // failed. This method allows stacking multiple overlapping calls, such that
-+ // the platform-specific screensaver will not be un-suspended until all
-+ // returned |ScreenSaverSuspender| instances have been destructed.
-+ virtual std::unique_ptr<ScreenSaverSuspender> SuspendScreenSaver();
- #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-
- // Returns whether the screensaver is currently running.
-@@ -200,12 +194,6 @@ class DISPLAY_EXPORT Screen {
- const gfx::GpuExtraInfo& gpu_extra_info);
-
- protected:
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-- // Suspends or un-suspends the platform-specific screensaver, and returns
-- // whether the operation was successful.
-- virtual bool SetScreenSaverSuspended(bool suspend);
--#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
--
- void set_shutdown(bool shutdown) { shutdown_ = shutdown; }
-
- private:
-@@ -224,7 +212,7 @@ class DISPLAY_EXPORT Screen {
+@@ -213,7 +213,7 @@ class DISPLAY_EXPORT Screen {
int64_t display_id_for_new_windows_;
int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId;
diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index 48a8b74d0fff..774a4f24f059 100644
--- a/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+--- ui/gfx/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ ui/gfx/BUILD.gn
-@@ -586,7 +586,7 @@ source_set("memory_buffer_sources") {
+@@ -587,7 +587,7 @@ source_set("memory_buffer_sources") {
deps += [ "//build/config/linux/libdrm" ]
}
diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
index 517205abf2d5..4a89e4d97c8c 100644
--- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
+++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
@@ -1,6 +1,6 @@
---- ui/gfx/font_fallback_linux.cc.orig 2022-03-25 21:59:56 UTC
+--- ui/gfx/font_fallback_linux.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/gfx/font_fallback_linux.cc
-@@ -25,6 +25,8 @@
+@@ -26,6 +26,8 @@
#include "ui/gfx/linux/fontconfig_util.h"
#include "ui/gfx/platform_font.h"
diff --git a/www/chromium/files/patch-ui_gfx_font__render__params__linux.cc b/www/chromium/files/patch-ui_gfx_font__render__params__linux.cc
new file mode 100644
index 000000000000..0872a6a03fcf
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_font__render__params__linux.cc
@@ -0,0 +1,20 @@
+--- ui/gfx/font_render_params_linux.cc.orig 2022-08-31 12:19:35 UTC
++++ ui/gfx/font_render_params_linux.cc
+@@ -25,7 +25,7 @@
+ #include "ui/gfx/linux/fontconfig_util.h"
+ #include "ui/gfx/switches.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+
+@@ -212,7 +212,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP
+
+ // Start with the delegate's settings, but let Fontconfig have the final say.
+ FontRenderParams params;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (const auto* linux_ui = ui::LinuxUi::instance())
+ params = linux_ui->GetDefaultFontRenderParams();
+ #endif
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
index 2d4b542ed95d..607274805c3f 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h
@@ -1,15 +1,15 @@
---- ui/gfx/gpu_memory_buffer.h.orig 2022-03-25 21:59:56 UTC
+--- ui/gfx/gpu_memory_buffer.h.orig 2022-08-31 12:19:35 UTC
+++ ui/gfx/gpu_memory_buffer.h
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
+ #include "ui/gfx/geometry/rect.h"
#include "ui/gfx/gfx_export.h"
- #include "ui/gfx/hdr_metadata.h"
-#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "ui/gfx/native_pixmap_handle.h"
#elif BUILDFLAG(IS_MAC)
#include "ui/gfx/mac/io_surface.h"
-@@ -78,7 +78,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
+@@ -77,7 +77,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle {
base::UnsafeSharedMemoryRegion region;
uint32_t offset = 0;
int32_t stride = 0;
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
index e75407e9a750..fdc5224b5fc5 100644
--- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
+++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-02-28 16:54:41 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/gfx/mojom/native_handle_types_mojom_traits.cc
@@ -8,11 +8,11 @@
@@ -30,5 +30,5 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
out->modifier = data.modifier();
- #endif
-
+ out->supports_zero_copy_webgpu_import =
+ data.supports_zero_copy_webgpu_import();
diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
index fe71a756be38..6fa6622da132 100644
--- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
+++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h
@@ -1,4 +1,4 @@
---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-02-28 16:54:41 UTC
+--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-08-31 12:19:35 UTC
+++ ui/gfx/mojom/native_handle_types_mojom_traits.h
@@ -15,7 +15,7 @@
#include "third_party/abseil-cpp/absl/types/optional.h"
@@ -18,7 +18,7 @@
template <>
struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS)
StructTraits<gfx::mojom::NativePixmapPlaneDataView,
-@@ -53,7 +53,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED
+@@ -53,13 +53,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED
return pixmap_handle.planes;
}
@@ -27,3 +27,10 @@
static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) {
return pixmap_handle.modifier;
}
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ static bool supports_zero_copy_webgpu_import(
+ const gfx::NativePixmapHandle& pixmap_handle) {
+ return pixmap_handle.supports_zero_copy_webgpu_import;
diff --git a/www/chromium/files/patch-ui_gfx_platform__font__skia.cc b/www/chromium/files/patch-ui_gfx_platform__font__skia.cc
new file mode 100644
index 000000000000..e3bf6aef9f86
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_platform__font__skia.cc
@@ -0,0 +1,20 @@
+--- ui/gfx/platform_font_skia.cc.orig 2022-08-31 12:19:35 UTC
++++ ui/gfx/platform_font_skia.cc
+@@ -28,7 +28,7 @@
+ #include "ui/gfx/system_fonts_win.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+
+@@ -166,7 +166,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized
+ weight = system_font.GetWeight();
+ #endif // BUILDFLAG(IS_WIN)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // On Linux, LinuxUi is used to query the native toolkit (e.g.
+ // GTK) for the default UI font.
+ if (const auto* linux_ui = ui::LinuxUi::instance()) {
diff --git a/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc b/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc
index 8b5c016b028e..ae9ccd8bf707 100644
--- a/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc
+++ b/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc
@@ -1,29 +1,20 @@
---- ui/gfx/render_text_api_fuzzer.cc.orig 2022-02-28 16:54:41 UTC
+--- ui/gfx/render_text_api_fuzzer.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/gfx/render_text_api_fuzzer.cc
-@@ -21,7 +21,7 @@
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_ANDROID) || \
-- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- #include "base/test/test_discardable_memory_allocator.h"
- #endif
+@@ -20,7 +20,7 @@
+ #include "ui/gfx/font_util.h"
+ #include "ui/gfx/render_text.h"
-@@ -44,7 +44,7 @@ struct Environment {
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_ANDROID) || \
-- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- // Some platforms require discardable memory to use bitmap fonts.
- base::DiscardableMemoryAllocator::SetInstance(
- &discardable_memory_allocator);
-@@ -56,7 +56,7 @@ struct Environment {
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_ANDROID) || \
-- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- base::TestDiscardableMemoryAllocator discardable_memory_allocator;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
#endif
+@@ -47,7 +47,7 @@ struct Environment {
+
+ CHECK(base::i18n::InitializeICU());
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ test_fonts::SetUpFontconfig();
+ #endif
+ gfx::InitializeFonts();
diff --git a/www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc b/www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc
new file mode 100644
index 000000000000..ca6343b440e5
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc
@@ -0,0 +1,20 @@
+--- ui/gfx/render_text_fuzzer.cc.orig 2022-08-31 12:19:35 UTC
++++ ui/gfx/render_text_fuzzer.cc
+@@ -14,7 +14,7 @@
+ #include "ui/gfx/font_util.h"
+ #include "ui/gfx/render_text.h"
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
+ #endif
+
+@@ -37,7 +37,7 @@ struct Environment {
+
+ CHECK(base::i18n::InitializeICU());
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ test_fonts::SetUpFontconfig();
+ #endif
+ gfx::InitializeFonts();
diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py
index 6ceaa0b651f5..150dcfdbfe8a 100644
--- a/www/chromium/files/patch-ui_gl_generate__bindings.py
+++ b/www/chromium/files/patch-ui_gl_generate__bindings.py
@@ -1,6 +1,6 @@
---- ui/gl/generate_bindings.py.orig 2022-07-22 17:30:31 UTC
+--- ui/gl/generate_bindings.py.orig 2022-08-31 12:19:35 UTC
+++ ui/gl/generate_bindings.py
-@@ -2925,6 +2925,9 @@ GLX_FUNCTIONS = [
+@@ -2932,6 +2932,9 @@ GLX_FUNCTIONS = [
'arguments':
'Display* dpy, GLXDrawable drawable, int32_t* numerator, '
'int32_t* denominator' },
diff --git a/www/chromium/files/patch-ui_gl_gl__context.cc b/www/chromium/files/patch-ui_gl_gl__context.cc
index aadfb35988c7..e6f3d89c4277 100644
--- a/www/chromium/files/patch-ui_gl_gl__context.cc
+++ b/www/chromium/files/patch-ui_gl_gl__context.cc
@@ -1,6 +1,6 @@
---- ui/gl/gl_context.cc.orig 2022-05-19 14:06:27 UTC
+--- ui/gl/gl_context.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/gl/gl_context.cc
-@@ -415,7 +415,7 @@ bool GLContext::MakeVirtuallyCurrent(
+@@ -419,7 +419,7 @@ bool GLContext::MakeVirtuallyCurrent(
DCHECK(virtual_context->IsCurrent(surface));
if (switched_real_contexts || virtual_context != current_virtual_context_) {
diff --git a/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc b/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc
index 474c9f51caa8..6e462c3487b3 100644
--- a/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc
+++ b/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc
@@ -1,11 +1,11 @@
---- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-06-17 14:20:10 UTC
+--- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/gl/gl_image_glx_native_pixmap.cc
-@@ -17,6 +17,8 @@
+@@ -12,6 +12,8 @@
#include "ui/gl/buffer_format_utils.h"
- #include "ui/gl/gl_bindings.h"
+ #include "ui/gl/glx_util.h"
+#include <unistd.h>
+
namespace gl {
- namespace {
+ GLImageGLXNativePixmap::GLImageGLXNativePixmap(const gfx::Size& size,
diff --git a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
index 3e044fa349a0..a30f51fb7ac3 100644
--- a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
+++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
@@ -1,6 +1,6 @@
---- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-06-17 14:20:10 UTC
+--- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/gtk/printing/print_dialog_gtk.cc
-@@ -397,7 +397,7 @@ void PrintDialogGtk::ShowDialog(
+@@ -398,7 +398,7 @@ void PrintDialogGtk::ShowDialog(
GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc
index 44db7756adce..564226c11a10 100644
--- a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc
@@ -1,20 +1,20 @@
---- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2022-07-22 17:30:31 UTC
+--- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/ozone/platform/headless/headless_surface_factory.cc
@@ -34,7 +34,7 @@
#include "ui/ozone/platform/headless/headless_window_manager.h"
#include "ui/ozone/public/surface_ozone_canvas.h"
--#if BUILDFLAG(ENABLE_VULKAN) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+-#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA))
++#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
#include "ui/ozone/platform/headless/vulkan_implementation_headless.h"
#endif
-@@ -274,7 +274,7 @@ void HeadlessSurfaceFactory::CheckBasePath() const {
- PLOG(FATAL) << "Unable to write to output location";
- }
-
--#if BUILDFLAG(ENABLE_VULKAN) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- std::unique_ptr<gpu::VulkanImplementation>
+@@ -279,7 +279,7 @@ std::unique_ptr<gpu::VulkanImplementation>
HeadlessSurfaceFactory::CreateVulkanImplementation(
bool use_swiftshader,
+ bool allow_protected_memory) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ return std::make_unique<VulkanImplementationHeadless>(use_swiftshader);
+ #else
+ return nullptr;
diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.h b/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.h
deleted file mode 100644
index d23223b8fd14..000000000000
--- a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/ozone/platform/headless/headless_surface_factory.h.orig 2022-04-21 18:48:31 UTC
-+++ ui/ozone/platform/headless/headless_surface_factory.h
-@@ -26,7 +26,7 @@ class HeadlessSurfaceFactory : public SurfaceFactoryOz
- // SurfaceFactoryOzone:
- std::vector<gl::GLImplementationParts> GetAllowedGLImplementations() override;
- GLOzone* GetGLOzone(const gl::GLImplementationParts& implementation) override;
--#if BUILDFLAG(ENABLE_VULKAN) && BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
- std::unique_ptr<gpu::VulkanImplementation> CreateVulkanImplementation(
- bool use_swiftshader,
- bool allow_protected_memory) override;
diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
new file mode 100644
index 000000000000..398c47af5d3a
--- /dev/null
+++ b/www/chromium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc
@@ -0,0 +1,11 @@
+--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2022-08-31 12:19:35 UTC
++++ ui/ozone/platform/headless/vulkan_implementation_headless.cc
+@@ -154,7 +154,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory
+ VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
+ VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+ auto tiling = VK_IMAGE_TILING_OPTIMAL;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (gmb_handle.native_pixmap_handle.modifier !=
+ gfx::NativePixmapHandle::kNoModifier) {
+ tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT;
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc
deleted file mode 100644
index 89b58cdfc90b..000000000000
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc
+++ /dev/null
@@ -1,40 +0,0 @@
---- ui/ozone/platform/wayland/host/wayland_screen.cc.orig 2022-08-15 13:11:31 UTC
-+++ ui/ozone/platform/wayland/host/wayland_screen.cc
-@@ -327,6 +327,37 @@ display::Display WaylandScreen::GetDisplayMatching(
- return display_matching ? *display_matching : GetPrimaryDisplay();
- }
-
-+std::unique_ptr<WaylandScreen::WaylandScreenSaverSuspender>
-+WaylandScreen::WaylandScreenSaverSuspender::Create(WaylandScreen& screen) {
-+ auto suspender = base::WrapUnique(new WaylandScreenSaverSuspender(screen));
-+ if (suspender->is_suspending_) {
-+ screen.screen_saver_suspension_count_++;
-+ return suspender;
-+ }
-+
-+ return nullptr;
-+}
-+
-+WaylandScreen::WaylandScreenSaverSuspender::WaylandScreenSaverSuspender(
-+ WaylandScreen& screen)
-+ : screen_(screen.GetWeakPtr()) {
-+ is_suspending_ = screen.SetScreenSaverSuspended(true);
-+}
-+
-+WaylandScreen::WaylandScreenSaverSuspender::~WaylandScreenSaverSuspender() {
-+ if (screen_ && is_suspending_) {
-+ screen_->screen_saver_suspension_count_--;
-+ if (screen_->screen_saver_suspension_count_ == 0) {
-+ screen_->SetScreenSaverSuspended(false);
-+ }
-+ }
-+}
-+
-+std::unique_ptr<PlatformScreen::PlatformScreenSaverSuspender>
-+WaylandScreen::SuspendScreenSaver() {
-+ return WaylandScreenSaverSuspender::Create(*this);
-+}
-+
- bool WaylandScreen::SetScreenSaverSuspended(bool suspend) {
- if (!connection_->zwp_idle_inhibit_manager())
- return false;
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h
deleted file mode 100644
index e4d48c6286c0..000000000000
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h
+++ /dev/null
@@ -1,54 +0,0 @@
---- ui/ozone/platform/wayland/host/wayland_screen.h.orig 2022-08-15 13:11:31 UTC
-+++ ui/ozone/platform/wayland/host/wayland_screen.h
-@@ -68,7 +68,8 @@ class WaylandScreen : public PlatformScreen {
- const gfx::Point& point) const override;
- display::Display GetDisplayMatching(
- const gfx::Rect& match_rect) const override;
-- bool SetScreenSaverSuspended(bool suspend) override;
-+ std::unique_ptr<PlatformScreen::PlatformScreenSaverSuspender>
-+ SuspendScreenSaver() override;
- bool IsScreenSaverActive() const override;
- base::TimeDelta CalculateIdleTime() const override;
- void AddObserver(display::DisplayObserver* observer) override;
-@@ -76,7 +77,33 @@ class WaylandScreen : public PlatformScreen {
- std::vector<base::Value> GetGpuExtraInfo(
- const gfx::GpuExtraInfo& gpu_extra_info) override;
-
-+ protected:
-+ // Suspends or un-suspends the platform-specific screensaver, and returns
-+ // whether the operation was successful. Can be called more than once with the
-+ // same value for |suspend|, but those states should not stack: the first
-+ // alternating value should toggle the state of the suspend.
-+ bool SetScreenSaverSuspended(bool suspend);
-+
- private:
-+ class WaylandScreenSaverSuspender
-+ : public PlatformScreen::PlatformScreenSaverSuspender {
-+ public:
-+ WaylandScreenSaverSuspender(const WaylandScreenSaverSuspender&) = delete;
-+ WaylandScreenSaverSuspender& operator=(const WaylandScreenSaverSuspender&) =
-+ delete;
-+
-+ ~WaylandScreenSaverSuspender() override;
-+
-+ static std::unique_ptr<WaylandScreenSaverSuspender> Create(
-+ WaylandScreen& screen);
-+
-+ private:
-+ explicit WaylandScreenSaverSuspender(WaylandScreen& screen);
-+
-+ base::WeakPtr<WaylandScreen> screen_;
-+ bool is_suspending_ = false;
-+ };
-+
- // All parameters are in DIP screen coordinates/units except |physical_size|,
- // which is in physical pixels.
- void AddOrUpdateDisplay(uint32_t output_id,
-@@ -103,6 +130,7 @@ class WaylandScreen : public PlatformScreen {
- #endif
-
- wl::Object<zwp_idle_inhibitor_v1> idle_inhibitor_;
-+ uint32_t screen_saver_suspension_count_ = 0;
-
- base::WeakPtrFactory<WaylandScreen> weak_factory_;
- };
diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
index d5e641ddfc08..d30376651450 100644
--- a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-02-28 16:54:41 UTC
+--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/ozone/platform/x11/ozone_platform_x11.cc
-@@ -204,7 +204,7 @@ class OzonePlatformX11 : public OzonePlatform,
+@@ -197,7 +197,7 @@ class OzonePlatformX11 : public OzonePlatform,
properties->supports_global_application_menus = true;
properties->app_modal_dialogs_use_event_blocker = true;
properties->fetch_buffer_formats_for_gmb_on_gpu = true;
diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
deleted file mode 100644
index a3fcbadc62c7..000000000000
--- a/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc
+++ /dev/null
@@ -1,43 +0,0 @@
---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2022-08-15 13:11:31 UTC
-+++ ui/ozone/platform/x11/x11_screen_ozone.cc
-@@ -4,6 +4,8 @@
-
- #include "ui/ozone/platform/x11/x11_screen_ozone.h"
-
-+#include <memory>
-+
- #include "base/containers/flat_set.h"
- #include "ui/base/linux/linux_desktop.h"
- #include "ui/base/x/x11_idle_query.h"
-@@ -135,8 +137,29 @@ display::Display X11ScreenOzone::GetDisplayMatching(
- return matching_display ? *matching_display : GetPrimaryDisplay();
- }
-
--bool X11ScreenOzone::SetScreenSaverSuspended(bool suspend) {
-- return SuspendX11ScreenSaver(suspend);
-+X11ScreenOzone::X11ScreenSaverSuspender::X11ScreenSaverSuspender() {
-+ is_suspending_ = SuspendX11ScreenSaver(true);
-+}
-+
-+std::unique_ptr<X11ScreenOzone::X11ScreenSaverSuspender>
-+X11ScreenOzone::X11ScreenSaverSuspender::Create() {
-+ auto suspender = base::WrapUnique(new X11ScreenSaverSuspender());
-+ if (suspender->is_suspending_) {
-+ return suspender;
-+ }
-+
-+ return nullptr;
-+}
-+
-+X11ScreenOzone::X11ScreenSaverSuspender::~X11ScreenSaverSuspender() {
-+ if (is_suspending_) {
-+ SuspendX11ScreenSaver(false);
-+ }
-+}
-+
-+std::unique_ptr<PlatformScreen::PlatformScreenSaverSuspender>
-+X11ScreenOzone::SuspendScreenSaver() {
-+ return X11ScreenSaverSuspender::Create();
- }
-
- bool X11ScreenOzone::IsScreenSaverActive() const {
diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h
deleted file mode 100644
index 20d4e6641f98..000000000000
--- a/www/chromium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2022-08-15 13:11:31 UTC
-+++ ui/ozone/platform/x11/x11_screen_ozone.h
-@@ -50,7 +50,8 @@ class X11ScreenOzone : public PlatformScreen,
- const gfx::Point& point) const override;
- display::Display GetDisplayMatching(
- const gfx::Rect& match_rect) const override;
-- bool SetScreenSaverSuspended(bool suspend) override;
-+ std::unique_ptr<PlatformScreen::PlatformScreenSaverSuspender>
-+ SuspendScreenSaver() override;
- bool IsScreenSaverActive() const override;
- base::TimeDelta CalculateIdleTime() const override;
- void AddObserver(display::DisplayObserver* observer) override;
-@@ -65,6 +66,22 @@ class X11ScreenOzone : public PlatformScreen,
-
- private:
- friend class X11ScreenOzoneTest;
-+
-+ class X11ScreenSaverSuspender
-+ : public PlatformScreen::PlatformScreenSaverSuspender {
-+ public:
-+ X11ScreenSaverSuspender(const X11ScreenSaverSuspender&) = delete;
-+ X11ScreenSaverSuspender& operator=(const X11ScreenSaverSuspender&) = delete;
-+
-+ ~X11ScreenSaverSuspender() override;
-+
-+ static std::unique_ptr<X11ScreenSaverSuspender> Create();
-+
-+ private:
-+ X11ScreenSaverSuspender();
-+
-+ bool is_suspending_ = false;
-+ };
-
- // Overridden from ui::XDisplayManager::Delegate:
- void OnXDisplayListUpdated() override;
diff --git a/www/chromium/files/patch-ui_ozone_public_platform__screen.cc b/www/chromium/files/patch-ui_ozone_public_platform__screen.cc
deleted file mode 100644
index 4c44f74009a2..000000000000
--- a/www/chromium/files/patch-ui_ozone_public_platform__screen.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- ui/ozone/public/platform_screen.cc.orig 2022-08-15 13:11:31 UTC
-+++ ui/ozone/public/platform_screen.cc
-@@ -30,9 +30,13 @@ std::string PlatformScreen::GetCurrentWorkspace() {
- return {};
- }
-
--bool PlatformScreen::SetScreenSaverSuspended(bool suspend) {
-+PlatformScreen::PlatformScreenSaverSuspender::~PlatformScreenSaverSuspender() =
-+ default;
-+
-+std::unique_ptr<PlatformScreen::PlatformScreenSaverSuspender>
-+PlatformScreen::SuspendScreenSaver() {
- NOTIMPLEMENTED_LOG_ONCE();
-- return false;
-+ return nullptr;
- }
-
- bool PlatformScreen::IsScreenSaverActive() const {
diff --git a/www/chromium/files/patch-ui_ozone_public_platform__screen.h b/www/chromium/files/patch-ui_ozone_public_platform__screen.h
deleted file mode 100644
index 072b90d5de2c..000000000000
--- a/www/chromium/files/patch-ui_ozone_public_platform__screen.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- ui/ozone/public/platform_screen.h.orig 2022-08-15 13:11:31 UTC
-+++ ui/ozone/public/platform_screen.h
-@@ -89,11 +89,27 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen {
- virtual display::Display GetDisplayMatching(
- const gfx::Rect& match_rect) const = 0;
-
-- // Suspends or un-suspends the platform-specific screensaver, and returns
-- // whether the operation was successful. Can be called more than once with the
-- // same value for |suspend|, but those states should not stack: the first
-- // alternating value should toggle the state of the suspend.
-- virtual bool SetScreenSaverSuspended(bool suspend);
-+ // Object which suspends the platform-specific screensaver for the duration of
-+ // its existence.
-+ class PlatformScreenSaverSuspender {
-+ public:
-+ PlatformScreenSaverSuspender() = default;
-+
-+ PlatformScreenSaverSuspender(const PlatformScreenSaverSuspender&) = delete;
-+ PlatformScreenSaverSuspender& operator=(
-+ const PlatformScreenSaverSuspender&) = delete;
-+
-+ // Causes the platform-specific screensaver to be un-suspended iff this is
-+ // the last remaining instance.
-+ virtual ~PlatformScreenSaverSuspender() = 0;
-+ };
-+
-+ // Suspends the platform-specific screensaver until the returned
-+ // |PlatformScreenSaverSuspender| is destructed, or returns nullptr if
-+ // suspension failed. This method allows stacking multiple overlapping calls,
-+ // such that the platform-specific screensaver will not be un-suspended until
-+ // all returned |PlatformScreenSaverSuspender| instances have been destructed.
-+ virtual std::unique_ptr<PlatformScreenSaverSuspender> SuspendScreenSaver();
-
- // Returns whether the screensaver is currently running.
- virtual bool IsScreenSaverActive() const;
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
index c47a5d6c20e5..b21e3c4fbbd8 100644
--- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
+++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,4 +1,4 @@
---- ui/platform_window/platform_window_init_properties.h.orig 2022-04-21 18:48:31 UTC
+--- ui/platform_window/platform_window_init_properties.h.orig 2022-08-31 12:19:35 UTC
+++ ui/platform_window/platform_window_init_properties.h
@@ -54,7 +54,7 @@ class WorkspaceExtensionDelegate;
class ScenicWindowDelegate;
@@ -9,12 +9,12 @@
class X11ExtensionDelegate;
#endif
-@@ -114,7 +114,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
+@@ -115,7 +115,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo
PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
bool prefer_dark_theme = false;
- gfx::ImageSkia* icon = nullptr;
+ raw_ptr<gfx::ImageSkia> icon = nullptr;
absl::optional<int> background_color;
diff --git a/www/chromium/files/patch-ui_views_controls_prefix__selector.cc b/www/chromium/files/patch-ui_views_controls_prefix__selector.cc
index c222ad18ed27..ea7e50a73daf 100644
--- a/www/chromium/files/patch-ui_views_controls_prefix__selector.cc
+++ b/www/chromium/files/patch-ui_views_controls_prefix__selector.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/prefix_selector.cc.orig 2022-02-28 16:54:41 UTC
+--- ui/views/controls/prefix_selector.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/views/controls/prefix_selector.cc
-@@ -171,7 +171,7 @@ bool PrefixSelector::ShouldDoLearning() {
+@@ -173,7 +173,7 @@ bool PrefixSelector::ShouldDoLearning() {
return false;
}
diff --git a/www/chromium/files/patch-ui_views_controls_prefix__selector.h b/www/chromium/files/patch-ui_views_controls_prefix__selector.h
index e8836e693954..d272917a0ffd 100644
--- a/www/chromium/files/patch-ui_views_controls_prefix__selector.h
+++ b/www/chromium/files/patch-ui_views_controls_prefix__selector.h
@@ -1,6 +1,6 @@
---- ui/views/controls/prefix_selector.h.orig 2022-02-28 16:54:41 UTC
+--- ui/views/controls/prefix_selector.h.orig 2022-08-31 12:19:35 UTC
+++ ui/views/controls/prefix_selector.h
-@@ -81,7 +81,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp
+@@ -83,7 +83,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
index c9e7bb2a3e80..792fd375337e 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,15 +1,15 @@
---- ui/views/controls/textfield/textfield.cc.orig 2022-07-22 17:30:31 UTC
+--- ui/views/controls/textfield/textfield.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/views/controls/textfield/textfield.cc
-@@ -72,7 +72,7 @@
+@@ -70,7 +70,7 @@
+ #include "base/win/win_util.h"
+ #endif
- // 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)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
- #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
+ #include "ui/linux/linux_ui.h"
#endif
-@@ -165,7 +165,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -163,7 +163,7 @@ bool IsControlKeyModifier(int flags) {
// Control-modified key combination, but we cannot extend it to other platforms
// as Control has different meanings and behaviors.
// https://crrev.com/2580483002/#msg46
@@ -18,25 +18,25 @@
return flags & ui::EF_CONTROL_DOWN;
#else
return false;
-@@ -719,7 +719,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+ if (!textfield)
+ return handled;
- // 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)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
- ui::GetTextEditKeyBindingsDelegate();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ auto* linux_ui = ui::LinuxUi::instance();
std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -865,7 +865,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+ if (!handled && linux_ui &&
+@@ -850,7 +850,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+ }
+
bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
- // 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)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Skip any accelerator handling that conflicts with custom keybindings.
- ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
- ui::GetTextEditKeyBindingsDelegate();
-@@ -1727,7 +1727,7 @@ bool Textfield::ShouldDoLearning() {
+ auto* linux_ui = ui::LinuxUi::instance();
+ std::vector<ui::TextEditCommandAuraLinux> commands;
+@@ -1718,7 +1718,7 @@ bool Textfield::ShouldDoLearning() {
return false;
}
@@ -45,7 +45,7 @@
// TODO(https://crbug.com/952355): Implement this method to support Korean IME
// reconversion feature on native text fields (e.g. find bar).
bool Textfield::SetCompositionFromExistingText(
-@@ -2226,14 +2226,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2217,14 +2217,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
#endif
return ui::TextEditCommand::DELETE_BACKWARD;
}
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h
index b1d4bb997fc4..35a53deaa25a 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h
@@ -1,6 +1,15 @@
---- ui/views/controls/textfield/textfield.h.orig 2022-03-25 21:59:56 UTC
+--- ui/views/controls/textfield/textfield.h.orig 2022-08-31 12:19:35 UTC
+++ ui/views/controls/textfield/textfield.h
-@@ -443,7 +443,7 @@ class VIEWS_EXPORT Textfield : public View,
+@@ -42,7 +42,7 @@
+ #include "ui/views/view.h"
+ #include "ui/views/word_lookup_client.h"
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <vector>
+ #endif
+
+@@ -447,7 +447,7 @@ class VIEWS_EXPORT Textfield : public View,
// Set whether the text should be used to improve typing suggestions.
void SetShouldDoLearning(bool value) { should_do_learning_ = value; }
diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
index 2cf4c056be35..99319733b80c 100644
--- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc
+++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
@@ -1,6 +1,6 @@
---- ui/views/focus/focus_manager.cc.orig 2022-05-19 14:06:27 UTC
+--- ui/views/focus/focus_manager.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/views/focus/focus_manager.cc
-@@ -635,7 +635,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -629,7 +629,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// Processing an accelerator can delete things. Because we
// need these objects afterwards on Linux, save widget_ as weak pointer and
// save the close_on_deactivate property value of widget_delegate in a
-@@ -652,7 +652,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -646,7 +646,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc b/www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc
deleted file mode 100644
index 3442829c98bf..000000000000
--- a/www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/linux_ui/linux_ui.cc.orig 2022-07-22 17:30:31 UTC
-+++ ui/views/linux_ui/linux_ui.cc
-@@ -27,7 +27,7 @@ void LinuxUI::SetInstance(std::unique_ptr<LinuxUI> ins
- g_linux_ui = instance.release();
-
- SkiaFontDelegate::SetInstance(g_linux_ui);
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
- ShellDialogLinux::SetInstance(g_linux_ui);
- #endif
- ui::SetTextEditKeyBindingsDelegate(g_linux_ui);
diff --git a/www/chromium/files/patch-ui_views_linux__ui_linux__ui.h b/www/chromium/files/patch-ui_views_linux__ui_linux__ui.h
deleted file mode 100644
index 4e609161fc1c..000000000000
--- a/www/chromium/files/patch-ui_views_linux__ui_linux__ui.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/views/linux_ui/linux_ui.h.orig 2022-07-22 17:30:31 UTC
-+++ ui/views/linux_ui/linux_ui.h
-@@ -23,7 +23,7 @@
- #include "ui/views/controls/button/button.h"
- #include "ui/views/views_export.h"
-
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
- #include "ui/shell_dialogs/shell_dialog_linux.h"
- #endif
-
-@@ -56,7 +56,7 @@ class WindowFrameProvider;
- // project that wants to do linux desktop native rendering.
- class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
- public gfx::SkiaFontDelegate,
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
- public ui::ShellDialogLinux,
- #endif
- public ui::TextEditKeyBindingsDelegateAuraLinux,
diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc
index 0292c1fd177e..ce5ffd6736db 100644
--- a/www/chromium/files/patch-ui_views_style_platform__style.cc
+++ b/www/chromium/files/patch-ui_views_style_platform__style.cc
@@ -1,5 +1,14 @@
---- ui/views/style/platform_style.cc.orig 2022-07-22 17:30:31 UTC
+--- ui/views/style/platform_style.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/views/style/platform_style.cc
+@@ -17,7 +17,7 @@
+ #include "ui/views/controls/focusable_border.h"
+ #include "ui/views/controls/scrollbar/scroll_bar_views.h"
+
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
+ #endif
+
@@ -52,7 +52,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus
const bool PlatformStyle::kAdjustBubbleIfOffscreen =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
@@ -9,3 +18,12 @@
false;
#else
true;
+@@ -60,7 +60,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen =
+
+ // static
+ std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return std::make_unique<OverlayScrollBar>(is_horizontal);
+ #else
+ return std::make_unique<ScrollBarViews>(is_horizontal);
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
index ca1948b16212..88701f38af4e 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2022-06-17 14:20:10 UTC
+--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2022-08-31 12:19:35 UTC
+++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h
-@@ -67,7 +67,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
+@@ -68,7 +68,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone
// The offset of |drag_widget_| relative to the mouse position.
gfx::Vector2d offset;
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index a3d629327dcf..e1b12db4eb58 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-07-22 17:30:31 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -40,7 +40,7 @@
#include "ui/wm/core/window_util.h"
@@ -9,7 +9,16 @@
#include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
#endif
-@@ -316,7 +316,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -255,7 +255,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
+ if (params.type == Widget::InitParams::TYPE_WINDOW)
+ GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true);
+
+-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+ const bool requires_accelerated_widget = params.requires_accelerated_widget;
+ #else
+ const bool requires_accelerated_widget = false;
+@@ -327,7 +327,7 @@ std::unique_ptr<aura::client::DragDropClient>
DesktopWindowTreeHostPlatform::CreateDragDropClient() {
ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -18,7 +27,7 @@
std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
#else
std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1002,7 +1002,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis
+@@ -1013,7 +1013,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis
// DesktopWindowTreeHost:
// Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc
index 0815c62ca170..aef07eb7d912 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2022-06-17 14:20:10 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
#include "ui/views/widget/widget_delegate.h"
#include "ui/views/window/native_frame_view.h"
diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc
index b144e7cd6ec7..c62bf6b597eb 100644
--- a/www/chromium/files/patch-ui_views_widget_widget.cc
+++ b/www/chromium/files/patch-ui_views_widget_widget.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/widget.cc.orig 2022-06-17 14:20:10 UTC
+--- ui/views/widget/widget.cc.orig 2022-08-31 12:19:35 UTC
+++ ui/views/widget/widget.cc
@@ -48,7 +48,7 @@
#include "ui/views/window/custom_frame_view.h"
@@ -6,7 +6,7 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/views/linux_ui/linux_ui.h"
+ #include "ui/linux/linux_ui.h"
#endif
@@ -1819,7 +1819,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
@@ -15,6 +15,6 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- if (const views::LinuxUI* linux_ui = views::LinuxUI::instance()) {
+ if (const ui::LinuxUi* linux_ui = ui::LinuxUi::instance()) {
if (auto* native_theme = linux_ui->GetNativeTheme(GetNativeWindow()))
return native_theme;
diff --git a/www/chromium/files/patch-ui_views_widget_widget.h b/www/chromium/files/patch-ui_views_widget_widget.h
new file mode 100644
index 000000000000..fa8944be5cc5
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_widget_widget.h
@@ -0,0 +1,11 @@
+--- ui/views/widget/widget.h.orig 2022-08-31 12:19:35 UTC
++++ ui/views/widget/widget.h
+@@ -394,7 +394,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
+ // If set, the widget was created in headless mode.
+ bool headless_mode = false;
+
+-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+ // Indicates whether the desktop native widget is required for the widget.
+ // This may enforce changing the type of the underlying platform window.
+ // See crbug.com/1280332
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index f67794ed6158..e90e0b4f78bf 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,6 +1,6 @@
---- v8/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+--- v8/BUILD.gn.orig 2022-08-31 12:19:35 UTC
+++ v8/BUILD.gn
-@@ -1254,6 +1254,14 @@ config("toolchain") {
+@@ -1277,6 +1277,14 @@ config("toolchain") {
} else if (target_os == "win") {
defines += [ "V8_HAVE_TARGET_OS" ]
defines += [ "V8_TARGET_OS_WIN" ]
@@ -15,7 +15,7 @@
}
# TODO(infra): Support v8_enable_prof on Windows.
-@@ -5348,7 +5356,7 @@ v8_component("v8_libbase") {
+@@ -5406,7 +5414,7 @@ v8_component("v8_libbase") {
}
}
@@ -24,7 +24,7 @@
sources += [
"src/base/debug/stack_trace_posix.cc",
"src/base/platform/platform-linux.cc",
-@@ -5359,6 +5367,18 @@ v8_component("v8_libbase") {
+@@ -5417,6 +5425,18 @@ v8_component("v8_libbase") {
"dl",
"rt",
]
diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc
index 39309be4bac4..aeec77b810cf 100644
--- a/www/chromium/files/patch-v8_src_api_api.cc
+++ b/www/chromium/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
----