diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-06-26 06:11:27 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-06-26 15:34:47 +0000 |
| commit | b313ad21d659165dbf7eda701b81d5bf413ad752 (patch) | |
| tree | 2e5e02a358bbb3e2e4439e7528bf7f5e59caa0db /www/iridium | |
| parent | 78baa842a014c4d586d4ae6ab6586e5bf0494a3c (diff) | |
Diffstat (limited to 'www/iridium')
937 files changed, 7412 insertions, 6247 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 830675b7d917..72df93a08cfb 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,10 +1,15 @@ PORTNAME= iridium -PORTVERSION= 2024.01.120 -PORTREVISION= 1 +PORTVERSION= 2024.06.126.2 +PULSEMV= 16 +PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland -MASTER_SITES= https://downloads.iridiumbrowser.de/source/ +MASTER_SITES= https://downloads.iridiumbrowser.de/source/ \ + https://freedesktop.org/software/pulseaudio/releases/:pulseaudio PKGNAMESUFFIX= -browser + DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + pulseaudio-${PULSEV}.tar.gz:pulseaudio MAINTAINER= chromium@FreeBSD.org COMMENT= Iridium browser @@ -15,15 +20,13 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 -PATCH_SITES= https://nerd.hu/distfiles/ -PATCHFILES+= disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch:-p1 - BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ gperf:devel/gperf \ flock:sysutils/flock \ node:www/node \ + rustc:lang/rust \ xcb-proto>0:x11/xcb-proto \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ @@ -36,8 +39,10 @@ BUILD_DEPENDS= bash:shells/bash \ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ + libasound.so:audio/alsa-lib \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ + libsndio.so:audio/sndio \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ @@ -102,9 +107,9 @@ GN_ARGS+= clang_use_chrome_plugins=false \ chrome_pgo_phase=0 \ enable_backup_ref_ptr_support=false \ enable_hangout_services_extension=true \ + enable_log_error_not_reached=true \ enable_nacl=false \ enable_remoting=false \ - enable_rust=false \ fatal_linker_warnings=false \ icu_use_data_file=false \ is_clang=true \ @@ -113,19 +118,26 @@ GN_ARGS+= clang_use_chrome_plugins=false \ treat_warnings_as_errors=false \ use_allocator_shim=false \ use_aura=true \ - use_custom_libcxx=false \ + use_custom_libcxx=true \ + use_custom_libunwind=true \ use_lld=true \ use_partition_alloc=true \ use_partition_alloc_as_malloc=false \ use_sysroot=false \ use_system_freetype=false \ use_system_harfbuzz=true \ + use_system_libffi=true \ use_system_libjpeg=true \ use_udev=false \ - extra_cxxflags="${CXXFLAGS}" \ + extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \ extra_ldflags="${LDFLAGS}" \ ffmpeg_branding="${FFMPEG_BRAND}" +# Audio backends +GN_ARGS+= use_alsa=true \ + use_pulseaudio=true \ + use_sndio=true + # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles @@ -136,8 +148,6 @@ SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS LTO PIPEWIRE OPTIONS_DEFAULT= CODECS CUPS KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO -OPTIONS_GROUP= AUDIO -OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_SUB= yes @@ -146,12 +156,6 @@ HEIMDAL_BASE_DESC= Heimdal Kerberos (base) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) MIT_DESC= MIT Kerberos (security/krb5) -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ - alsa-lib>=1.1.1_1:audio/alsa-lib -ALSA_VARS= GN_ARGS+=use_alsa=true -ALSA_VARS_OFF= GN_ARGS+=use_alsa=false - CODECS_VARS= GN_ARGS+=proprietary_codecs=true \ FFMPEG_BRAND="Chrome" CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \ @@ -192,18 +196,6 @@ PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ GN_ARGS+=rtc_link_pipewire=false -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true -PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false - -# With SNDIO=on we exclude audio_manager_linux from the build (see -# media/audio/BUILD.gn) and use audio_manager_openbsd which does not -# support falling back to ALSA or PulseAudio. -SNDIO_PREVENTS= ALSA PULSEAUDIO -SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio -SNDIO_VARS= GN_ARGS+=use_sndio=true -SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false - .include <bsd.port.options.mk> .include <bsd.port.pre.mk> # for COMPILER_VERSION @@ -211,8 +203,8 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} != 160 -LLVM_DEFAULT= 16 +.if ${COMPILER_VERSION} < 180 +LLVM_DEFAULT= 18 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ @@ -240,7 +232,7 @@ PLIST_SUB+= NOT_AARCH64="" FFMPEG_TARGET= ia32 .endif -FFMPEG_BDIR= ${WRKSRC}/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND} +FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND} FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET} # Allow relocations against read-only segments (override lld default) @@ -251,6 +243,13 @@ LDFLAGS_i386= -Wl,-znotext MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include +# rust +RUSTC_VERSION!= rustc -V 2>/dev/null || true +MAKE_ENV+= RUSTC_BOOTSTRAP=1 +GN_ARGS+= enable_rust=true \ + rust_sysroot_absolute="${LOCALBASE}" \ + rustc_version="${RUSTC_VERSION}" + pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Iridium, you should have around 2GB of memory" @@ -265,16 +264,17 @@ pre-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \ - libwebp libxml libxslt openh264 opus || ${FALSE} + libusb libwebp libxml libxslt openh264 opus || ${FALSE} # Iridium uses an unreleased version of FFmpeg, so configure it - cd ${WRKSRC}/third_party/ffmpeg && \ - ${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \ + cd ${WRKSRC}/media/ffmpeg && \ + ${PYTHON_CMD} scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \ --config-only --branding=${FFMPEG_BRAND} cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h ${MKDIR} ${FFMPEG_CDIR} .for _e in config.h config.asm config_components.h libavcodec libavformat libavutil -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR} .endfor + touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h do-configure: # GN generator bootstrapping and generating ninja files diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 3055999ba7d9..6afeb3116f56 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1707058354 -SHA256 (iridium-browser-2024.01.120.tar.xz) = 5a6e4f771ab4402ba590bfe5a213664a40d10bc7a1a72670837c755a0ec6e7ef -SIZE (iridium-browser-2024.01.120.tar.xz) = 1755770488 -SHA256 (disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch) = 0565deb50e1206c2fa6d0476474ec9504893fc86b3589467ee2406ad10c915fc -SIZE (disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch) = 3437 +TIMESTAMP = 1719317993 +SHA256 (iridium-browser-2024.06.126.2.tar.xz) = 30ec50b4bf7b64f5f1ebeb3b724bc0ee81ed4e9101fd1f9788210da4145c9d38 +SIZE (iridium-browser-2024.06.126.2.tar.xz) = 2296084036 +SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 +SIZE (pulseaudio-16.1.tar.gz) = 2763111 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index bcaa979b4bfb..49428a52b18e 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ BUILD.gn -@@ -61,7 +61,7 @@ declare_args() { +@@ -65,7 +65,7 @@ declare_args() { root_extra_deps = [] } @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -95,7 +95,6 @@ group("gn_all") { +@@ -97,7 +97,6 @@ group("gn_all") { "//codelabs", "//components:components_unittests", "//components/gwp_asan:gwp_asan_unittests", @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -415,7 +414,7 @@ group("gn_all") { +@@ -428,7 +427,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -615,6 +614,15 @@ group("gn_all") { +@@ -624,6 +623,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms", -@@ -664,7 +672,7 @@ group("gn_all") { +@@ -670,7 +678,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)" ] } -@@ -1085,7 +1093,7 @@ if (use_blink && !is_cronet_build) { +@@ -1090,7 +1098,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1158,7 +1166,7 @@ if (use_blink && !is_cronet_build) { +@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1167,7 +1175,7 @@ if (use_blink && !is_cronet_build) { +@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1632,7 +1640,7 @@ group("chromium_builder_perf") { +@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc index 7250ded06794..6db0437dda9f 100644 --- a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,8 +1,8 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2024-02-04 14:46:08 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2024-06-25 12:08:48 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // TODO(crbug.com/40118868): Revisit 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) diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index 792f67a6822b..46352632be22 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- base/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ base/BUILD.gn -@@ -186,7 +186,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1105,11 +1105,23 @@ component("base") { +@@ -1142,11 +1142,23 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -34,7 +34,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1129,7 +1141,7 @@ component("base") { +@@ -1166,7 +1178,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2088,6 +2100,22 @@ component("base") { +@@ -2126,6 +2138,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2220,6 +2248,29 @@ component("base") { +@@ -2271,6 +2299,33 @@ component("base") { } } @@ -74,6 +74,8 @@ + sources -= [ + "files/file_path_watcher_inotify.cc", + "files/scoped_file_linux.cc", ++ "process/set_process_title_linux.cc", ++ "process/set_process_title_linux.h", + "system/sys_info_linux.cc", + "process/process_iterator_linux.cc", + "process/process_linux.cc", @@ -84,6 +86,8 @@ + "profiler/thread_delegate_posix.cc", + "profiler/thread_delegate_posix.h", + "threading/platform_thread_linux.cc", ++ "stack_canary_linux.cc", ++ "stack_canary_linux.h", + ] + sources += [ + "files/file_path_watcher_kqueue.cc", @@ -96,7 +100,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2230,7 +2281,7 @@ component("base") { +@@ -2281,7 +2336,7 @@ component("base") { } if (dep_libevent) { @@ -105,16 +109,25 @@ } if (use_libevent) { -@@ -3619,7 +3670,7 @@ test("base_unittests") { +@@ -3094,7 +3149,7 @@ if (is_apple) { + } + } + +-if (!is_nacl && (is_linux || is_chromeos)) { ++if (!is_nacl && !is_bsd && (is_linux || is_chromeos)) { + # This test must compile with -fstack-protector-all + source_set("stack_canary_linux_unittests") { + testonly = true +@@ -3743,7 +3798,7 @@ test("base_unittests") { ] } - if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { ++ if (!is_bsd && (is_linux || is_chromeos)) { sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3640,7 +3691,7 @@ test("base_unittests") { +@@ -3770,7 +3825,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +136,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3651,7 +3702,7 @@ test("base_unittests") { +@@ -3781,7 +3836,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +145,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3913,7 +3964,7 @@ test("base_unittests") { +@@ -4049,7 +4104,7 @@ test("base_unittests") { } } diff --git a/www/iridium/files/patch-base_allocator_dispatcher_tls.h b/www/iridium/files/patch-base_allocator_dispatcher_tls.h index 639bf65b9f20..ad6f0fbaaae1 100644 --- a/www/iridium/files/patch-base_allocator_dispatcher_tls.h +++ b/www/iridium/files/patch-base_allocator_dispatcher_tls.h @@ -1,8 +1,8 @@ ---- base/allocator/dispatcher/tls.h.orig 2023-11-22 14:00:11 UTC +--- base/allocator/dispatcher/tls.h.orig 2024-06-25 12:08:48 UTC +++ base/allocator/dispatcher/tls.h -@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator { - partition_alloc::PartitionPageSize(); - #elif BUILDFLAG(IS_APPLE) +@@ -77,7 +77,7 @@ struct BASE_EXPORT MMapAllocator { + constexpr static size_t AllocationChunkSize = 16384; + #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS) constexpr static size_t AllocationChunkSize = 16384; -#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 9f74a77c14d5..dc8b7e617b87 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,11 +1,20 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-11-22 14:00:11 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -319,7 +319,7 @@ declare_args() { - # pkeys support is explicitly disabled in all Cronet builds, as some test +@@ -33,7 +33,7 @@ if (is_nacl) { + use_large_empty_slot_span_ring = is_mac + + has_memory_tagging = +- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) ++ current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android) + + declare_args() { + # Causes all the allocations to be routed via allocator_shim.cc. Usually, +@@ -373,7 +373,7 @@ declare_args() { # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. -- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build -+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build + enable_pkeys = +- (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build ++ !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build } - assert(!enable_pkeys || (is_linux && target_cpu == "x64"), - "Pkeys are only supported on x64 linux") + assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"), + "Pkeys are only supported on x64 linux and ChromeOS") diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index 4377b0bdc43c..db1eb5bf0dd6 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -582,7 +582,7 @@ source_set("allocator_shim") { - ] - configs += [ ":mac_no_default_new_delete_symbols" ] +@@ -884,7 +884,7 @@ if (is_clang_or_gcc) { + configs -= [ "//build/config/compiler:enable_arc" ] + } } - if (is_chromeos || is_linux) { + if ((is_chromeos || is_linux) && !is_bsd) { - sources += [ + shim_headers += [ "shim/allocator_shim_override_cpp_symbols.h", "shim/allocator_shim_override_glibc_weak_symbols.h", diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h index e77af8f404bc..52427b418c26 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,12 +9,12 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges -@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) { +@@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) { return AslrAddress(0x20000000ULL); } - -- #elif BUILDFLAG(IS_LINUX) -+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #elif defined(ARCH_CPU_ARM64) +- #if BUILDFLAG(IS_LINUX) ++ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on // page size and number of levels of translation pages used. We use diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h index dea3ce62bacd..efd3c2440ee3 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h -@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address, +@@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address, // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index d63e414a5d58..d0ca9bf1c7a2 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h @@ -1,38 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h -@@ -25,7 +25,7 @@ - // elimination. +@@ -26,7 +26,7 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + #elif (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing -@@ -92,7 +92,7 @@ PageAllocationGranularityShift() { - return 14; // 16kB - #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) - 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. - size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); -@@ -113,7 +113,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; --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or - // initialize cache. - size_t size = page_characteristics.size.load(std::memory_order_relaxed); -@@ -152,7 +152,7 @@ SystemPageShift() { - PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR 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/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h index 459d88e12cee..e72ac14bf138 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h -@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal( +@@ -411,8 +411,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc deleted file mode 100644 index 85c3f6efdcb7..000000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__address__space.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc.orig 2024-02-04 14:46:08 UTC -+++ base/allocator/partition_allocator/src/partition_alloc/partition_address_space.cc -@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo - } - #endif - --#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - - PageCharacteristics page_characteristics; - diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_compiler__specific.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_compiler__specific.h deleted file mode 100644 index 6eb53d8937fa..000000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_compiler__specific.h +++ /dev/null @@ -1,32 +0,0 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h.orig 2024-02-04 14:46:08 UTC -+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/compiler_specific.h -@@ -24,9 +24,9 @@ - // Annotate a function indicating it should not be inlined. - // Use like: - // NOINLINE void DoStuff() { ... } --#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline) -+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline) - #define PA_NOINLINE [[clang::noinline]] --#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline) - #define PA_NOINLINE __attribute__((noinline)) - #elif defined(COMPILER_MSVC) - #define PA_NOINLINE __declspec(noinline) -@@ -34,7 +34,7 @@ - #define PA_NOINLINE - #endif - --#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline) -+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline) - #define PA_ALWAYS_INLINE [[clang::always_inline]] inline - #elif defined(COMPILER_GCC) && defined(NDEBUG) && \ - PA_HAS_ATTRIBUTE(always_inline) -@@ -53,7 +53,7 @@ - // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h. - // Use like: - // void NOT_TAIL_CALLED FooBar(); --#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called) -+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called) - #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]] - #else - #define PA_NOT_TAIL_CALLED diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc index 39664c066954..66f3bc86b67a 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc @@ -1,8 +1,8 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc -@@ -12,11 +12,11 @@ - #include <string.h> - #include <unistd.h> +@@ -13,11 +13,11 @@ + #include "partition_alloc/partition_alloc_base/posix/eintr_wrapper.h" + #include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h" -#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) @@ -11,9 +11,9 @@ -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - #define HAVE_DLADDR #include <dlfcn.h> #endif + @@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug { namespace { @@ -21,9 +21,9 @@ -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) - constexpr size_t kBufferSize = 4096u; - -@@ -359,7 +359,7 @@ void PrintStackTraceInternal(const void** trace, size_ + // On Android the 'open' function has two versions: + // int open(const char *pathname, int flags); +@@ -369,7 +369,7 @@ void PrintStackTraceInternal(const void** trace, size_ } #endif // !BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc index 5756b2a79d89..d198a4fc79d0 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_rand__util__posix.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/rand_util_posix.cc -@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) { +@@ -102,6 +102,10 @@ void RandBytes(void* output, size_t output_length) { if (getentropy(output, output_length) == 0) { return; } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_strings_safe__sprintf.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_strings_safe__sprintf.h deleted file mode 100644 index 9338d4724793..000000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_strings_safe__sprintf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h.orig 2024-02-04 14:46:08 UTC -+++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h -@@ -184,7 +184,7 @@ struct Arg { - // - // Warning: don't just do Arg(NULL) here because in some libcs, NULL is an - // alias for nullptr! -- Arg(std::nullptr_t p) : type(INT) { -+ Arg(nullptr_t p) : type(INT) { - integer.i = 0; - // Internally, SafeSprintf expects to represent nulls as integers whose - // width is equal to sizeof(NULL), which is not necessarily equal to diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h new file mode 100644 index 000000000000..65eca6297fa2 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h.orig 2024-06-25 12:08:48 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread.h +@@ -37,6 +37,8 @@ typedef DWORD PlatformThreadId; + typedef zx_handle_t PlatformThreadId; + #elif BUILDFLAG(IS_APPLE) + typedef mach_port_t PlatformThreadId; ++#elif BUILDFLAG(IS_BSD) ++typedef uint64_t PlatformThreadId; + #elif BUILDFLAG(IS_POSIX) + typedef pid_t PlatformThreadId; + #endif diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc index e51ca1c37435..d527f0375aaf 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc @@ -1,8 +1,8 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc -@@ -17,7 +17,7 @@ - #include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h" - #include "build/build_config.h" +@@ -18,7 +18,7 @@ + #include "partition_alloc/partition_alloc_base/logging.h" + #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h index cc23a442d192..a373974693a8 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h @@ -1,15 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h -@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, ""); - // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific - // features such as futex(2). - #define PA_CONFIG_HAS_LINUX_KERNEL() \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)) - - // On some platforms, we implement locking by spinning in userspace, then going - // into the kernel only if there is contention. This requires platform support, -@@ -241,7 +241,7 @@ constexpr bool kUseLazyCommit = false; +@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. #define PA_CONFIG_HAS_ATFORK_HANDLER() \ @@ -18,12 +9,12 @@ // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -288,7 +288,7 @@ constexpr bool kUseLazyCommit = false; - // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to - // larger slot spans. - #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \ -- (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))) -+ (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)) - - // Enable shadow metadata. +@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false; // + // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead + // to larger slot spans. +-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) ++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) + #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1 + #else + #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0 diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index 7b766860fa2d..2d11cdfe5ef4 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,21 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h -@@ -107,7 +107,7 @@ PartitionPageShift() { - return 18; // 256 KiB - } - #elif (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)) - PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t - PartitionPageShift() { - return PageAllocationGranularityShift() + 2; -@@ -309,7 +309,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; +@@ -316,7 +316,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; // 8GB for each of the glued pools). - #if BUILDFLAG(HAS_64_BIT_POINTERS) + #if PA_BUILDFLAG(HAS_64_BIT_POINTERS) #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ -- BUILDFLAG(ENABLE_POINTER_COMPRESSION) -+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \ -+ BUILDFLAG(IS_BSD) +- PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) ++ PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD) constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h deleted file mode 100644 index 952a722d70b2..000000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__page__constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-02-04 14:46:08 UTC -+++ base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h -@@ -16,7 +16,7 @@ namespace partition_alloc::internal { - // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And - // PartitionPageSize() is 4 times the OS page size. - static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; --#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) - // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is - // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, - // so we use the 16 kiB maximum (64 kiB will crash). diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index 66e677cbcea7..92d280b775cb 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() { +@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,16 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro - constexpr size_t kMaxSlotCount = - (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / - MinPurgeableSlotSize(); --#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) - // 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 -@@ -948,7 +948,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -957,7 +957,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc index 9a0ed377f89e..4dd34460888a 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc @@ -1,9 +1,9 @@ ---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-02-04 14:46:08 UTC +--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-06-25 12:08:48 UTC +++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc -@@ -18,7 +18,16 @@ +@@ -17,7 +17,16 @@ + #endif #if PA_CONFIG(HAS_LINUX_KERNEL) - #include <errno.h> +#if defined(OS_OPENBSD) +#include <sys/time.h> +#include <sys/futex.h> @@ -16,8 +16,8 @@ +#endif #include <sys/syscall.h> #include <unistd.h> - #endif // PA_CONFIG(HAS_LINUX_KERNEL) -@@ -108,8 +117,16 @@ void SpinningMutex::FutexWait() { + +@@ -109,8 +118,16 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -34,7 +34,7 @@ if (err) { // These are programming error, check them. -@@ -121,8 +138,16 @@ void SpinningMutex::FutexWait() { +@@ -122,8 +139,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc index ec53806b3d46..8e2adb53873b 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc @@ -1,5 +1,5 @@ ---- base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc.orig 2024-02-04 14:46:08 UTC -+++ base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc +--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig 2024-06-25 12:08:48 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc @@ -18,6 +18,10 @@ #include <pthread.h> #endif diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc new file mode 100644 index 000000000000..c1614ff45bbe --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_thread__isolation_pkey.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc.orig 2024-06-25 12:08:48 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/thread_isolation/pkey.cc +@@ -16,7 +16,7 @@ + #include "partition_alloc/partition_alloc_check.h" + #include "partition_alloc/thread_isolation/thread_isolation.h" + +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + #error "This pkey code is currently only supported on Linux and ChromeOS" + #endif + diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc index 342ba8212e95..bea076c47aa0 100644 --- a/www/iridium/files/patch-base_base__paths__posix.cc +++ b/www/iridium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2023-11-22 14:00:11 UTC +--- base/base_paths_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -23,17 +23,17 @@ #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX) #include <stdlib.h> #endif -@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) { +@@ -49,8 +54,7 @@ bool PathProviderPosix(int key, FilePath* result) { *result = bin_dir; return true; #elif BUILDFLAG(IS_FREEBSD) - int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -- absl::optional<std::string> bin_dir = StringSysctl(name, std::size(name)); -+ absl::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }); +- std::optional<std::string> bin_dir = StringSysctl(name, std::size(name)); ++ std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }); if (!bin_dir.has_value() || bin_dir.value().length() <= 1) { - NOTREACHED() << "Unable to resolve path."; + NOTREACHED_IN_MIGRATION() << "Unable to resolve path."; return false; -@@ -65,13 +69,65 @@ bool PathProviderPosix(int key, FilePath* result) { +@@ -67,13 +71,65 @@ bool PathProviderPosix(int key, FilePath* result) { *result = FilePath(bin_dir); return true; #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) @@ -73,7 +73,7 @@ + goto out; + } + -+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL) ++ if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, errbuf)) == NULL) + goto out; + + if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, cpid, diff --git a/www/iridium/files/patch-base_base__switches.cc b/www/iridium/files/patch-base_base__switches.cc deleted file mode 100644 index 445a229c7fca..000000000000 --- a/www/iridium/files/patch-base_base__switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/base_switches.cc.orig 2023-10-21 11:51:27 UTC -+++ base/base_switches.cc -@@ -180,7 +180,7 @@ const char kPackageVersionName[] = "package-version-na - const char kPackageVersionCode[] = "package-version-code"; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // 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/iridium/files/patch-base_base__switches.h b/www/iridium/files/patch-base_base__switches.h deleted file mode 100644 index bffd05debcb2..000000000000 --- a/www/iridium/files/patch-base_base__switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/base_switches.h.orig 2023-10-21 11:51:27 UTC -+++ base/base_switches.h -@@ -62,7 +62,7 @@ extern const char kPackageVersionName[]; - extern const char kPackageVersionCode[]; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when - // Crashpad is fully enabled on Linux. - extern const char kEnableCrashpad[]; diff --git a/www/iridium/files/patch-base_compiler__specific.h b/www/iridium/files/patch-base_compiler__specific.h index 68ec17479a8a..e6258c63b357 100644 --- a/www/iridium/files/patch-base_compiler__specific.h +++ b/www/iridium/files/patch-base_compiler__specific.h @@ -1,35 +1,11 @@ ---- base/compiler_specific.h.orig 2023-07-24 14:27:53 UTC +--- base/compiler_specific.h.orig 2024-06-25 12:08:48 UTC +++ base/compiler_specific.h -@@ -41,9 +41,9 @@ - // Annotate a function indicating it should not be inlined. - // Use like: - // NOINLINE void DoStuff() { ... } --#if defined(__clang__) && HAS_ATTRIBUTE(noinline) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline) - #define NOINLINE [[clang::noinline]] --#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline) - #define NOINLINE __attribute__((noinline)) - #elif defined(COMPILER_MSVC) - #define NOINLINE __declspec(noinline) -@@ -51,9 +51,9 @@ - #define NOINLINE - #endif - --#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) -+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) - #define ALWAYS_INLINE [[clang::always_inline]] inline --#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) -+#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline) - #define ALWAYS_INLINE inline __attribute__((__always_inline__)) - #elif defined(COMPILER_MSVC) && defined(NDEBUG) - #define ALWAYS_INLINE __forceinline -@@ -69,7 +69,7 @@ - // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h. - // Use like: - // NOT_TAIL_CALLED void FooBar(); --#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called) - #define NOT_TAIL_CALLED [[clang::not_tail_called]] +@@ -316,7 +316,7 @@ + // + // In some cases it's desirable to remove this, e.g. on hot functions, or if + // we have purposely changed the reference canary. +-#if defined(COMPILER_GCC) || defined(__clang__) ++#if (defined(COMPILER_GCC) || defined(__clang__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + #if HAS_ATTRIBUTE(__no_stack_protector__) + #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__)) #else - #define NOT_TAIL_CALLED diff --git a/www/iridium/files/patch-base_debug_debugger__posix.cc b/www/iridium/files/patch-base_debug_debugger__posix.cc index 76478dfc3fd1..949b55d02948 100644 --- a/www/iridium/files/patch-base_debug_debugger__posix.cc +++ b/www/iridium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2022-10-05 07:34:01 UTC +--- base/debug/debugger_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/debug/debugger_posix.cc -@@ -35,6 +35,10 @@ +@@ -41,6 +41,10 @@ #include <sys/sysctl.h> #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -95,32 +99,51 @@ bool BeingDebugged() { +@@ -100,32 +104,51 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -27,7 +27,8 @@ if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; - mib[5] = (info_size / sizeof(struct kinfo_proc)); +- mib[5] = (info_size / sizeof(struct kinfo_proc)); ++ mib[5] = static_cast<int>((info_size / sizeof(struct kinfo_proc))); + if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) { + is_set = true; + being_debugged = false; diff --git a/www/iridium/files/patch-base_debug_elf__reader.cc b/www/iridium/files/patch-base_debug_elf__reader.cc index c741900b1eb1..76c1247af482 100644 --- a/www/iridium/files/patch-base_debug_elf__reader.cc +++ b/www/iridium/files/patch-base_debug_elf__reader.cc @@ -1,18 +1,13 @@ ---- base/debug/elf_reader.cc.orig 2023-10-21 11:51:27 UTC +--- base/debug/elf_reader.cc.orig 2024-06-25 12:08:48 UTC +++ base/debug/elf_reader.cc -@@ -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); -+#if !BUILDFLAG(IS_BSD) - if (current_note->n_type == NT_GNU_BUILD_ID) { - StringPiece note_name(current_section + sizeof(Nhdr), - current_note->n_namesz); -@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - break; - } - } -+#endif +@@ -50,6 +50,10 @@ using Xword = Elf64_Xword; + + constexpr char kGnuNoteName[] = "GNU"; - size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) + - bits::AlignUp(current_note->n_descsz, 4u) + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + // Returns a pointer to the header of the ELF binary mapped into memory, or a + // null pointer if the header is invalid. Here and below |elf_mapped_base| is a + // pointer to the start of the ELF image. diff --git a/www/iridium/files/patch-base_debug_proc__maps__linux.cc b/www/iridium/files/patch-base_debug_proc__maps__linux.cc index 40031617638c..90fa0fa91c4f 100644 --- a/www/iridium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/iridium/files/patch-base_debug_proc__maps__linux.cc @@ -1,6 +1,6 @@ ---- base/debug/proc_maps_linux.cc.orig 2022-03-28 18:11:04 UTC +--- base/debug/proc_maps_linux.cc.orig 2024-06-25 12:08:48 UTC +++ base/debug/proc_maps_linux.cc -@@ -13,7 +13,7 @@ +@@ -18,7 +18,7 @@ #include "base/strings/string_split.h" #include "build/build_config.h" diff --git a/www/iridium/files/patch-base_debug_stack__trace.cc b/www/iridium/files/patch-base_debug_stack__trace.cc index dadda63f5fda..710c1c51bd9f 100644 --- a/www/iridium/files/patch-base_debug_stack__trace.cc +++ b/www/iridium/files/patch-base_debug_stack__trace.cc @@ -1,21 +1,29 @@ ---- base/debug/stack_trace.cc.orig 2024-02-04 14:46:08 UTC +--- base/debug/stack_trace.cc.orig 2024-06-25 12:08:48 UTC +++ base/debug/stack_trace.cc -@@ -266,7 +266,9 @@ void StackTrace::Print() const { - } - - void StackTrace::OutputToStream(std::ostream* os) const { -+#if !BUILDFLAG(IS_BSD) - OutputToStreamWithPrefix(os, nullptr); -+#endif - } +@@ -254,7 +254,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { + // Symbols are not expected to be reliable when gn args specifies + // symbol_level=0. + return false; +-#elif defined(__UCLIBC__) || defined(_AIX) ++#elif defined(__UCLIBC__) || defined(_AIX) || BUILDFLAG(IS_BSD) + // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. + // See https://crbug.com/706728 + return false; +@@ -316,7 +316,7 @@ std::string StackTrace::ToString() const { - std::string StackTrace::ToString() const { -@@ -274,7 +276,7 @@ std::string StackTrace::ToString() const { - } - std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; -#if !defined(__UCLIBC__) && !defined(_AIX) +#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); +@@ -340,7 +340,7 @@ bool StackTrace::ShouldSuppressOutput() { + } + + std::ostream& operator<<(std::ostream& os, const StackTrace& s) { +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) + s.OutputToStream(&os); + #else + os << "StackTrace::OutputToStream not implemented."; diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc index 74c64bda5671..87fad828a871 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace_posix.cc.orig 2023-11-22 14:00:11 UTC +--- base/debug/stack_trace_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/debug/stack_trace_posix.cc -@@ -41,7 +41,7 @@ +@@ -46,7 +46,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS // libc. #if BUILDFLAG(IS_APPLE) || \ @@ -9,7 +9,7 @@ #define HAVE_BACKTRACE #include <execinfo.h> #endif -@@ -59,8 +59,10 @@ +@@ -64,8 +64,10 @@ #include <AvailabilityMacros.h> #endif @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) { +@@ -306,7 +308,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -30,7 +30,7 @@ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { // We have seen rare cases on AMD linux where the default signal handler // either does not run or a thread (Probably an AMD driver thread) prevents -@@ -319,7 +321,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -323,7 +325,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v "Warning: Default signal handler failed to terminate process.\n"); PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); // See: https://man7.org/linux/man-pages/man2/exit_group.2.html @@ -42,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -540,7 +546,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -51,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -561,6 +567,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -565,6 +571,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). @@ -59,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -579,6 +586,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -67,7 +67,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper { +@@ -768,6 +776,7 @@ class SandboxSymbolizeHelper { return -1; } @@ -75,7 +75,7 @@ // This class is copied from // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. // It aims at ensuring the process is dumpable before opening /proc/self/mem. -@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper { +@@ -860,11 +869,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper { +@@ -882,6 +895,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/iridium/files/patch-base_features.cc b/www/iridium/files/patch-base_features.cc new file mode 100644 index 000000000000..37e9e3972b81 --- /dev/null +++ b/www/iridium/files/patch-base_features.cc @@ -0,0 +1,20 @@ +--- base/features.cc.orig 2024-06-25 12:08:48 UTC ++++ base/features.cc +@@ -9,7 +9,7 @@ + #include "base/threading/platform_thread.h" + #include "build/buildflag.h" + +-#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 + +@@ -98,7 +98,7 @@ void Init(EmitThreadControllerProfilerMetadata + sequence_manager::internal::ThreadController::InitializeFeatures( + emit_thread_controller_profiler_metadata); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + MessagePumpLibevent::InitializeFeatures(); + #endif + diff --git a/www/iridium/files/patch-base_files_dir__reader__linux.h b/www/iridium/files/patch-base_files_dir__reader__linux.h index e119fcf240de..a31e0f0a4636 100644 --- a/www/iridium/files/patch-base_files_dir__reader__linux.h +++ b/www/iridium/files/patch-base_files_dir__reader__linux.h @@ -1,6 +1,6 @@ ---- base/files/dir_reader_linux.h.orig 2022-10-05 07:34:01 UTC +--- base/files/dir_reader_linux.h.orig 2024-06-25 12:08:48 UTC +++ base/files/dir_reader_linux.h -@@ -16,10 +16,16 @@ +@@ -21,10 +21,16 @@ #include "base/logging.h" #include "base/posix/eintr_wrapper.h" @@ -17,7 +17,7 @@ struct linux_dirent { uint64_t d_ino; int64_t d_off; -@@ -27,6 +33,7 @@ struct linux_dirent { +@@ -32,6 +38,7 @@ struct linux_dirent { unsigned char d_type; char d_name[0]; }; @@ -25,7 +25,7 @@ class DirReaderLinux { public: -@@ -61,7 +68,11 @@ class DirReaderLinux { +@@ -66,7 +73,11 @@ class DirReaderLinux { if (offset_ != size_) return true; diff --git a/www/iridium/files/patch-base_files_file__path__watcher.h b/www/iridium/files/patch-base_files_file__path__watcher.h index bfa4562a7d75..f33f15587d2d 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher.h +++ b/www/iridium/files/patch-base_files_file__path__watcher.h @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher.h.orig 2023-03-13 07:33:08 UTC +--- base/files/file_path_watcher.h.orig 2024-06-25 12:08:48 UTC +++ base/files/file_path_watcher.h -@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher { +@@ -105,7 +105,7 @@ class BASE_EXPORT FilePathWatcher { Type type = Type::kNonRecursive; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc index 0a3b52a794ec..91120d3d5d87 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2024-02-04 14:46:08 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -703,7 +703,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -847,7 +847,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { } delegate.RunUntilEventsMatch(event_expecter); @@ -8,8 +8,8 @@ +#if !BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD) ASSERT_TRUE(WriteFile(file1, "content v2")); // Mac implementation does not detect files modified in a directory. - // TODO(https://crbug.com/1432064): Expect that no events are fired on Mac. -@@ -1639,7 +1639,7 @@ namespace { + // TODO(crbug.com/40263777): Expect that no events are fired on Mac. +@@ -1783,7 +1783,7 @@ namespace { enum Permission { Read, Write, Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1673,7 +1673,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1817,7 +1817,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } // namespace diff --git a/www/iridium/files/patch-base_files_file__util__posix.cc b/www/iridium/files/patch-base_files_file__util__posix.cc index cd7bd14bde7e..49dcfc67de0c 100644 --- a/www/iridium/files/patch-base_files_file__util__posix.cc +++ b/www/iridium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2023-11-22 14:00:11 UTC +--- base/files/file_util_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/files/file_util_posix.cc -@@ -756,33 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -819,33 +819,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). diff --git a/www/iridium/files/patch-base_files_file__util__unittest.cc b/www/iridium/files/patch-base_files_file__util__unittest.cc index 930a3aa748f3..a598dd97aa06 100644 --- a/www/iridium/files/patch-base_files_file__util__unittest.cc +++ b/www/iridium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2024-02-04 14:46:08 UTC +--- base/files/file_util_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/files/file_util_unittest.cc -@@ -3878,7 +3878,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3835,7 +3835,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4601,7 +4601,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4568,7 +4568,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/iridium/files/patch-base_functional_unretained__traits.h b/www/iridium/files/patch-base_functional_unretained__traits.h index b8fd9eb21ddb..b550ad298cd6 100644 --- a/www/iridium/files/patch-base_functional_unretained__traits.h +++ b/www/iridium/files/patch-base_functional_unretained__traits.h @@ -1,11 +1,11 @@ ---- base/functional/unretained_traits.h.orig 2023-03-13 07:33:08 UTC +--- base/functional/unretained_traits.h.orig 2024-06-25 12:08:48 UTC +++ base/functional/unretained_traits.h -@@ -130,7 +130,7 @@ struct TypeSupportsUnretained { +@@ -93,7 +93,7 @@ struct SupportsUnretainedImpl { // official builds, and then in non-test code as well. - #if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) -+ || BUILDFLAGS(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) - static_assert(IsCompleteTypeV<T> || - IsIncompleteTypeSafeForUnretained<std::remove_cv_t<T>>, - "T must be fully defined."); + #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \ + (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) && \ +- (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN))) ++ (BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))) + static_assert(v, + "Argument requires unretained storage, but type is not " + "fully defined. This prevents determining whether " diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc index 6d80883d26dd..aa891a646d72 100644 --- a/www/iridium/files/patch-base_i18n_icu__util.cc +++ b/www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,6 +1,6 @@ ---- base/i18n/icu_util.cc.orig 2023-10-21 11:51:27 UTC +--- base/i18n/icu_util.cc.orig 2024-06-25 12:08:48 UTC +++ base/i18n/icu_util.cc -@@ -51,7 +51,7 @@ +@@ -52,7 +52,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() { +@@ -328,7 +328,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/iridium/files/patch-base_linux__util.cc b/www/iridium/files/patch-base_linux__util.cc index 632c8d021f97..bab19f9fc248 100644 --- a/www/iridium/files/patch-base_linux__util.cc +++ b/www/iridium/files/patch-base_linux__util.cc @@ -1,14 +1,6 @@ ---- base/linux_util.cc.orig 2024-02-04 14:46:08 UTC +--- base/linux_util.cc.orig 2024-06-25 12:08:48 UTC +++ base/linux_util.cc -@@ -15,6 +15,7 @@ - - #include <iomanip> - #include <memory> -+#include <sstream> - - #include "base/base_export.h" - #include "base/files/dir_reader_posix.h" -@@ -153,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) { +@@ -154,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc index fd742f644307..5ad82b3e6ba8 100644 --- a/www/iridium/files/patch-base_logging__unittest.cc +++ b/www/iridium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2023-03-13 07:33:08 UTC +--- base/logging_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/logging_unittest.cc -@@ -32,7 +32,7 @@ +@@ -41,7 +41,7 @@ #include "base/posix/eintr_wrapper.h" #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -575,14 +575,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -579,14 +579,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index a75f4adc4748..edf464acdcc7 100644 --- a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-07-24 14:27:53 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -311,6 +311,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector<char> vec(allocated_pages_); #else -@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -326,6 +330,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons return false; } return true; diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h index 653ffad33990..04371b430d70 100644 --- a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,15 +1,15 @@ ---- base/memory/platform_shared_memory_region.h.orig 2023-07-24 14:27:53 UTC +--- base/memory/platform_shared_memory_region.h.orig 2024-06-25 12:08:48 UTC +++ base/memory/platform_shared_memory_region.h -@@ -16,7 +16,7 @@ - - #include <stdint.h> +@@ -17,7 +17,7 @@ + #include "base/unguessable_token.h" + #include "build/build_config.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace content { class SandboxIPCHandler; } -@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -84,7 +84,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -216,7 +216,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/iridium/files/patch-base_native__library__unittest.cc b/www/iridium/files/patch-base_native__library__unittest.cc index 055b7b4f439e..daa7ef40af77 100644 --- a/www/iridium/files/patch-base_native__library__unittest.cc +++ b/www/iridium/files/patch-base_native__library__unittest.cc @@ -1,6 +1,6 @@ ---- base/native_library_unittest.cc.orig 2022-12-01 10:35:46 UTC +--- base/native_library_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/native_library_unittest.cc -@@ -134,7 +134,7 @@ TEST(NativeLibraryTest, LoadLibrary) { +@@ -133,7 +133,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // versions with respect to symbol resolution scope. // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \ diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket.cc b/www/iridium/files/patch-base_posix_unix__domain__socket.cc index 833309243830..0e84bc17992c 100644 --- a/www/iridium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/iridium/files/patch-base_posix_unix__domain__socket.cc @@ -1,6 +1,6 @@ ---- base/posix/unix_domain_socket.cc.orig 2022-10-05 07:34:01 UTC +--- base/posix/unix_domain_socket.cc.orig 2024-06-25 12:08:48 UTC +++ base/posix/unix_domain_socket.cc -@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { +@@ -56,7 +56,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -9,7 +9,25 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else -@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -82,7 +82,7 @@ bool UnixDomainSocket::SendMsg(int fd, + + struct cmsghdr* cmsg; + msg.msg_control = control_buffer; +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + msg.msg_controllen = checked_cast<socklen_t>(control_len); + #else + msg.msg_controllen = control_len; +@@ -90,7 +90,7 @@ bool UnixDomainSocket::SendMsg(int fd, + cmsg = CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size())); + #else + cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size()); +@@ -154,7 +154,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) @@ -18,7 +36,7 @@ // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) -@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -182,7 +182,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } @@ -27,7 +45,7 @@ // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { -@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -216,6 +216,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/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc index 814adc5174de..f50079609b45 100644 --- a/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc +++ b/www/iridium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -1,6 +1,6 @@ ---- base/posix/unix_domain_socket_unittest.cc.orig 2023-03-13 07:33:08 UTC +--- base/posix/unix_domain_socket_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/posix/unix_domain_socket_unittest.cc -@@ -10,6 +10,8 @@ +@@ -15,6 +15,8 @@ #include <sys/types.h> #include <unistd.h> diff --git a/www/iridium/files/patch-base_process_internal__linux.h b/www/iridium/files/patch-base_process_internal__linux.h new file mode 100644 index 000000000000..c6c8df6c62b7 --- /dev/null +++ b/www/iridium/files/patch-base_process_internal__linux.h @@ -0,0 +1,20 @@ +--- base/process/internal_linux.h.orig 2024-06-25 12:08:48 UTC ++++ base/process/internal_linux.h +@@ -140,6 +140,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); + // arguments to the lambda. + template <typename Lambda> + void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { ++#if BUILDFLAG(IS_BSD) ++ return; ++#else + // Iterate through the different threads tracked in /proc/<pid>/task. + FilePath fd_path = GetProcPidDir(process).Append("task"); + +@@ -159,6 +162,7 @@ void ForEachProcessTask(base::ProcessHandle process, L + FilePath task_path = fd_path.Append(tid_str); + lambda(tid, task_path); + } ++#endif + } + + } // namespace internal diff --git a/www/iridium/files/patch-base_process_kill.h b/www/iridium/files/patch-base_process_kill.h index 7f6d5b957acc..7f96c47919dd 100644 --- a/www/iridium/files/patch-base_process_kill.h +++ b/www/iridium/files/patch-base_process_kill.h @@ -1,6 +1,6 @@ ---- base/process/kill.h.orig 2022-10-05 07:34:01 UTC +--- base/process/kill.h.orig 2024-06-25 12:08:48 UTC +++ base/process/kill.h -@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); diff --git a/www/iridium/files/patch-base_process_launch__posix.cc b/www/iridium/files/patch-base_process_launch__posix.cc index 1b5db755ed4d..3428f661d58d 100644 --- a/www/iridium/files/patch-base_process_launch__posix.cc +++ b/www/iridium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- base/process/launch_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/launch_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/launch_posix.cc -@@ -64,6 +64,9 @@ +@@ -66,6 +66,9 @@ #error "macOS should use launch_mac.cc" #endif diff --git a/www/iridium/files/patch-base_process_memory__linux.cc b/www/iridium/files/patch-base_process_memory__linux.cc index 8e2512241d51..6e765ec4fb8a 100644 --- a/www/iridium/files/patch-base_process_memory__linux.cc +++ b/www/iridium/files/patch-base_process_memory__linux.cc @@ -1,6 +1,6 @@ ---- base/process/memory_linux.cc.orig 2023-03-13 07:33:08 UTC +--- base/process/memory_linux.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/memory_linux.cc -@@ -20,6 +20,7 @@ +@@ -28,6 +28,7 @@ void __libc_free(void*); namespace base { @@ -8,7 +8,7 @@ namespace { void ReleaseReservationOrTerminate() { -@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() { +@@ -37,12 +38,14 @@ void ReleaseReservationOrTerminate() { } } // namespace @@ -23,8 +23,8 @@ // Set the new-out of memory handler. std::set_new_handler(&ReleaseReservationOrTerminate); // If we're using glibc's allocator, the above functions will override -@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() { - #if BUILDFLAG(USE_ALLOCATOR_SHIM) +@@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() { + #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM) allocator_shim::SetCallNewHandlerOnMallocFailure(true); #endif +#endif @@ -34,11 +34,11 @@ // ScopedAllowBlocking() has private constructor and it can only be used in // friend classes/functions. Declaring a class is easier in this situation to // avoid adding more dependency to thread_restrictions.h because of the -@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr +@@ -112,6 +117,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr bool AdjustOOMScore(ProcessId process, int score) { return AdjustOOMScoreHelper::AdjustOOMScore(process, score); } +#endif bool UncheckedMalloc(size_t size, void** result) { - #if BUILDFLAG(USE_ALLOCATOR_SHIM) + #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM) diff --git a/www/iridium/files/patch-base_process_process__handle.h b/www/iridium/files/patch-base_process_process__handle.h index b28dd6d0d109..12fdc4810bf3 100644 --- a/www/iridium/files/patch-base_process_process__handle.h +++ b/www/iridium/files/patch-base_process_process__handle.h @@ -1,6 +1,6 @@ ---- base/process/process_handle.h.orig 2022-03-28 18:11:04 UTC +--- base/process/process_handle.h.orig 2024-06-25 12:08:48 UTC +++ base/process/process_handle.h -@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); +@@ -86,7 +86,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); diff --git a/www/iridium/files/patch-base_process_process__handle__freebsd.cc b/www/iridium/files/patch-base_process_process__handle__freebsd.cc index dd603706da74..8c2714f8da10 100644 --- a/www/iridium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_freebsd.cc.orig 2023-11-22 14:00:11 UTC +--- base/process/process_handle_freebsd.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_handle_freebsd.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <limits.h> #include <stddef.h> -@@ -19,10 +20,13 @@ namespace base { +@@ -20,10 +21,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; diff --git a/www/iridium/files/patch-base_process_process__handle__openbsd.cc b/www/iridium/files/patch-base_process_process__handle__openbsd.cc index cfde3ae9716d..6e18bf7dc366 100644 --- a/www/iridium/files/patch-base_process_process__handle__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__openbsd.cc @@ -1,18 +1,22 @@ ---- base/process/process_handle_openbsd.cc.orig 2022-10-05 07:34:01 UTC +--- base/process/process_handle_openbsd.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_handle_openbsd.cc -@@ -3,8 +3,11 @@ +@@ -3,48 +3,112 @@ // found in the LICENSE file. #include "base/process/process_handle.h" +#include "base/files/file_util.h" #include <stddef.h> ++#include <stdlib.h> +#include <sys/param.h> +#include <sys/proc.h> ++#include <sys/stat.h> #include <sys/sysctl.h> #include <sys/types.h> #include <unistd.h> -@@ -12,39 +15,59 @@ + ++#include <kvm.h> ++ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { @@ -26,18 +30,19 @@ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) return -1; +- mib[5] = (length / sizeof(struct kinfo_proc)); + info = (struct kinfo_proc *)malloc(length); -+ - mib[5] = (length / sizeof(struct kinfo_proc)); - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return -1; ++ mib[5] = static_cast<int>((length / sizeof(struct kinfo_proc))); + +- return info.p_ppid; + if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) { + ppid = -1; + goto out; + } - -- return info.p_ppid; ++ + ppid = info->p_ppid; + +out: @@ -47,16 +52,20 @@ FilePath GetProcessExecutablePath(ProcessHandle process) { - struct kinfo_proc kp; -- size_t len; -+ struct kinfo_proc *info; -+ size_t length; -+ char *path = NULL; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, - sizeof(struct kinfo_proc), 0 }; ++ struct kinfo_file *files; ++ kvm_t *kd = NULL; ++ char errbuf[_POSIX2_LINE_MAX]; ++ char **retvalargs, *cpath, retval[PATH_MAX]; ++ int cnt; + size_t len; +- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, +- sizeof(struct kinfo_proc), 0 }; ++ char *tokens[2]; ++ struct stat sb; ++ FilePath result; - if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) -+ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1) - return FilePath(); +- return FilePath(); - mib[5] = (len / sizeof(struct kinfo_proc)); - if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) - return FilePath(); @@ -64,26 +73,61 @@ - return FilePath(); - if (strcmp(kp.p_comm, "chrome") == 0) - return FilePath(kp.p_comm); ++ int mib[] = { CTL_KERN, KERN_PROC_ARGS, process, KERN_PROC_ARGV }; - return FilePath(); -+ info = (struct kinfo_proc *)malloc(length); ++ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) ++ result = FilePath(cpath); ++ else ++ result = FilePath("/usr/local/chrome/chrome"); + -+ mib[5] = (length / sizeof(struct kinfo_proc)); ++ if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) != -1) { ++ retvalargs = static_cast<char**>(malloc(len)); ++ if (!retvalargs) ++ return result; + -+ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) -+ goto out; ++ if (sysctl(mib, std::size(mib), retvalargs, &len, NULL, 0) < 0) { ++ free(retvalargs); ++ return result; ++ } + -+ if ((info->p_flag & P_SYSTEM) != 0) -+ goto out; ++ if ((*tokens = strtok(retvalargs[0], ":")) == NULL) { ++ free(retvalargs); ++ return result; ++ } + -+ if (strcmp(info->p_comm, "chrome") == 0) { -+ path = info->p_comm; -+ goto out; ++ free(retvalargs); ++ ++ if (tokens[0] == NULL) ++ return result; ++ ++ if (realpath(tokens[0], retval) == NULL) ++ return result; ++ ++ if (stat(retval, &sb) < 0) ++ return result; ++ ++ if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, ++ errbuf)) == NULL) ++ return result; ++ ++ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process, ++ sizeof(struct kinfo_file), &cnt)) == NULL) { ++ kvm_close(kd); ++ return result; ++ } ++ ++ for (int i = 0; i < cnt; i++) { ++ if (files[i].fd_fd == KERN_FILE_TEXT && ++ files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) && ++ files[i].va_fileid == sb.st_ino) { ++ kvm_close(kd); ++ result = FilePath(retval); ++ } ++ } + } + -+out: -+ free(info); -+ return FilePath(path); ++ return result; } } // namespace base diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index e275cb8d7587..627ac996b1a4 100644 --- a/www/iridium/files/patch-base_process_process__metrics.cc +++ b/www/iridium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2023-07-24 14:27:53 UTC +--- base/process/process_metrics.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -35,17 +35,12 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( - double ProcessMetrics::GetPlatformIndependentCPUUsage() { - return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); +@@ -129,10 +128,9 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() { + return GetPlatformIndependentCPUUsage(cpu_usage); + }); } -#endif - #if BUILDFLAG(IS_WIN) - double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) { -@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { - #endif // BUILDFLAG(IS_WIN) - #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h index 3c8e2959b61b..fe206988269f 100644 --- a/www/iridium/files/patch-base_process_process__metrics.h +++ b/www/iridium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2024-02-04 14:46:08 UTC +--- base/process/process_metrics.h.orig 2024-06-25 12:08:48 UTC +++ base/process/process_metrics.h -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,16 +9,16 @@ #include <string> #include <utility> #include <vector> -@@ -50,7 +50,7 @@ namespace base { - // Full declaration is in process_metrics_iocounters.h. - struct IoCounters; +@@ -48,7 +48,7 @@ + + namespace base { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -116,7 +116,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,8 +27,8 @@ // 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; -@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics { - #endif // BUILDFLAG(IS_WIN) +@@ -150,7 +150,7 @@ class BASE_EXPORT ProcessMetrics { + base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) @@ -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 -@@ -219,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -195,7 +195,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; -@@ -240,7 +240,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -216,7 +216,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -262,9 +262,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -238,12 +238,10 @@ class BASE_EXPORT ProcessMetrics { // Used to store the previous times and CPU usage counts so we can // compute the CPU usage between calls. TimeTicks last_cpu_time_; @@ -62,18 +62,13 @@ TimeDelta last_cumulative_cpu_; -#endif - #if BUILDFLAG(IS_WIN) - TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -272,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { - #endif - #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -284,7 +282,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) || \ @@ -82,7 +77,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -319,7 +317,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -91,7 +86,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 -@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -334,7 +332,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -100,7 +95,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -371,7 +369,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -109,7 +104,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. -@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics { +@@ -566,7 +564,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc index 60d4fea860d0..8f545ffededa 100644 --- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_freebsd.cc.orig 2023-03-13 07:33:08 UTC +--- base/process/process_metrics_freebsd.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,20 +3,39 @@ +@@ -3,44 +3,58 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -17,7 +17,6 @@ +#include <libutil.h> + #include "base/memory/ptr_util.h" - #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" namespace base { @@ -26,28 +25,30 @@ + int pagesize = getpagesize(); + int pageshift = 0; +-ProcessMetrics::ProcessMetrics(ProcessHandle process) +- : process_(process), +- last_cpu_(0) {} + while (pagesize > 1) { + pageshift++; + pagesize >>= 1; + } -+ + + return pageshift; +} +} + - ProcessMetrics::ProcessMetrics(ProcessHandle process) -- : process_(process), -- last_cpu_(0) {} -+ : process_(process) {} - ++ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {} ++ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + ProcessHandle process) { return WrapUnique(new ProcessMetrics(process)); } --double ProcessMetrics::GetPlatformIndependentCPUUsage() { -+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-base::expected<double, ProcessCPUUsageError> +-ProcessMetrics::GetPlatformIndependentCPUUsage() { ++base::expected<TimeDelta, ProcessCPUUsageError> ++ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; - size_t length = sizeof(info); @@ -57,22 +58,23 @@ + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) -- return 0; -+ return TimeDelta(); +- return base::unexpected(ProcessCPUUsageError::kSystemError); ++ return base::ok(TimeDelta()); -- return (info.ki_pctcpu / FSCALE) * 100.0; -+ return Microseconds(info.ki_runtime); +- return base::ok(double{info.ki_pctcpu} / FSCALE * 100.0); ++ return base::ok(Microseconds(info.ki_runtime)); } --TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { -- NOTREACHED(); -- return TimeDelta(); +-base::expected<TimeDelta, ProcessCPUUsageError> +-ProcessMetrics::GetCumulativeCPUUsage() { +- NOTREACHED_IN_MIGRATION(); +- return base::unexpected(ProcessCPUUsageError::kNotImplemented); -} - - bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const { - return false; - } -@@ -65,6 +81,230 @@ size_t GetSystemCommitCharge() { + size_t GetSystemCommitCharge() { + int mib[2], pagesize; + unsigned long mem_total, mem_free, mem_inactive; +@@ -62,6 +76,230 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); @@ -171,7 +173,7 @@ + kvm_close(kd); + return 0; + } -+ ++ + size_t rss; + + if (nproc > 0) { @@ -197,7 +199,7 @@ + kvm_close(kd); + return 0; + } -+ ++ + size_t swrss; + + if (nproc > 0) { @@ -247,7 +249,7 @@ + +Value::Dict SystemDiskInfo::ToDict() const { + Value::Dict res; -+ ++ + // Write out uint64_t variables as doubles. + // Note: this may discard some precision, but for JS there's no other option. + res.Set("reads", static_cast<double>(reads)); @@ -263,7 +265,7 @@ + res.Set("weighted_io_time", static_cast<double>(weighted_io_time)); + + NOTIMPLEMENTED(); -+ ++ + return res; +} + diff --git a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc index 292d0cb4f0c0..f6c08ccecb9c 100644 --- a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_openbsd.cc.orig 2023-10-21 11:51:27 UTC +--- base/process/process_metrics_openbsd.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_metrics_openbsd.cc -@@ -6,14 +6,23 @@ +@@ -6,75 +6,50 @@ #include <stddef.h> #include <stdint.h> @@ -12,24 +12,18 @@ +#include <kvm.h> + #include "base/memory/ptr_util.h" - #include "base/process/process_metrics_iocounters.h" + #include "base/types/expected.h" +#include "base/values.h" +#include "base/notreached.h" namespace base { -+ProcessMetrics::ProcessMetrics(ProcessHandle process) -+ : process_(process) {} -+ - // static - std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( - ProcessHandle process) { -@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun - return false; - } +-namespace { ++ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {} --static int GetProcessCPU(pid_t pid) { -+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-base::expected<int, ProcessCPUUsageError> GetProcessCPU(pid_t pid) { ++base::expected<TimeDelta, ProcessCPUUsageError> ++ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, @@ -37,43 +31,56 @@ + size_t length = sizeof(struct kinfo_proc); + struct timeval tv; -- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) -- return -1; +- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) { +- return base::unexpected(ProcessCPUUsageError::kSystemError); +- } + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, + sizeof(struct kinfo_proc), 1 }; - mib[5] = (length / sizeof(struct kinfo_proc)); - - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) -- return 0; -+ return TimeDelta(); + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { + return base::unexpected(ProcessCPUUsageError::kSystemError); + } -- return info.p_pctcpu; --} +- return base::ok(info.p_pctcpu); + tv.tv_sec = info.p_rtime_sec; + tv.tv_usec = info.p_rtime_usec; ++ ++ return base::ok(Microseconds(TimeValToMicroseconds(tv))); + } + +-} // namespace +- + // static + std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( + ProcessHandle process) { + return WrapUnique(new ProcessMetrics(process)); + } --double ProcessMetrics::GetPlatformIndependentCPUUsage() { +-base::expected<double, ProcessCPUUsageError> +-ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); - - if (last_cpu_time_.is_zero()) { - // First call, just set the last values. - last_cpu_time_ = time; -- return 0; +- return base::ok(0.0); - } - -- int cpu = GetProcessCPU(process_); +- const base::expected<int, ProcessCPUUsageError> cpu = GetProcessCPU(process_); +- if (!cpu.has_value()) { +- return base::unexpected(cpu.error()); +- } - - last_cpu_time_ = time; -- double percentage = static_cast<double>((cpu * 100.0) / FSCALE); +- return base::ok(double{cpu.value()} / FSCALE * 100.0); +-} - -- return percentage; -+ return Microseconds(TimeValToMicroseconds(tv)); - } - --TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { -- NOTREACHED(); -- return TimeDelta(); +-base::expected<TimeDelta, ProcessCPUUsageError> +-ProcessMetrics::GetCumulativeCPUUsage() { +- NOTREACHED_IN_MIGRATION(); +- return base::unexpected(ProcessCPUUsageError::kNotImplemented); -} - -ProcessMetrics::ProcessMetrics(ProcessHandle process) @@ -82,9 +89,17 @@ - size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; - int pagesize; -@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() { - pagesize = getpagesize(); +- int pagesize; ++ size_t pagesize; + struct vmtotal vmtotal; + unsigned long mem_total, mem_free, mem_inactive; + size_t len = sizeof(vmtotal); +@@ -86,9 +61,136 @@ size_t GetSystemCommitCharge() { + mem_free = vmtotal.t_free; + mem_inactive = vmtotal.t_vm - vmtotal.t_avm; + +- pagesize = getpagesize(); ++ pagesize = checked_cast<size_t>(getpagesize()); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); +} diff --git a/www/iridium/files/patch-base_process_process__metrics__unittest.cc b/www/iridium/files/patch-base_process_process__metrics__unittest.cc index 37dacc94e7c6..3036e74ca962 100644 --- a/www/iridium/files/patch-base_process_process__metrics__unittest.cc +++ b/www/iridium/files/patch-base_process_process__metrics__unittest.cc @@ -1,18 +1,12 @@ ---- base/process/process_metrics_unittest.cc.orig 2024-02-04 14:46:08 UTC +--- base/process/process_metrics_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_metrics_unittest.cc -@@ -35,13 +35,13 @@ - #include <sys/mman.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/process/internal_linux.h" - #endif +@@ -62,7 +62,8 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || \ ++ BUILDFLAG(IS_BSD) #define ENABLE_CPU_TESTS 1 #else #define ENABLE_CPU_TESTS 0 diff --git a/www/iridium/files/patch-base_process_process__posix.cc b/www/iridium/files/patch-base_process_process__posix.cc index ae64621914a1..546b12e97a40 100644 --- a/www/iridium/files/patch-base_process_process__posix.cc +++ b/www/iridium/files/patch-base_process_process__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_posix.cc.orig 2023-10-21 11:51:27 UTC +--- base/process/process_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_posix.cc @@ -23,10 +23,15 @@ #include "base/trace_event/base_tracing.h" @@ -17,16 +17,16 @@ #if BUILDFLAG(CLANG_PROFILING) #include "base/test/clang_profiling.h" #endif -@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, - return ret_pid > 0; +@@ -99,7 +104,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, } + #endif -#if BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // 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. -@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha +@@ -376,7 +381,7 @@ bool Process::WaitForExitWithTimeoutImpl(base::Process 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 -@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const { +@@ -413,7 +418,56 @@ void Process::Exited(int exit_code) const { int Process::GetOSPriority() const { DCHECK(IsValid()); diff --git a/www/iridium/files/patch-base_process_process__unittest.cc b/www/iridium/files/patch-base_process_process__unittest.cc index 6df6891400b2..4b4816992a8f 100644 --- a/www/iridium/files/patch-base_process_process__unittest.cc +++ b/www/iridium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2023-11-22 14:00:11 UTC +--- base/process/process_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/process/process_unittest.cc -@@ -198,7 +198,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -199,7 +199,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = diff --git a/www/iridium/files/patch-base_profiler_module__cache.cc b/www/iridium/files/patch-base_profiler_module__cache.cc index bb52d5114336..a9f2a6d699fe 100644 --- a/www/iridium/files/patch-base_profiler_module__cache.cc +++ b/www/iridium/files/patch-base_profiler_module__cache.cc @@ -1,6 +1,6 @@ ---- base/profiler/module_cache.cc.orig 2024-02-04 14:46:08 UTC +--- base/profiler/module_cache.cc.orig 2024-06-25 12:08:48 UTC +++ base/profiler/module_cache.cc -@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri +@@ -38,7 +38,7 @@ std::string TransformModuleIDToSymbolServerFormat(std: // Android and Linux Chrome builds use the "breakpad" format to index their // build id, so we transform the build id for these platforms. All other // platforms keep their symbols indexed by the original build ID. diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc index c76676c27ffe..b47f0799fd02 100644 --- a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2023-03-13 07:33:08 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2024-06-25 12:08:48 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -6,7 +6,7 @@ @@ -15,6 +15,6 @@ return {id, pthread_self()}; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - absl::optional<uintptr_t> maybe_stack_base = + std::optional<uintptr_t> maybe_stack_base = GetThreadStackBaseAddress(id, pthread_self()); return {id, maybe_stack_base}; diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h index b93e56d633b2..be5ebed05b7e 100644 --- a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,6 +1,6 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2023-03-13 07:33:08 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2024-06-25 12:08:48 UTC +++ base/profiler/sampling_profiler_thread_token.h -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #if BUILDFLAG(IS_ANDROID) #include <pthread.h> @@ -9,7 +9,7 @@ #include <stdint.h> #endif -@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken { +@@ -27,7 +27,7 @@ struct SamplingProfilerThreadToken { PlatformThreadId id; #if BUILDFLAG(IS_ANDROID) pthread_t pthread_id; diff --git a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc index cf7ce69b0f38..2907c038f053 100644 --- a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc +++ b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_base_address_posix.cc.orig 2023-03-13 07:33:08 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/profiler/stack_base_address_posix.cc @@ -17,6 +17,10 @@ #include "base/files/scoped_file.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_CHROMEOS) extern "C" void* __libc_stack_end; #endif -@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas +@@ -45,7 +49,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { @@ -48,3 +48,12 @@ const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; return base_address; } +@@ -80,7 +100,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla + // trying to work around the problem. + return std::nullopt; + #else +- const bool is_main_thread = id == GetCurrentProcId(); ++ const bool is_main_thread = id == checked_cast<PlatformThreadId>(GetCurrentProcId()); + if (is_main_thread) { + #if BUILDFLAG(IS_ANDROID) + // The implementation of pthread_getattr_np() in Bionic reads proc/self/maps diff --git a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index 569610282815..cc6323c1e7f9 100644 --- a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-07-24 14:27:53 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2024-06-25 12:08:48 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -36,7 +36,7 @@ +@@ -42,7 +42,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 370afbaca7c5..64a1e4c8bd62 100644 --- a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,9 +1,9 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ + #include <intrin.h> #include <malloc.h> - #include <windows.h> -#else +#elif !BUILDFLAG(IS_BSD) #include <alloca.h> diff --git a/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc index 8433915218f7..e02ffa7bc97a 100644 --- a/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,18 +1,18 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2022-12-01 10:35:46 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -13,7 +13,7 @@ +@@ -19,7 +19,7 @@ + #include "base/process/process_handle.h" #include "build/build_config.h" - #include "third_party/abseil-cpp/absl/types/optional.h" -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) #include "base/profiler/stack_base_address_posix.h" #endif -@@ -22,7 +22,7 @@ namespace base { +@@ -28,7 +28,7 @@ namespace base { std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create( SamplingProfilerThreadToken thread_token) { - absl::optional<uintptr_t> base_address; + std::optional<uintptr_t> base_address; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base_address = thread_token.stack_base_address; diff --git a/www/iridium/files/patch-base_rand__util.h b/www/iridium/files/patch-base_rand__util.h index f94ebde35b68..864efef0a114 100644 --- a/www/iridium/files/patch-base_rand__util.h +++ b/www/iridium/files/patch-base_rand__util.h @@ -1,6 +1,6 @@ ---- base/rand_util.h.orig 2024-02-04 14:46:08 UTC +--- base/rand_util.h.orig 2024-06-25 12:08:48 UTC +++ base/rand_util.h -@@ -136,7 +136,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -147,7 +147,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/iridium/files/patch-base_rand__util__posix.cc b/www/iridium/files/patch-base_rand__util__posix.cc index ba6e34af5213..72dbc30893f4 100644 --- a/www/iridium/files/patch-base_rand__util__posix.cc +++ b/www/iridium/files/patch-base_rand__util__posix.cc @@ -1,6 +1,6 @@ ---- base/rand_util_posix.cc.orig 2023-11-22 14:00:11 UTC +--- base/rand_util_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/rand_util_posix.cc -@@ -22,7 +22,7 @@ +@@ -28,7 +28,7 @@ #include "base/time/time.h" #include "build/build_config.h" @@ -8,8 +8,8 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) #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. -@@ -39,6 +39,7 @@ namespace base { + // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. +@@ -45,6 +45,7 @@ namespace base { namespace { @@ -17,7 +17,7 @@ #if BUILDFLAG(IS_AIX) // AIX has no 64-bit support for O_CLOEXEC. static constexpr int kOpenFlags = O_RDONLY; -@@ -63,10 +64,11 @@ class URandomFd { +@@ -69,10 +70,11 @@ class URandomFd { private: const int fd_; }; @@ -30,26 +30,26 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -176,6 +178,7 @@ bool UseBoringSSLForRandBytes() { +@@ -182,6 +184,7 @@ bool UseBoringSSLForRandBytes() { namespace { - void RandBytes(void* output, size_t output_length, bool avoid_allocation) { + void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { +#if !BUILDFLAG(IS_BSD) #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -214,6 +217,9 @@ void RandBytes(void* output, size_t output_length, boo - const bool success = - ReadFromFD(urandom_fd, static_cast<char*>(output), output_length); +@@ -220,6 +223,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi + const int urandom_fd = GetUrandomFD(); + const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); +#else -+ arc4random_buf(static_cast<char*>(output), output_length); ++ arc4random_buf(output.data(), output.size()); +#endif } } // namespace -@@ -233,9 +239,11 @@ void RandBytes(void* output, size_t output_length) { - RandBytes(output, output_length, /*avoid_allocation=*/false); +@@ -239,9 +245,11 @@ void RandBytes(span<uint8_t> output) { + RandBytesInternal(output, /*avoid_allocation=*/false); } +#if !BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc index 6c3b33f1a89d..e9e3ad133bce 100644 --- a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc +++ b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc @@ -1,6 +1,6 @@ ---- base/strings/safe_sprintf_unittest.cc.orig 2023-03-13 07:33:08 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -733,6 +733,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -740,6 +740,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { #endif } @@ -8,7 +8,7 @@ TEST(SafeSPrintfTest, EmitNULL) { char buf[40]; #if defined(__GNUC__) -@@ -749,6 +750,7 @@ TEST(SafeSPrintfTest, EmitNULL) { +@@ -756,6 +757,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/iridium/files/patch-base_synchronization_lock__impl.h b/www/iridium/files/patch-base_synchronization_lock__impl.h index 03f3b8aaad99..98aa6f39012a 100644 --- a/www/iridium/files/patch-base_synchronization_lock__impl.h +++ b/www/iridium/files/patch-base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- base/synchronization/lock_impl.h.orig 2023-04-22 17:45:15 UTC +--- base/synchronization/lock_impl.h.orig 2024-06-25 12:08:48 UTC +++ base/synchronization/lock_impl.h -@@ -104,6 +104,10 @@ void LockImpl::Unlock() { +@@ -106,6 +106,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -124,6 +128,9 @@ void LockImpl::Unlock() { +@@ -126,6 +130,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/iridium/files/patch-base_syslog__logging.cc b/www/iridium/files/patch-base_syslog__logging.cc index 5ce641d444ca..93f9f649cb10 100644 --- a/www/iridium/files/patch-base_syslog__logging.cc +++ b/www/iridium/files/patch-base_syslog__logging.cc @@ -1,6 +1,6 @@ ---- base/syslog_logging.cc.orig 2022-03-28 18:11:04 UTC +--- base/syslog_logging.cc.orig 2024-06-25 12:08:48 UTC +++ base/syslog_logging.cc -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ #include "base/strings/string_util.h" #include "base/win/scoped_handle.h" #include "base/win/win_util.h" @@ -9,7 +9,7 @@ // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include <syslog.h> -@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() { +@@ -149,7 +149,7 @@ EventLogMessage::~EventLogMessage() { if (user_sid != nullptr) ::LocalFree(user_sid); diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h index f4852c87786b..960b7e292e1f 100644 --- a/www/iridium/files/patch-base_system_sys__info.h +++ b/www/iridium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2024-02-04 14:46:08 UTC +--- base/system/sys_info.h.orig 2024-06-25 12:08:48 UTC +++ base/system/sys_info.h -@@ -321,6 +321,8 @@ class BASE_EXPORT SysInfo { +@@ -325,6 +325,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -333,7 +335,7 @@ class BASE_EXPORT SysInfo { +@@ -337,7 +339,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-base_system_sys__info__freebsd.cc b/www/iridium/files/patch-base_system_sys__info__freebsd.cc index d77a0e55a002..3e21aa3f067f 100644 --- a/www/iridium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_freebsd.cc.orig 2022-10-05 07:34:01 UTC +--- base/system/sys_info_freebsd.cc.orig 2024-06-25 12:08:48 UTC +++ base/system/sys_info_freebsd.cc @@ -9,30 +9,106 @@ #include <sys/sysctl.h> @@ -35,7 +35,7 @@ + r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); + + if (r == -1) { - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); return 0; } - return static_cast<int64_t>(pages) * page_size; @@ -93,7 +93,7 @@ size_t size = sizeof(limit); + if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); return 0; } + diff --git a/www/iridium/files/patch-base_system_sys__info__openbsd.cc b/www/iridium/files/patch-base_system_sys__info__openbsd.cc index e3854185bddd..baa3caf88e90 100644 --- a/www/iridium/files/patch-base_system_sys__info__openbsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__openbsd.cc @@ -1,6 +1,14 @@ ---- base/system/sys_info_openbsd.cc.orig 2023-11-22 14:00:11 UTC +--- base/system/sys_info_openbsd.cc.orig 2024-06-25 12:08:48 UTC +++ base/system/sys_info_openbsd.cc -@@ -12,6 +12,7 @@ +@@ -3,7 +3,6 @@ + // found in the LICENSE file. + + #include "base/system/sys_info.h" +- + #include <stddef.h> + #include <stdint.h> + #include <sys/param.h> +@@ -12,6 +11,7 @@ #include "base/notreached.h" #include "base/posix/sysctl.h" @@ -8,14 +16,13 @@ namespace { -@@ -27,9 +28,15 @@ uint64_t AmountOfMemory(int pages_name) { +@@ -27,9 +27,14 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { +// pledge(2) -+int64_t aofpmem = 0; -+int64_t aofapmem = 0; -+int64_t shmmax = 0; ++uint64_t aofpmem = 0; ++uint64_t shmmax = 0; +char cpumodel[256]; + // static @@ -25,7 +32,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -41,10 +48,26 @@ int SysInfo::NumberOfProcessors() { +@@ -41,10 +46,26 @@ int SysInfo::NumberOfProcessors() { // static uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -53,7 +60,7 @@ uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { // We should add inactive file-backed memory also but there is no such // information from OpenBSD unfortunately. -@@ -56,16 +79,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -56,16 +77,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); @@ -61,7 +68,7 @@ + if (shmmax) + goto out; if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) { - NOTREACHED(); + NOTREACHED_IN_MIGRATION(); return 0; } - return static_cast<uint64_t>(limit); diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index 2cd98a42164f..9a1c52ee3931 100644 --- a/www/iridium/files/patch-base_system_sys__info__posix.cc +++ b/www/iridium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2024-02-04 14:46:08 UTC +--- base/system/sys_info_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/system/sys_info_posix.cc -@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -118,7 +118,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -174,7 +174,7 @@ int SysInfo::NumberOfProcessors() { +@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -264,6 +264,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -265,6 +265,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/iridium/files/patch-base_system_sys__info__unittest.cc b/www/iridium/files/patch-base_system_sys__info__unittest.cc index e7f223684ba5..22963781b866 100644 --- a/www/iridium/files/patch-base_system_sys__info__unittest.cc +++ b/www/iridium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2023-08-28 20:17:35 UTC +--- base/system/sys_info_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/system/sys_info_unittest.cc -@@ -263,12 +263,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -264,12 +264,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) || \ diff --git a/www/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc index 69f98fd9888b..c1e93d8baf8a 100644 --- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2023-11-22 14:00:11 UTC +--- base/test/launcher/test_launcher.cc.orig 2024-06-25 12:08:48 UTC +++ base/test/launcher/test_launcher.cc -@@ -70,6 +70,7 @@ +@@ -74,6 +74,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/iridium/files/patch-base_test_test__file__util__posix.cc b/www/iridium/files/patch-base_test_test__file__util__posix.cc index 81349f73433d..3de0bce58e6d 100644 --- a/www/iridium/files/patch-base_test_test__file__util__posix.cc +++ b/www/iridium/files/patch-base_test_test__file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/test/test_file_util_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/test/test_file_util_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/test/test_file_util_posix.cc -@@ -88,7 +88,7 @@ void SyncPageCacheToDisk() { +@@ -91,7 +91,7 @@ void SyncPageCacheToDisk() { } #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/iridium/files/patch-base_threading_hang__watcher.cc b/www/iridium/files/patch-base_threading_hang__watcher.cc index e31a6641480e..814bf46733e8 100644 --- a/www/iridium/files/patch-base_threading_hang__watcher.cc +++ b/www/iridium/files/patch-base_threading_hang__watcher.cc @@ -1,6 +1,6 @@ ---- base/threading/hang_watcher.cc.orig 2023-10-21 11:51:27 UTC +--- base/threading/hang_watcher.cc.orig 2024-06-25 12:08:48 UTC +++ base/threading/hang_watcher.cc -@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p +@@ -332,7 +332,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher); diff --git a/www/iridium/files/patch-base_threading_platform__thread.h b/www/iridium/files/patch-base_threading_platform__thread.h new file mode 100644 index 000000000000..dd0f5e9a2423 --- /dev/null +++ b/www/iridium/files/patch-base_threading_platform__thread.h @@ -0,0 +1,11 @@ +--- base/threading/platform_thread.h.orig 2024-06-25 12:08:48 UTC ++++ base/threading/platform_thread.h +@@ -49,6 +49,8 @@ typedef DWORD PlatformThreadId; + typedef zx_koid_t PlatformThreadId; + #elif BUILDFLAG(IS_APPLE) + typedef mach_port_t PlatformThreadId; ++#elif BUILDFLAG(IS_BSD) ++typedef uint64_t PlatformThreadId; + #elif BUILDFLAG(IS_POSIX) + typedef pid_t PlatformThreadId; + #endif diff --git a/www/iridium/files/patch-base_threading_platform__thread__bsd.cc b/www/iridium/files/patch-base_threading_platform__thread__bsd.cc index 9c77345f1510..9b36b8224c21 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__bsd.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__bsd.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_bsd.cc.orig 2023-10-21 11:51:27 UTC +--- base/threading/platform_thread_bsd.cc.orig 2024-06-25 12:08:48 UTC +++ base/threading/platform_thread_bsd.cc @@ -0,0 +1,31 @@ +// Copyright 2023 The Chromium Authors @@ -20,9 +20,9 @@ + return false; +} + -+absl::optional<ThreadPriorityForTest> ++std::optional<ThreadPriorityForTest> +GetCurrentThreadPriorityForPlatformForTest() { -+ return absl::nullopt; ++ return std::nullopt; +} +} // namespace internal + diff --git a/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc b/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc index 8a73cb975cfa..ed397d684cdd 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__internal__posix.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_internal_posix.cc.orig 2023-10-21 11:51:27 UTC +--- base/threading/platform_thread_internal_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/threading/platform_thread_internal_posix.cc -@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest +@@ -42,7 +42,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest } int GetCurrentThreadNiceValue() { diff --git a/www/iridium/files/patch-base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_threading_platform__thread__posix.cc index c80b8494f40b..e017242243d8 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__posix.cc @@ -1,13 +1,12 @@ ---- base/threading/platform_thread_posix.cc.orig 2023-10-21 11:51:27 UTC +--- base/threading/platform_thread_posix.cc.orig 2024-06-25 12:08:48 UTC +++ base/threading/platform_thread_posix.cc -@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) { +@@ -77,11 +77,11 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); --#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) -+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) && !BUILDFLAG(IS_BSD) - partition_alloc::internal::PCScan::NotifyThreadCreated( - partition_alloc::internal::GetStackPointer()); +-#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) ++#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD) + partition_alloc::internal::StackTopRegistry::Get().NotifyThreadCreated(); #endif -#if !BUILDFLAG(IS_NACL) @@ -15,7 +14,16 @@ #if BUILDFLAG(IS_APPLE) PlatformThread::SetCurrentThreadRealtimePeriodValue( delegate->GetRealtimePeriod()); -@@ -353,7 +353,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t +@@ -265,6 +265,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { + return reinterpret_cast<int32_t>(pthread_self()); + #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX) + return pthread_self(); ++#elif BUILDFLAG(IS_BSD) ++ return reinterpret_cast<uint64_t>(pthread_self()); + #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX) + return reinterpret_cast<int64_t>(pthread_self()); + #endif +@@ -355,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t // static bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { @@ -24,7 +32,7 @@ return false; #else if (from >= to) { -@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -376,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); @@ -34,7 +42,7 @@ #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) return; -@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -398,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, // static ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() { diff --git a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc index 18ac2c8380f9..c625a895569e 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_unittest.cc.orig 2023-11-22 14:00:11 UTC +--- base/threading/platform_thread_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ base/threading/platform_thread_unittest.cc -@@ -32,7 +32,7 @@ +@@ -38,7 +38,7 @@ #include "base/time/time.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -423,7 +423,7 @@ TEST(PlatformThreadTest, +@@ -429,7 +429,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanChangeThreadType) { @@ -18,7 +18,7 @@ // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level unless we are root (euid == 0). bool kCanIncreasePriority = false; -@@ -706,12 +706,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -713,12 +713,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc index 638675025a86..8ce65ffeea48 100644 --- a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2023-10-21 11:51:27 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2024-06-25 12:08:48 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -25,6 +25,8 @@ +@@ -29,6 +29,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,16 +9,16 @@ #else #include <malloc.h> #endif -@@ -188,7 +190,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -187,7 +189,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) && \ + #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ + (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ - !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, -@@ -359,6 +361,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -391,6 +393,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/iridium/files/patch-base_trace__event_memory__dump__manager.cc b/www/iridium/files/patch-base_trace__event_memory__dump__manager.cc index 71b039fdc759..4b000a79d34e 100644 --- a/www/iridium/files/patch-base_trace__event_memory__dump__manager.cc +++ b/www/iridium/files/patch-base_trace__event_memory__dump__manager.cc @@ -1,6 +1,6 @@ ---- base/trace_event/memory_dump_manager.cc.orig 2022-04-01 07:48:30 UTC +--- base/trace_event/memory_dump_manager.cc.orig 2024-06-25 12:08:48 UTC +++ base/trace_event/memory_dump_manager.cc -@@ -82,7 +82,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP +@@ -87,7 +87,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP #if defined(MALLOC_MEMORY_TRACING_SUPPORTED) MallocDumpProvider::kAllocatedObjects; #else diff --git a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc index 9229adeb5728..eb61179260e0 100644 --- a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2022-10-05 07:34:01 UTC +--- base/trace_event/process_memory_dump.cc.orig 2024-06-25 12:08:48 UTC +++ base/trace_event/process_memory_dump.cc -@@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -118,7 +118,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); @@ -9,12 +9,12 @@ std::unique_ptr<char[]> vec(new char[max_vec_size]); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -134,7 +134,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -140,7 +140,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; -#elif BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/851760): Implement counting resident bytes. + // TODO(crbug.com/42050620): Implement counting resident bytes. // For now, log and avoid unused variable warnings. NOTIMPLEMENTED_LOG_ONCE(); diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn index 2d36b7b2a607..414a5c35a9ed 100644 --- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2023-01-17 19:19:00 UTC +--- build/config/BUILDCONFIG.gn.orig 2024-06-25 12:08:48 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -225,6 +226,10 @@ if (host_toolchain == "") { +@@ -231,6 +232,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -268,6 +273,8 @@ if (target_os == "android") { +@@ -274,6 +279,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -302,7 +309,11 @@ is_android = current_os == "android" +@@ -308,7 +315,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/iridium/files/patch-build_config_clang_BUILD.gn b/www/iridium/files/patch-build_config_clang_BUILD.gn new file mode 100644 index 000000000000..f1bb599af891 --- /dev/null +++ b/www/iridium/files/patch-build_config_clang_BUILD.gn @@ -0,0 +1,11 @@ +--- build/config/clang/BUILD.gn.orig 2024-06-25 12:08:48 UTC ++++ build/config/clang/BUILD.gn +@@ -214,7 +214,7 @@ template("clang_lib") { + + # Adds a dependency on the Clang runtime library clang_rt.builtins. + clang_lib("compiler_builtins") { +- if (!toolchain_has_rust) { ++ if (!toolchain_has_rust || is_bsd) { + # Since there's no Rust in the toolchain, there's no concern that we'll use + # the Rust stdlib's intrinsics here. + # diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index 806f4835600e..30fa0c1c9c93 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- build/config/compiler/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ build/config/compiler/BUILD.gn -@@ -202,7 +202,7 @@ declare_args() { +@@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. @@ -9,7 +9,7 @@ } declare_args() { -@@ -266,13 +266,16 @@ config("default_include_dirs") { +@@ -251,13 +251,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -22,22 +22,12 @@ ] } + if (current_cpu == "x86" && is_openbsd) { -+ ldflags = [ "-Wl,-z,notext" ] ++ ldflags = [ "-Wl,-z,notext", "-Wl,--strip-all" ] + } } # compiler --------------------------------------------------------------------- -@@ -320,7 +323,9 @@ config("compiler") { - - configs += [ - # See the definitions below. -+ ":clang_revision", - ":rustc_revision", -+ ":compiler_cpu_abi", - ":compiler_codegen", - ":compiler_deterministic", - ] -@@ -516,6 +521,10 @@ config("compiler") { +@@ -499,6 +502,10 @@ config("compiler") { } } @@ -47,8 +37,17 @@ + # Linux-specific compiler flags setup. # ------------------------------------ - if (use_gold) { -@@ -1113,7 +1122,7 @@ config("compiler_cpu_abi") { + if (use_icf && (!is_apple || use_lld)) { +@@ -545,7 +552,7 @@ config("compiler") { + ldflags += [ "-Wl,-z,keep-text-section-prefix" ] + } + +- if (is_clang && !is_nacl && current_os != "zos") { ++ if (is_clang && !is_nacl && current_os != "zos" && !is_bsd) { + cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] + if (save_reproducers_on_lld_crash && use_lld) { + ldflags += [ +@@ -1173,7 +1180,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -57,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1128,7 +1137,7 @@ config("compiler_cpu_abi") { +@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -66,103 +65,44 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1474,6 +1483,27 @@ config("compiler_deterministic") { - } +@@ -1523,7 +1530,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. +- if (is_nacl) { ++ if (is_nacl || is_bsd) { + # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. + cflags += [ + "-Xclang", +@@ -1575,7 +1582,7 @@ config("compiler_deterministic") { } -+config("clang_revision") { + config("clang_revision") { +- if (is_clang && clang_base_path == default_clang_base_path) { + if (is_clang && !is_bsd && clang_base_path == default_clang_base_path) { -+ update_args = [ -+ "--print-revision", -+ "--verify-version=$clang_version", -+ ] -+ if (llvm_force_head_revision) { -+ update_args += [ "--llvm-force-head-revision" ] -+ } -+ clang_revision = exec_script("//tools/clang/scripts/update.py", -+ update_args, -+ "trim string") -+ -+ # This is here so that all files get recompiled after a clang roll and -+ # when turning clang on or off. (defines are passed via the command line, -+ # and build system rebuild things when their commandline changes). Nothing -+ # should ever read this define. -+ defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] -+ } -+} -+ - config("rustc_revision") { - if (rustc_revision != "") { - # Similar to the above config, this is here so that all files get recompiled -@@ -1739,7 +1769,7 @@ config("default_warnings") { - "-Wno-ignored-pragma-optimize", - ] + update_args = [ + "--print-revision", + "--verify-version=$clang_version", +@@ -1889,9 +1896,6 @@ config("default_warnings") { -- if (!is_nacl) { -+ if (!is_nacl && !is_bsd) { - cflags += [ - # TODO(crbug.com/1343975) Evaluate and possibly enable. - "-Wno-deprecated-builtins", -@@ -1923,7 +1953,7 @@ config("no_chromium_code") { - # third-party libraries. - "-Wno-c++11-narrowing", - ] -- if (!is_nacl) { -+ if (!is_nacl && !is_freebsd) { - cflags += [ - # Disabled for similar reasons as -Wunused-variable. - "-Wno-unused-but-set-variable", -@@ -2226,8 +2256,7 @@ config("default_stack_frames") { - } - - # Default "optimization on" config. --config("optimize") { } --config("xoptimize") { -+config("optimize") { - if (is_win) { - if (chrome_pgo_phase != 2) { - # Favor size over speed, /O1 must be before the common flags. -@@ -2286,8 +2315,7 @@ config("xoptimize") { - } + # TODO(crbug.com/40286317): Evaluate and possibly enable. + "-Wno-vla-extension", +- +- # TODO(crbug.com/40284799): Fix and re-enable. +- "-Wno-thread-safety-reference-return", + ] - # Turn off optimizations. --config("no_optimize") { } --config("xno_optimize") { -+config("no_optimize") { - if (is_win) { - cflags = [ - "/Od", # Disable optimization. -@@ -2327,8 +2355,7 @@ config("xno_optimize") { - # Turns up the optimization level. On Windows, this implies whole program - # optimization and link-time code generation which is very expensive and should - # be used sparingly. --config("optimize_max") { } --config("xoptimize_max") { -+config("optimize_max") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -2361,8 +2388,7 @@ config("xoptimize_max") { - # - # TODO(crbug.com/621335) - rework how all of these configs are related - # so that we don't need this disclaimer. --config("optimize_speed") { } --config("xoptimize_speed") { -+config("optimize_speed") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -2388,8 +2414,7 @@ config("xoptimize_speed") { - } - } + cflags_cc += [ +@@ -1899,7 +1903,7 @@ config("default_warnings") { + "-Wenum-compare-conditional", + ] --config("optimize_fuzzing") { } --config("xoptimize_fuzzing") { -+config("optimize_fuzzing") { - cflags = [ "-O1" ] + common_optimize_on_cflags - rustflags = [ "-Copt-level=1" ] - ldflags = common_optimize_on_ldflags -@@ -2457,7 +2482,7 @@ config("afdo_optimize_size") { +- if (!is_nacl) { ++ if (!is_nacl && !is_openbsd) { + cflags_cc += [ + # TODO(crbug.com/41486292): Fix and re-enable. + "-Wno-c++11-narrowing-const-reference", +@@ -2616,7 +2620,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") { @@ -171,7 +111,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2484,7 +2509,7 @@ config("afdo") { +@@ -2643,7 +2647,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -180,17 +120,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2522,8 +2547,7 @@ config("win_pdbaltpath") { - } - - # Full symbols. --config("symbols") { } --config("xsymbols") { -+config("symbols") { - rustflags = [] - if (is_win) { - if (is_clang) { -@@ -2649,7 +2673,8 @@ config("xsymbols") { +@@ -2808,7 +2812,8 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } @@ -198,25 +128,5 @@ + if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos" && + !is_bsd) { if (is_apple) { - # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. + # TODO(crbug.com/40117949): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. -@@ -2672,8 +2697,7 @@ config("xsymbols") { - # Minimal symbols. - # This config guarantees to hold symbol for stack trace which are shown to user - # when crash happens in unittests running on buildbot. --config("minimal_symbols") { } --config("xminimal_symbols") { -+config("minimal_symbols") { - rustflags = [] - if (is_win) { - # Functions, files, and line tables only. -@@ -2758,8 +2782,7 @@ config("xminimal_symbols") { - # This configuration contains function names only. That is, the compiler is - # told to not generate debug information and the linker then just puts function - # names in the final debug information. --config("no_symbols") { } --config("xno_symbols") { -+config("no_symbols") { - if (is_win) { - ldflags = [ "/DEBUG" ] - diff --git a/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn b/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn deleted file mode 100644 index 057d28b9fc28..000000000000 --- a/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ ---- build/config/compiler/pgo/BUILD.gn.orig 2023-11-22 14:00:11 UTC -+++ build/config/compiler/pgo/BUILD.gn -@@ -139,13 +139,14 @@ config("pgo_optimization_flags") { - - # Enable basic block layout based on the extended TSP problem. This aims to - # improve icache utilization and reduce the binary size. -- if (use_thin_lto) { -+ # __clang_major__ >= 15 -+ if (use_thin_lto && !is_bsd) { - if (is_win) { - ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ] - } else { - ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ] - } -- } else { -+ } else if (!is_bsd) { - cflags += [ - "-mllvm", - "-enable-ext-tsp-block-placement=1", diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni new file mode 100644 index 000000000000..f576b928e740 --- /dev/null +++ b/www/iridium/files/patch-build_config_rust.gni @@ -0,0 +1,13 @@ +--- build/config/rust.gni.orig 2024-06-25 12:08:48 UTC ++++ build/config/rust.gni +@@ -272,6 +272,10 @@ if (is_linux || is_chromeos) { + } + } + ++if (is_bsd) { ++ rust_abi_target = string_replace(rust_abi_target, "linux-gnu", current_os) ++} ++ + assert(!toolchain_has_rust || rust_abi_target != "") + + # This variable is passed to the Rust libstd build. diff --git a/www/iridium/files/patch-build_rust_std_BUILD.gn b/www/iridium/files/patch-build_rust_std_BUILD.gn new file mode 100644 index 000000000000..9c1493819840 --- /dev/null +++ b/www/iridium/files/patch-build_rust_std_BUILD.gn @@ -0,0 +1,10 @@ +--- build/rust/std/BUILD.gn.orig 2024-06-25 12:08:48 UTC ++++ build/rust/std/BUILD.gn +@@ -90,7 +90,6 @@ if (toolchain_has_rust) { + # don't need to pass to the C++ linker because they're used for specialized + # purposes. + skip_stdlib_files = [ +- "profiler_builtins", + "rustc_std_workspace_alloc", + "rustc_std_workspace_core", + "rustc_std_workspace_std", diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index 9ca4cf89033b..7381d7505bc9 100644 --- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2024-02-04 14:46:08 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2024-06-25 12:08:48 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { +@@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -15,7 +15,7 @@ # (including clang). # @@ -878,22 +885,12 @@ template("gcc_toolchain") { - # use_gold too. + # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { - _path = "$clang_base_path/bin" diff --git a/www/iridium/files/patch-build_toolchain_toolchain.gni b/www/iridium/files/patch-build_toolchain_toolchain.gni index b618a315da68..9dfbb8528a00 100644 --- a/www/iridium/files/patch-build_toolchain_toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/toolchain.gni.orig 2023-11-22 14:00:11 UTC +--- build/toolchain/toolchain.gni.orig 2024-06-25 12:08:48 UTC +++ build/toolchain/toolchain.gni -@@ -72,7 +72,7 @@ if (host_os == "mac") { +@@ -68,7 +68,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" diff --git a/www/iridium/files/patch-cc_BUILD.gn b/www/iridium/files/patch-cc_BUILD.gn index 11f43789124d..f8d17a2dac3b 100644 --- a/www/iridium/files/patch-cc_BUILD.gn +++ b/www/iridium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- cc/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ cc/BUILD.gn -@@ -676,7 +676,7 @@ cc_test_static_library("test_support") { +@@ -677,7 +677,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } if (skia_use_dawn) { -@@ -931,7 +931,6 @@ cc_test("cc_unittests") { +@@ -936,7 +936,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/iridium/files/patch-cc_base_features.cc b/www/iridium/files/patch-cc_base_features.cc index f8efa7d28188..06c7b117eb44 100644 --- a/www/iridium/files/patch-cc_base_features.cc +++ b/www/iridium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2023-11-22 14:00:11 UTC +--- cc/base/features.cc.orig 2024-06-25 12:08:48 UTC +++ cc/base/features.cc -@@ -84,7 +84,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, +@@ -88,7 +88,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", diff --git a/www/iridium/files/patch-cc_paint_paint__op__writer.h b/www/iridium/files/patch-cc_paint_paint__op__writer.h deleted file mode 100644 index bc925cb3bb78..000000000000 --- a/www/iridium/files/patch-cc_paint_paint__op__writer.h +++ /dev/null @@ -1,41 +0,0 @@ ---- cc/paint/paint_op_writer.h.orig 2024-02-04 14:46:08 UTC -+++ cc/paint/paint_op_writer.h -@@ -122,10 +122,17 @@ class CC_PAINT_EXPORT PaintOpWriter { - // easier to keep serialized size calculation in sync with serialization and - // deserialization, and make it possible to allow dynamic sizing for some - // data types (see the specialized/overloaded functions). -+#if defined(__clang__) && (__clang_major__ >= 15) - template <typename T> - static constexpr size_t SerializedSize(); - template <typename T> - static constexpr size_t SerializedSize(const T& data); -+#else -+ template <typename T> -+ static size_t SerializedSize(); -+ template <typename T> -+ static size_t SerializedSize(const T& data); -+#endif - static size_t SerializedSize(const PaintImage& image); - static size_t SerializedSize(const PaintRecord& record); - static size_t SerializedSize(const SkHighContrastConfig& config); -@@ -463,12 +470,20 @@ constexpr size_t PaintOpWriter::SerializedSize<SkGainm - } - - template <typename T> -+#if defined(__clang__) && (__clang_major__ >= 15) - constexpr size_t PaintOpWriter::SerializedSize() { -+#else -+size_t PaintOpWriter::SerializedSize() { -+#endif - static_assert(std::is_arithmetic_v<T> || std::is_enum_v<T>); - return SerializedSizeSimple<T>(); - } - template <typename T> -+#if defined(__clang__) && (__clang_major__ >= 15) - constexpr size_t PaintOpWriter::SerializedSize(const T& data) { -+#else -+size_t PaintOpWriter::SerializedSize(const T& data) { -+#endif - return SerializedSizeSimple<T>(); - } - diff --git a/www/iridium/files/patch-chrome_app_app__management__strings.grdp b/www/iridium/files/patch-chrome_app_app__management__strings.grdp deleted file mode 100644 index 7410a3ea3ec1..000000000000 --- a/www/iridium/files/patch-chrome_app_app__management__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/app_management_strings.grdp.orig 2024-02-04 14:46:08 UTC -+++ chrome/app/app_management_strings.grdp -@@ -194,7 +194,7 @@ - You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>. - </message> - </if> -- <if expr="is_fuchsia or is_linux"> -+ <if expr="is_fuchsia or is_posix"> - <message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations."> - You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>. - </message> diff --git a/www/iridium/files/patch-chrome_app_chrome__command__ids.h b/www/iridium/files/patch-chrome_app_chrome__command__ids.h index 47baca163351..61d35770d035 100644 --- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h @@ -1,4 +1,4 @@ ---- chrome/app/chrome_command_ids.h.orig 2023-10-21 11:51:27 UTC +--- chrome/app/chrome_command_ids.h.orig 2024-06-25 12:08:48 UTC +++ chrome/app/chrome_command_ids.h @@ -68,12 +68,12 @@ #define IDC_TOGGLE_MULTITASK_MENU 34050 @@ -9,7 +9,7 @@ #define IDC_USE_SYSTEM_TITLE_BAR 34051 #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. + // TODO(crbug.com/40118868): 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) #define IDC_RESTORE_WINDOW 34052 diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index e2195e983f46..47e16ac27ca3 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/app/chrome_main.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/app/chrome_main.cc -@@ -29,11 +29,11 @@ - #include "chrome/app/notification_metrics.h" +@@ -28,11 +28,11 @@ + #include "chrome/app/chrome_main_mac.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -14,7 +14,16 @@ #include "chrome/app/chrome_main_linux.h" #endif -@@ -138,7 +138,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -80,7 +80,7 @@ int ChromeMain(int argc, const char** argv) { + #error Unknown platform. + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + PossiblyDetermineFallbackChromeChannel(argv[0]); + #endif + +@@ -141,7 +141,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif @@ -23,7 +32,7 @@ AppendExtraArgumentsToCommandLine(command_line); #endif -@@ -167,7 +167,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -170,7 +170,7 @@ int ChromeMain(int argc, const char** argv) { headless_mode_handle = headless::InitHeadlessMode(); } else { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 2687138dd2bd..891babfce23a 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -145,7 +145,7 @@ +@@ -137,7 +137,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -189,16 +189,16 @@ +@@ -180,21 +180,21 @@ #include "v8/include/v8.h" #endif @@ -18,6 +18,12 @@ #include "base/environment.h" #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/scoped_xdg_activation_token_injector.h" + #include "ui/linux/display_server_utils.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" @@ -29,7 +35,16 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -337,7 +337,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -241,7 +241,7 @@ + #include "base/scoped_add_feature_flags.h" + #include "ui/base/ui_base_features.h" + #include "ui/ozone/public/ozone_platform.h" +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" + #endif + #endif // BUILDFLAG(IS_OZONE) +@@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,16 +53,34 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -422,7 +422,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) // 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) || -@@ -600,7 +600,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() { + } + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) + +-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) + void SIGTERMProfilingShutdown(int signal) { + content::Profiling::Stop(); + struct sigaction sigact; +@@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton( + // process can be exited. + ChromeProcessSingleton::CreateInstance(user_data_dir); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Read the xdg-activation token and set it in the command line for the + // duration of the notification in order to ensure this is propagated to an + // already running browser process if it exists. +@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +89,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. -@@ -690,7 +690,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -765,7 +765,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,25 +98,34 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -1044,7 +1044,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv - base::InitializeCpuReductionExperiment(); - base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); - base::sequence_manager::internal::ThreadController::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::InitFeaturesPostFieldTrial(); -@@ -1196,7 +1196,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -957,7 +957,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia + #if BUILDFLAG(IS_OZONE) + // Initialize Ozone platform and add required feature flags as per platform's + // properties. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); + #endif + ui::OzonePlatform::PreEarlyInitialization(); +@@ -1150,7 +1150,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv + const bool is_canary_dev = IsCanaryDev(); + const bool emit_crashes = + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + is_canary_dev; + #else + false; +@@ -1305,7 +1305,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom - // TODO(crbug.com/1052397): Revisit the macro expression once build flag + // TODO(crbug.com/40118868): 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) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1226,7 +1226,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1335,7 +1335,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +134,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1637,7 +1637,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1722,7 +1722,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -101,7 +143,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1746,7 +1746,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1821,7 +1821,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/iridium/files/patch-chrome_app_chromium__strings.grd b/www/iridium/files/patch-chrome_app_chromium__strings.grd deleted file mode 100644 index 6f360bb94e0a..000000000000 --- a/www/iridium/files/patch-chrome_app_chromium__strings.grd +++ /dev/null @@ -1,38 +0,0 @@ ---- chrome/app/chromium_strings.grd.orig 2024-02-04 14:46:08 UTC -+++ chrome/app/chromium_strings.grd -@@ -315,7 +315,7 @@ If you update this file, be sure also to update google - Welcome to Iridium; new browser window opened - </message> - </if> -- <if expr="is_macosx or is_linux"> -+ <if expr="is_macosx or is_posix"> - <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> - Welcome to Iridium - </message> -@@ -465,7 +465,7 @@ If you update this file, be sure also to update google - To get future browser updates, you'll need Windows 10 or later. This computer is using Windows 8.1. - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> - The browser may not function correctly because it is no longer supported on this Linux distribution - </message> -@@ -892,7 +892,7 @@ Permissions you've already given to websites and apps - </message> - </if> - -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> - <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false"> - Not used in Chromium. Placeholder to keep resource maps in sync. - </message> -@@ -1269,7 +1269,7 @@ Permissions you've already given to websites and apps - </message> - </if> - -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> - <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog." translateable="false"> - Not used in Chromium. Placeholder to keep resource maps in sync. - </message> diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd deleted file mode 100644 index 5772c9d713a1..000000000000 --- a/www/iridium/files/patch-chrome_app_generated__resources.grd +++ /dev/null @@ -1,92 +0,0 @@ ---- chrome/app/generated_resources.grd.orig 2024-02-04 14:46:08 UTC -+++ chrome/app/generated_resources.grd -@@ -2,7 +2,7 @@ - - <!-- - This file contains definitions of resources that will be translated for each --locale. The variables is_win, is_macosx, is_linux, and is_posix are available -+locale. The variables is_win, is_macosx, is_posix, and is_posix are available - for making strings OS specific. Other platform defines such as use_titlecase - are declared in tools/grit/grit_rule.gni. - --> -@@ -3609,7 +3609,7 @@ are declared in tools/grit/grit_rule.gni. - </if> - - <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> -- <if expr="is_win or is_linux"> -+ <if expr="is_win or is_posix"> - <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> - Device Credentials - </message> -@@ -5494,7 +5494,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> -@@ -6207,7 +6207,7 @@ Keep your key file in a safe place. You will need it t - Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> - Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. - </message> -@@ -6253,7 +6253,7 @@ Keep your key file in a safe place. You will need it t - Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> - Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. - </message> -@@ -10611,7 +10611,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW - <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available."> - Update - </message> -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> - <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available."> - Finish update - </message> -@@ -10958,7 +10958,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW - Google Pay - </message> - -- <if expr="is_linux"> -+ <if expr="is_posix"> - <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> -@@ -11956,7 +11956,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW - </message> - - <!-- Device Trust Consent dialog --> -- <if expr="is_win or is_macosx or is_linux or is_chromeos"> -+ <if expr="is_win or is_macosx or is_posix or is_chromeos"> - <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> - Share information about your device? - </message> -@@ -12364,7 +12364,7 @@ Please help our engineers fix this problem. Tell us wh - Set as default - </message> - -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> - Minimize - </message> -@@ -14571,7 +14571,7 @@ Please help our engineers fix this problem. Tell us wh - Open Anyway - </message> - -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> - <message name="IDS_UTILITY_PROCESS_SYSTEM_SIGNALS_NAME" desc="The name of the utility process used to collect system signals. Only spawned on Windows, Mac or Linux."> - System Signals Utilities - </message> diff --git a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd deleted file mode 100644 index 274c06c58980..000000000000 --- a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd +++ /dev/null @@ -1,38 +0,0 @@ ---- chrome/app/google_chrome_strings.grd.orig 2024-02-04 14:46:08 UTC -+++ chrome/app/google_chrome_strings.grd -@@ -301,7 +301,7 @@ chromium_strings.grd. --> - Welcome to Chrome; new browser window opened - </message> - </if> -- <if expr="is_macosx or is_linux"> -+ <if expr="is_macosx or is_posix"> - <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> - Welcome to Google Chrome - </message> -@@ -453,7 +453,7 @@ chromium_strings.grd. --> - To get future Google Chrome updates, you'll need Windows 10 or later. This computer is using Windows 8.1. - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> - Google Chrome may not function correctly because it is no longer supported on this Linux distribution - </message> -@@ -877,7 +877,7 @@ Permissions you've already given to websites and apps - </if> - </if> - -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> - <if expr="use_titlecase"> - <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item"> - Relaunch to Update - Your tabs will reopen -@@ -1302,7 +1302,7 @@ Permissions you've already given to websites and apps - </message> - </if> - -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> - <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog."> - Relaunch to finish Chrome update - </message> diff --git a/www/iridium/files/patch-chrome_app_profiles__strings.grdp b/www/iridium/files/patch-chrome_app_profiles__strings.grdp deleted file mode 100644 index 2ffd554cdf49..000000000000 --- a/www/iridium/files/patch-chrome_app_profiles__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/app/profiles_strings.grdp.orig 2023-10-21 11:51:27 UTC -+++ chrome/app/profiles_strings.grdp -@@ -54,7 +54,7 @@ - Add Profile... - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_PROFILES_ADD_PROFILE_LABEL" desc="Menu item for adding a new profile."> - Add profile... - </message> diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp deleted file mode 100644 index 5fc5b158c851..000000000000 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ /dev/null @@ -1,35 +0,0 @@ ---- chrome/app/settings_strings.grdp.orig 2023-11-22 14:00:11 UTC -+++ chrome/app/settings_strings.grdp -@@ -183,12 +183,12 @@ - Manage accessibility features - </message> - </if> -- <if expr="is_win or is_linux or is_macosx"> -+ <if expr="is_win or is_posix or is_macosx"> - <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE" desc="Title for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device."> - Swipe between pages - </message> - </if> -- <if expr="is_win or is_linux"> -+ <if expr="is_win or is_posix"> - <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE" desc="Subtitle for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device."> - Navigate back and forward with a swipe gesture - </message> -@@ -222,7 +222,7 @@ - Theme - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux"> - GTK - </message> -@@ -242,7 +242,7 @@ - Use Classic - </message> - </if> -- <if expr="not is_linux or is_chromeos or is_fuchsia"> -+ <if expr="not is_posix or is_chromeos or is_fuchsia"> - <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme."> - Reset to default - </message> diff --git a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd deleted file mode 100644 index ac06495ef63c..000000000000 --- a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2024-02-04 14:46:08 UTC -+++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -16,7 +16,7 @@ - <includes> - <if expr="_google_chrome"> - <then> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> -@@ -63,7 +63,7 @@ - <else> <!-- not _google_chrome --> - <if expr="_is_chrome_for_testing_branded"> - <then> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" /> -@@ -77,7 +77,7 @@ - </if> - </then> - <else> <!-- not _is_chrome_for_testing_branded --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> diff --git a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd deleted file mode 100644 index d9a99202061e..000000000000 --- a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd +++ /dev/null @@ -1,59 +0,0 @@ ---- chrome/app/theme/theme_resources.grd.orig 2023-10-21 11:51:27 UTC -+++ chrome/app/theme/theme_resources.grd -@@ -146,14 +146,14 @@ - </if> - <if expr="_google_chrome"> - <then> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/linux/product_logo_32_dev.png" /> - </then> -- <else> <!-- not is_linux --> -+ <else> <!-- not is_posix --> - <if expr="not is_android"> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> -@@ -161,7 +161,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> - </else> -- </if> <!-- is_linux --> -+ </if> <!-- is_posix --> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> - <if expr="not is_android"> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> -@@ -173,7 +173,7 @@ - <else> <!-- not _google_chrome --> - <if expr="_is_chrome_for_testing_branded"> - <then> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" /> -@@ -182,10 +182,10 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" /> - </else> -- </if> <!-- is_linux --> -+ </if> <!-- is_posix --> - </then> - <else> <!-- not _is_chrome_for_testing_branded --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> -@@ -194,7 +194,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> - </else> -- </if> <!-- is_linux --> -+ </if> <!-- is_posix --> - </else> - </if> <!-- _is_chrome_for_testing_branded --> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" /> diff --git a/www/iridium/files/patch-chrome_browser_BUILD.gn b/www/iridium/files/patch-chrome_browser_BUILD.gn index 608186430e19..cf8270080bbc 100644 --- a/www/iridium/files/patch-chrome_browser_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/BUILD.gn -@@ -6526,6 +6526,13 @@ static_library("browser") { +@@ -6708,6 +6708,13 @@ static_library("browser") { } } diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index 008c67b63265..22ecdeb64a16 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/about_flags.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/about_flags.cc -@@ -231,7 +231,7 @@ +@@ -238,7 +238,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,16 +9,16 @@ #include "base/allocator/buildflags.h" #endif -@@ -330,7 +330,7 @@ +@@ -328,7 +328,7 @@ #include "device/vr/public/cpp/features.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -344,7 +344,7 @@ + +@@ -337,7 +337,7 @@ #include "chrome/browser/win/titlebar_config.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -474,7 +474,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -482,7 +482,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,23 +36,61 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1463,7 +1463,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 - nullptr}}; +@@ -1265,7 +1265,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot + }; + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ + {"AtKeywordAcceleration", "true"}, + }; +@@ -1328,7 +1328,7 @@ const FeatureEntry::FeatureVariation + }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { - {"ShortcutBoostSearchScore", "1414"}, - {"ShortcutBoostUrlScore", "1414"}}; -@@ -5295,13 +5295,13 @@ const FeatureEntry kFeatureEntries[] = { +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { + {"ShortcutBoostSearchScore", "0"}, + {"ShortcutBoostNonTopHitThreshold", "0"}, +@@ -3679,7 +3679,7 @@ const flags_ui::FeatureEntry::FeatureVariation + std::size(kParcelTrackingTestDataOutForDelivery), nullptr}, + }; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const flags_ui::FeatureEntry::FeatureParam + kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}}; + const flags_ui::FeatureEntry::FeatureParam +@@ -4511,7 +4511,7 @@ const FeatureEntry kFeatureEntries[] = { + }, + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { + "fluent-overlay-scrollbars", + flag_descriptions::kFluentOverlayScrollbarsName, +@@ -4947,7 +4947,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, + #endif // !BUILDFLAG(IS_ANDROID) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, + flag_descriptions::kShortcutsNotAppsDescription, + kOsMac | kOsWin | kOsLinux, +@@ -5074,7 +5074,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, - flag_descriptions::kOzonePlatformHintDescription, kOsLinux, ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD) + {"pulseaudio-loopback-for-cast", + flag_descriptions::kPulseaudioLoopbackForCastName, + flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, +@@ -5090,7 +5090,7 @@ const FeatureEntry kFeatureEntries[] = { MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, #endif // BUILDFLAG(IS_LINUX) @@ -61,61 +99,43 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5612,7 +5612,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(feed::kFeedSportsCard)}, - #endif // BUILDFLAG(IS_ANDROID) - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, - flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, - FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -6251,7 +6251,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6011,7 +6011,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"omnibox-actions-ui-simplification", - flag_descriptions::kOmniboxActionsUISimplificationName, - flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop, -@@ -7087,7 +7087,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kParallelDownloadingDescription, kOsAll, - FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"omnibox-domain-suggestions", + flag_descriptions::kOmniboxDomainSuggestionsName, + flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, +@@ -6331,7 +6331,7 @@ const FeatureEntry kFeatureEntries[] = { + "OrganicRepeatableQueries")}, --#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)}, -@@ -8122,7 +8122,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)}, - #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, + flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, + FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, +@@ -7949,7 +7949,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCooperativeSchedulingDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8147,7 +8147,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)}, +@@ -7973,7 +7973,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, + #endif -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -8817,7 +8817,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"quick-commands", flag_descriptions::kQuickCommandsName, - flag_descriptions::kQuickCommandsDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -9088,7 +9088,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8810,7 +8810,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -124,57 +144,75 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -9130,7 +9130,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8849,7 +8849,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9688,7 +9688,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9086,7 +9086,7 @@ const FeatureEntry kFeatureEntries[] = { #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - {"document-picture-in-picture-api", - flag_descriptions::kDocumentPictureInPictureApiName, - flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -10795,7 +10795,7 @@ const FeatureEntry kFeatureEntries[] = { + {"policy-indication-for-managed-default-search", + flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, + flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, +@@ -9393,7 +9393,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"media-session-enter-picture-in-picture", + flag_descriptions::kMediaSessionEnterPictureInPictureName, + flag_descriptions::kMediaSessionEnterPictureInPictureDescription, +@@ -10303,7 +10303,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, - static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia), -@@ -10977,7 +10977,7 @@ const FeatureEntry kFeatureEntries[] = { - password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)}, - #endif + static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), +@@ -10341,7 +10341,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"show-featured-enterprise-site-search", + flag_descriptions::kShowFeaturedEnterpriseSiteSearchName, + flag_descriptions::kShowFeaturedEnterpriseSiteSearchDescription, kOsAll, +@@ -10456,7 +10456,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, + FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -11291,7 +11291,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsDesktop, FEATURE_VALUE_TYPE(blink::features::kPasswordStrongLabel)}, - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - {"attach-logs-to-autofill-rater-extentsion-report", - flag_descriptions::kAttachLogsToAutofillRaterExtensionReportName, - flag_descriptions::kAttachLogsToAutofillRaterExtensionReportDescription, -@@ -11300,7 +11300,7 @@ const FeatureEntry kFeatureEntries[] = { - kAttachLogsToAutofillRaterExtensionReport)}, +@@ -10805,7 +10805,7 @@ const FeatureEntry kFeatureEntries[] = { + trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - {"fill-multi-line", flag_descriptions::kFillMultiLineName, - flag_descriptions::kFillMultiLineDescription, kOsWin | kOsLinux | kOsMac, - FEATURE_VALUE_TYPE(compose::features::kFillMultiLine)}, +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"restart-to-gain-access-to-keychain", + flag_descriptions::kRestartToGainAccessToKeychainName, + flag_descriptions::kRestartToGainAccessToKeychainDescription, +@@ -11086,7 +11086,7 @@ const FeatureEntry kFeatureEntries[] = { + + // Controls the view mode for (history) sync screen. + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + {"minor-mode-restrictions-for-history-sync-opt-in", + flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInName, + flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInDescription, diff --git a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc index 319c2721ae37..bf28e58547c1 100644 --- a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,8 +1,8 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() { - TRACE_EVENT0("startup", "SetBrowserStartupIsComplete"); - g_startup_complete_flag.Get().Set(); +@@ -115,7 +115,7 @@ void SetBrowserStartupIsComplete() { + TRACE_EVENT_SCOPE_GLOBAL, "BrowserCount", browser_count); + GetStartupCompleteFlag().Set(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc index aa80b2a967cd..c080f9e8525a 100644 --- a/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc +++ b/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc @@ -1,11 +1,11 @@ ---- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/apps/app_service/publishers/extension_apps.cc -@@ -25,7 +25,7 @@ ExtensionApps::~ExtensionApps() = default; +@@ -23,7 +23,7 @@ ExtensionApps::ExtensionApps(AppServiceProxy* proxy) + ExtensionApps::~ExtensionApps() = default; bool ExtensionApps::Accepts(const extensions::Extension* extension) { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(), extension->id())) { return false; diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc index c76e215b2039..5d53ab58f94e 100644 --- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc +++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc @@ -1,20 +1,65 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ + #include "extensions/common/constants.h" #include "extensions/common/extension.h" - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" -@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con +@@ -86,7 +86,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, + if (launch_container == LaunchContainer::kLaunchContainerTab) + return false; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app_id)) { + return false; + } +@@ -118,7 +118,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof + if (launch_container != apps::LaunchContainer::kLaunchContainerTab) + return nullptr; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app_id)) { + return nullptr; + } +@@ -134,7 +134,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof + return app_tab; } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) bool OpenDeprecatedApplicationPrompt(Profile* profile, const std::string& app_id) { if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id)) +@@ -170,7 +170,7 @@ bool OpenExtensionApplicationWithReenablePrompt( + if (!GetPlatformApp(profile, app_id)) + return false; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app_id)) { + return false; + } +@@ -192,7 +192,7 @@ content::WebContents* OpenExtensionAppShortcutWindow(P + ->enabled_extensions() + .GetAppByURL(url); + if (app) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, app->id())) { + return nullptr; + } +@@ -215,7 +215,7 @@ void RecordExtensionAppLaunchOnTabRestored(Profile* pr + if (!extension) + return; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (OpenDeprecatedApplicationPrompt(profile, extension->id())) { + return; + } diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h index 1690620972dd..5cc69021077e 100644 --- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h +++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h @@ -1,11 +1,11 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.h -@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, - bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id); +@@ -38,7 +38,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, + content::WebContents* OpenExtensionApplicationTab(Profile* profile, + const std::string& app_id); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) // Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and // Chrome Apps are deprecated on the |profile|. Returns true if that was the // case, or false otherwise. diff --git a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index 45b4011112d7..877e7133b7bd 100644 --- a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -91,7 +91,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -89,7 +89,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc index 7edea0e350dc..c655b053a014 100644 --- a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -869,7 +869,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -872,7 +872,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc index 6b53b5dad712..55a8f158a9dc 100644 --- a/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc +++ b/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc @@ -1,4 +1,4 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/background/background_mode_optimizer.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/background/background_mode_optimizer.cc @@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod return nullptr; @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) { + // Private ctor. return base::WrapUnique(new BackgroundModeOptimizer()); - } diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc index f0384d1acdf5..da421daa3655 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.cc +++ b/www/iridium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/browser_features.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/browser_features.cc -@@ -28,7 +28,7 @@ BASE_FEATURE(kClosedTabCache, +@@ -82,7 +82,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -9,12 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -292,7 +292,7 @@ BASE_FEATURE(kOmniboxTriggerForNoStatePrefetch, - "OmniboxTriggerForNoStatePrefetch", - base::FEATURE_DISABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kPayloadTestComponent, - "PayloadTestComponent", +@@ -354,7 +354,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, + BASE_FEATURE(kSupportSearchSuggestionForPrerender2, + "SupportSearchSuggestionForPrerender2", + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-chrome_browser_browser__features.h b/www/iridium/files/patch-chrome_browser_browser__features.h deleted file mode 100644 index c970fe58f6cf..000000000000 --- a/www/iridium/files/patch-chrome_browser_browser__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/browser_features.h.orig 2024-02-04 14:46:08 UTC -+++ chrome/browser/browser_features.h -@@ -121,7 +121,7 @@ BASE_DECLARE_FEATURE(kAutocompleteActionPredictorConfi - - BASE_DECLARE_FEATURE(kOmniboxTriggerForNoStatePrefetch); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kPayloadTestComponent); - #endif - diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc index 0323c5a296c7..f2cf5a5ce752 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,7 +1,7 @@ ---- chrome/browser/browser_process_impl.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/browser_process_impl.cc -@@ -215,7 +215,7 @@ - #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" +@@ -229,7 +229,7 @@ + #include "chrome/browser/ui/profiles/profile_picker.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1212,7 +1212,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1284,7 +1284,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,9 +18,9 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1477,7 +1477,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1617,7 +1617,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. -#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.h b/www/iridium/files/patch-chrome_browser_browser__process__impl.h index 3c9a968fb0ae..af98f18c6d4f 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.h @@ -1,8 +1,8 @@ ---- chrome/browser/browser_process_impl.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/browser_process_impl.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/browser_process_impl.h -@@ -388,7 +388,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -404,7 +404,7 @@ class BrowserProcessImpl : public BrowserProcess, - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index a4ba1687d692..7c3277b541a5 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -130,13 +130,13 @@ +@@ -132,12 +132,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -10,22 +10,21 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) #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 -@@ -224,7 +224,7 @@ +@@ -228,7 +228,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/companion/visual_search/visual_search_suggestions_service_factory.h" + #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -863,7 +863,7 @@ void BindScreen2xMainContentExtractor( +@@ -854,7 +854,7 @@ void BindScreen2xMainContentExtractor( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -34,25 +33,16 @@ void BindVisualSuggestionsModelProvider( content::RenderFrameHost* frame_host, mojo::PendingReceiver< -@@ -1009,7 +1009,7 @@ void PopulateChromeFrameBinders( +@@ -1050,7 +1050,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (!render_frame_host->GetParent()) { - map->Add<chrome::mojom::DraggableRegions>( - base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -1017,7 +1017,7 @@ void PopulateChromeFrameBinders( - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1097,7 +1097,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -61,16 +51,16 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1118,7 +1118,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1148,7 +1148,7 @@ void PopulateChromeWebUIFrameBinders( + policy::DlpInternalsUI>(map); #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1651,7 +1651,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1759,7 +1759,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc index 17feeee4e15a..7462b1ba8955 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,8 +1,8 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -246,11 +246,11 @@ +@@ -247,15 +247,15 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) @@ -14,12 +14,17 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -284,14 +284,14 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #endif + +@@ -288,14 +288,14 @@ + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #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" @@ -31,7 +36,33 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -1039,7 +1039,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -367,14 +367,14 @@ + #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "sql/database.h" + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) + + namespace { + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = + FILE_PATH_LITERAL("Media History"); + +@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl( + } + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Set the global activation token sent as a command line switch by another + // browser process. This also removes the switch after use to prevent any side + // effects of leaving it in the command line after this point. +@@ -1100,7 +1100,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -40,16 +71,25 @@ // 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 . -@@ -1095,7 +1095,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +@@ -1148,7 +1148,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1331,7 +1331,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1333,7 +1333,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* + #endif // BUILDFLAG(IS_WIN) + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // Delete the media history database if it still exists. + // TODO(crbug.com/40177301): Remove this. + base::ThreadPool::PostTask( +@@ -1382,7 +1382,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -58,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1437,7 +1437,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1492,7 +1492,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -67,7 +107,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -1971,7 +1971,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2045,7 +2045,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc index 03f65681e2e1..a845c00419b8 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc -@@ -120,7 +120,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt - ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default; +@@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar - void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() { + // static + void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // On the desktop, we fix the platform name if necessary. - // See https://crbug.com/1246928. auto* const command_line = base::CommandLine::ForCurrentProcess(); + auto env = base::Environment::Create(); + std::string desktop_startup_id; diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc new file mode 100644 index 000000000000..b3101ec94fb3 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__extra__parts__ozone.cc @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_main_extra_parts_ozone.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/chrome_browser_main_extra_parts_ozone.cc +@@ -27,7 +27,7 @@ void ChromeBrowserMainExtraPartsOzone::PostCreateMainM + } + + void ChromeBrowserMainExtraPartsOzone::PostMainMessageLoopRun() { +-#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // Lacros's `PostMainMessageLoopRun` must be called at the very end of + // `PostMainMessageLoopRun` in + // `ChromeBrowserMainPartsLacros::PostMainMessageLoopRun`. diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 69b39acf7378..3ab03a848261 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,15 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -67,7 +67,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -25,7 +25,7 @@ + #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h" + #include "ui/base/l10n/l10n_util.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/ozone/public/ozone_platform.h" + #endif + +@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag #endif // BUILDFLAG(IS_CHROMEOS) #if !BUILDFLAG(IS_CHROMEOS) @@ -10,7 +19,16 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the -@@ -124,7 +126,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { +@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag + ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { + ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); + ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); +@@ -137,7 +139,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h new file mode 100644 index 000000000000..85d0cc0f5b1b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_main_linux.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/chrome_browser_main_linux.h +@@ -30,7 +30,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows + + // ChromeBrowserMainPartsPosix overrides. + void PostCreateMainMessageLoop() override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void PostMainMessageLoopRun() override; + #endif + void PreProfileInit() override; diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc index bddab7662524..5a4dc58ccdfa 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,8 +1,8 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -73,7 +73,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -79,7 +79,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa } else { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index fbf7317150b6..5ea338eead62 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,17 +1,17 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -447,7 +447,7 @@ +@@ -468,7 +468,7 @@ #include "storage/browser/file_system/external_mount_points.h" - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #elif BUILDFLAG(IS_ANDROID) -@@ -548,12 +548,12 @@ +@@ -578,12 +578,12 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ @@ -24,15 +24,16 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -564,14 +564,14 @@ +@@ -594,7 +594,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" + #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" - #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h" +@@ -602,7 +602,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -41,8 +42,8 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -587,7 +587,7 @@ - #include "components/lens/lens_features.h" +@@ -617,7 +617,7 @@ + #include "chrome/browser/ui/lens/lens_side_panel_navigation_helper.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -50,16 +51,16 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1591,7 +1591,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1516,7 +1516,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre + #if BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); - registry->RegisterBooleanPref( - policy::policy_prefs::kPPAPISharedImagesForVideoDecoderAllowed, true); + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1715,7 +1715,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1640,7 +1640,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -68,16 +69,16 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1674,7 +1674,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1773,7 +1773,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1695,7 +1695,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -86,7 +87,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1792,7 +1792,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1714,7 +1714,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -95,25 +96,25 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2625,6 +2625,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2551,7 +2551,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + client_info->client_id); + } #elif BUILDFLAG(IS_POSIX) - #if BUILDFLAG(IS_ANDROID) - bool enable_crash_reporter = true; -+#elif BUILDFLAG(IS_BSD) -+ bool enable_crash_reporter = false; - #elif BUILDFLAG(IS_CHROMEOS) - bool enable_crash_reporter = false; - if (crash_reporter::IsCrashpadEnabled()) { -@@ -2990,7 +2992,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( - command_line); +-#if !BUILDFLAG(IS_ANDROID) ++#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) + pid_t pid; + if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { + command_line->AppendSwitchASCII( +@@ -2886,7 +2886,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + } + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD) // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4661,7 +4663,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4651,7 +4651,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -122,7 +123,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5221,7 +5223,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5205,7 +5205,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -131,7 +132,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5231,7 +5233,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5219,7 +5219,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -140,7 +141,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5270,7 +5272,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5258,7 +5258,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -149,7 +150,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7164,7 +7166,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7243,7 +7243,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index d9614a66edc6..f986b01f54d3 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,9 +1,9 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -484,7 +484,7 @@ class ChromeContentBrowserClient : public content::Con - void OverridePageVisibilityState( - content::RenderFrameHost* render_frame_host, - content::PageVisibilityState* visibility_state) override; +@@ -507,7 +507,7 @@ class ChromeContentBrowserClient : public content::Con + bool IsPluginAllowedToUseDevChannelAPIs( + content::BrowserContext* browser_context, + const GURL& url) override; -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void GetAdditionalMappedFilesForChildProcess( diff --git a/www/iridium/files/patch-chrome_browser_component__updater_registration.cc b/www/iridium/files/patch-chrome_browser_component__updater_registration.cc deleted file mode 100644 index 8f0f5279a6c5..000000000000 --- a/www/iridium/files/patch-chrome_browser_component__updater_registration.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/component_updater/registration.cc.orig 2024-02-04 14:46:08 UTC -+++ chrome/browser/component_updater/registration.cc -@@ -223,7 +223,7 @@ void RegisterComponentsForUpdate() { - - RegisterTpcdMetadataComponent(cus); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1490685): Remove this test component once the - // experiment has concluded. - if (base::FeatureList::IsEnabled(features::kPayloadTestComponent)) { diff --git a/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc index b8e1feb453df..8d96d239eecf 100644 --- a/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc +++ b/www/iridium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc @@ -1,15 +1,15 @@ ---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/path_service.h" + #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" - #endif - -@@ -77,7 +77,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: +@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: const char ImageLoaderComponentName[] = "WidevineCdm"; #endif @@ -18,7 +18,16 @@ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the // zygote is locked down. As a result there is no need to register the CDM // with Chrome as it can't be used until Chrome is restarted. -@@ -363,7 +363,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat +@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version + } + #endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // On Linux and ChromeOS the Widevine CDM is loaded at startup before the + // zygote is locked down. To locate the Widevine CDM at startup, a hint file + // is used. Update the hint file with the new Widevine CDM path. +@@ -398,7 +398,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat return; } diff --git a/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc index a778bd40ed6c..7b8cbc728957 100644 --- a/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -1,9 +1,9 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc @@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); - #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); diff --git a/www/iridium/files/patch-chrome_browser_devtools_BUILD.gn b/www/iridium/files/patch-chrome_browser_devtools_BUILD.gn deleted file mode 100644 index dcfd5a407511..000000000000 --- a/www/iridium/files/patch-chrome_browser_devtools_BUILD.gn +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/devtools/BUILD.gn.orig 2024-01-25 17:18:37 UTC -+++ chrome/browser/devtools/BUILD.gn -@@ -121,6 +121,7 @@ static_library("devtools") { - "//chrome/browser/autofill:autofill", - "//components/autofill/content/browser:browser", - "//components/autofill/core/browser:browser", -+ "//components/enterprise/buildflags", - "//components/paint_preview/buildflags:buildflags", - "//content/public/browser", - "//net", diff --git a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 71369a93dd8b..7bc9d117df42 100644 --- a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,7 +1,7 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1623,7 +1623,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe - bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( +@@ -1714,7 +1714,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe + bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1742,7 +1742,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1860,7 +1860,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) || \ @@ -18,12 +18,12 @@ // 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()) { -@@ -1788,7 +1788,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1906,7 +1906,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - absl::optional<enterprise_connectors::AnalysisSettings> settings = + std::optional<enterprise_connectors::AnalysisSettings> settings = safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item); diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.cc b/www/iridium/files/patch-chrome_browser_download_download__commands.cc index 53cb0810d98b..bd6d75568945 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_commands.cc.orig 2023-04-22 17:45:15 UTC +--- chrome/browser/download/download_commands.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/download/download_commands.cc @@ -26,7 +26,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" @@ -13,8 +13,8 @@ } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) Browser* DownloadCommands::GetBrowser() const { if (!model_) diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h index d5a4394a0e47..578ad4a25fe8 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.h +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_commands.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/download/download_commands.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/download/download_commands.h -@@ -63,7 +63,7 @@ class DownloadCommands { +@@ -66,7 +66,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; Browser* GetBrowser() const; diff --git a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc index 188ff1b4f1c1..8ce04d0adce2 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc @@ -1,15 +1,15 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/download/download_file_picker.cc -@@ -17,7 +17,7 @@ - #include "content/public/browser/download_manager.h" +@@ -18,7 +18,7 @@ #include "content/public/browser/web_contents.h" + #include "ui/shell_dialogs/selected_file_info.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/aura/window.h" -@@ -82,7 +82,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl +@@ -83,7 +83,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc). // and windows.Here we make owning_window host to browser current active // window if it is null. https://crbug.com/1301898 diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index adeb6505efdb..37d2a9a3d889 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/download/download_item_model.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/download/download_item_model.cc -@@ -755,7 +755,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -799,7 +799,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(); -@@ -801,7 +801,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -847,7 +847,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1170,7 +1170,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1236,7 +1236,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc index 954ee5ba276f..8ee5b0411525 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/download/download_prefs.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -8,8 +8,8 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/functional/bind.h" -@@ -63,6 +64,10 @@ - #include "chrome/browser/download/bubble/download_bubble_prefs.h" +@@ -64,6 +65,10 @@ + #include "chrome/browser/flags/android/chrome_feature_list.h" #endif +#if BUILDFLAG(IS_BSD) @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -73,7 +78,7 @@ namespace { +@@ -74,7 +79,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; -@@ -181,7 +186,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -180,7 +185,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 -@@ -310,7 +315,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -474,7 +479,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -469,7 +474,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; -@@ -506,7 +511,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -501,7 +506,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(); -@@ -537,7 +542,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -538,7 +543,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; -@@ -661,7 +666,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -690,7 +695,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/iridium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc b/www/iridium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc new file mode 100644 index 000000000000..5a0ef268c326 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc @@ -0,0 +1,29 @@ +--- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/enterprise/browser_management/browser_management_service.cc +@@ -21,7 +21,7 @@ namespace policy { + + namespace { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void UpdateEnterpriseLogo( + Profile* profile, + base::OnceCallback<void(const gfx::Image&, +@@ -98,7 +98,7 @@ GetManagementStatusProviders(Profile* profile) { + } // namespace + + BrowserManagementMetadata::BrowserManagementMetadata(Profile* profile) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + UpdateManagementLogo(profile); + pref_change_registrar_.Init(profile->GetPrefs()); + pref_change_registrar_.Add( +@@ -114,7 +114,7 @@ const gfx::Image& BrowserManagementMetadata::GetManage + return management_logo_; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void BrowserManagementMetadata::UpdateManagementLogo(Profile* profile) { + UpdateEnterpriseLogo( + profile, base::BindOnce(&BrowserManagementMetadata::SetManagementLogo, diff --git a/www/iridium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h b/www/iridium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h new file mode 100644 index 000000000000..947971df43b7 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/enterprise/browser_management/browser_management_service.h +@@ -28,7 +28,7 @@ class BrowserManagementMetadata { + + const gfx::Image& GetManagementLogo() const; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + private: + void UpdateManagementLogo(Profile* profile); + void SetManagementLogo( diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc index bd974e91c203..2cfe334ebcc2 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc -@@ -143,7 +143,7 @@ AnalysisServiceSettings::AnalysisServiceSettings( +@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisServiceSettings( const char* verification_key = kKeyWindowsVerification; #elif BUILDFLAG(IS_MAC) const char* verification_key = kKeyMacVerification; diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index 270e272fc2d0..fad52723657e 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -560,7 +560,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -565,7 +565,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index 1a36d5f5ad1c..2ce886203421 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc @@ -23,7 +23,7 @@ #include "components/policy/core/common/management/management_service.h" @@ -17,8 +17,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) { policy::CloudPolicyManager* user_policy_manager = - profile->GetUserCloudPolicyManager(); -@@ -104,7 +104,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() + profile->GetCloudPolicyManager(); +@@ -101,7 +101,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc index 283d0e00e6cf..d9f5008ada46 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2023-08-28 20:17:35 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #if BUILDFLAG(IS_WIN) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" #elif BUILDFLAG(IS_MAC) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h" -@@ -46,7 +46,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand +@@ -47,7 +47,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { #if BUILDFLAG(IS_WIN) return std::make_unique<WinKeyRotationCommand>(); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc index 0291767e0e0c..cff0d9204236 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc @@ -11,7 +11,7 @@ namespace enterprise_connectors { BrowserCrashEventRouter::BrowserCrashEventRouter( content::BrowserContext* context) { --#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); Profile* profile = Profile::FromBrowserContext(context); @@ -13,8 +13,8 @@ } BrowserCrashEventRouter::~BrowserCrashEventRouter() { --#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); crash_reporting_context->RemoveProfile(this); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc index d9dd9c5767a2..56e49e5d9ed2 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2023-04-22 17:45:15 UTC +--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc @@ -18,7 +18,7 @@ namespace enterprise_connectors { --#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) namespace { diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index bbddafb86969..ac95be35493a 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc @@ -58,7 +58,7 @@ #include "base/strings/utf_string_conversions.h" @@ -18,7 +18,7 @@ void PopulateSignals(base::Value::Dict event, policy::CloudPolicyClient* client, std::string name, -@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -27,7 +27,7 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp +@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp if (include_profile_user_name) { event.Set(kKeyProfileUserName, GetProfileUserName()); } diff --git a/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc index 25eeed851e20..f3a85684ef03 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc @@ -1,20 +1,20 @@ ---- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "components/enterprise/browser/identifiers/identifiers_prefs.h" #include "components/prefs/pref_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "components/enterprise/browser/controller/browser_dm_token_storage.h" #if BUILDFLAG(IS_WIN) #include "base/strings/utf_string_conversions.h" -@@ -36,7 +36,7 @@ void CreateProfileGUID(PrefService* prefs) { +@@ -94,7 +94,7 @@ std::string ProfileIdDelegateImpl::GetDeviceId() { } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Gets the device ID from the BrowserDMTokenStorage. - std::string GetId() { + std::string ProfileIdDelegateImpl::GetId() { std::string device_id = diff --git a/www/iridium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc new file mode 100644 index 000000000000..1695fd2433f8 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc @@ -0,0 +1,13 @@ +--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc +@@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileAttributes>& Ge + // TODO(crbug.com/40267996): Add actual domains with attribute names. + profile_attributes->insert(std::make_pair( + "supported.test", +- SAMLProfileAttributes("placeholderName", "placeholderDomain", +- "placeholderToken"))); ++ SAMLProfileAttributes(SAMLProfileAttributes{"placeholderName", "placeholderDomain", ++ "placeholderToken"}))); + + // Extract domains and attributes from the command line switch. + const base::CommandLine& command_line = diff --git a/www/iridium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc b/www/iridium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc new file mode 100644 index 000000000000..bbd5a1331682 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/watermark/watermark_view.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/enterprise/watermark/watermark_view.cc +@@ -36,7 +36,7 @@ gfx::Font WatermarkFont() { + "Segoe UI", + #elif BUILDFLAG(IS_MAC) + "SF Pro Text", +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + "Ubuntu", + #elif BUILDFLAG(IS_CHROMEOS) + "Google Sans", +@@ -47,7 +47,7 @@ gfx::Font WatermarkFont() { + } + + gfx::Font::Weight WatermarkFontWeight() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return gfx::Font::Weight::SEMIBOLD; + #else + return gfx::Font::Weight::MEDIUM; diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index 6bc2375c8009..842c2393e1be 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1372,6 +1372,10 @@ static_library("extensions") { +@@ -1391,6 +1391,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index 44632be3f0fa..06cc0678e9bc 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -43,7 +43,7 @@ - #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" - #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" +@@ -45,7 +45,7 @@ + #include "printing/buildflags/buildflags.h" + #include "services/screen_ai/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -119,7 +119,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -128,7 +128,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc index bb8fb75590cd..97f782b02b5d 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -24,7 +24,7 @@ #include "base/win/registry.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -255,7 +255,7 @@ base::FilePath GetEndpointVerificationDir() { bool got_path = false; #if BUILDFLAG(IS_WIN) got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path); @@ -18,7 +18,7 @@ std::unique_ptr<base::Environment> env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -266,7 +266,7 @@ base::FilePath GetEndpointVerificationDir() { if (!got_path) return path; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h index 25d560bc078a..378d71ccb2d8 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h @@ -7,7 +7,7 @@ @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <optional> #include <vector> - diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index de984b876b1c..78ceec680d33 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,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 <optional> + #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" -@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -150,7 +150,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -18,7 +18,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -211,7 +211,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc new file mode 100644 index 000000000000..37759e72a7a2 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +@@ -405,7 +405,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel + apps::LaunchContainer launch_container = + GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); + Profile* profile = Profile::FromBrowserContext(context); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, + extension->id())) { + return false; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/iridium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc index 5ea00e63e617..20f169eb51fb 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc @@ -1,8 +1,8 @@ ---- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc @@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess( - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 33f1af33bed5..0e78824c7c08 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -601,7 +601,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -610,7 +610,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 6c3da3d68bb3..d39a9cc00206 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -279,7 +279,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PlatformOs::kLinux; } else if (strcmp(os, "openbsd") == 0) { @@ -8,6 +8,6 @@ + info->os = extensions::api::runtime::PlatformOs::kLinux; + } else if (strcmp(os, "freebsd") == 0) { + info->os = extensions::api::runtime::PlatformOs::kLinux; - } else if (strcmp(os, "fuchsia") == 0) { - info->os = extensions::api::runtime::PlatformOs::kFuchsia; } else { + NOTREACHED() << "Platform not supported: " << os; + return false; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 9f176d32af64..0e5bdd18ab31 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -197,7 +197,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; + settings_api::PrefType::kBoolean; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kUseCustomChromeFrame] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; + settings_api::PrefType::kBoolean; #endif -@@ -207,7 +207,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - settings_api::PrefType::PREF_TYPE_STRING; - (*s_allowlist)[::prefs::kPolicyThemeColor] = - settings_api::PrefType::PREF_TYPE_NUMBER; +@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + // Appearance settings. + (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; + (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - (*s_allowlist)[::prefs::kSystemTheme] = - settings_api::PrefType::PREF_TYPE_NUMBER; + (*s_allowlist)[::prefs::kSystemTheme] = settings_api::PrefType::kNumber; #endif + (*s_allowlist)[::prefs::kHomePage] = settings_api::PrefType::kUrl; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index 03ffd781a982..8a84810dc88c 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -861,7 +861,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio - // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as +@@ -890,7 +890,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. - // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1410400): Find a fix for wayland as well. - - // Must be defined inside IS_LINUX to compile on windows/mac. + // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. + // TODO(crbug.com/40254339): Find a fix for wayland as well. +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) { + new_window->window()->Minimize(); + } diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index d75962f3a55c..d1f664350842 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -29,7 +29,7 @@ #include "extensions/browser/process_manager.h" @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -576,7 +576,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index 23fc64ab5af6..ded9f4b88a89 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,9 +1,9 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -919,7 +919,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: - RequestExtensionApproval(contents); - return; - } +@@ -897,7 +897,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: + #if BUILDFLAG(IS_CHROMEOS) + RequestExtensionApproval(contents); + return; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Shows a parental permission dialog directly bypassing the extension diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc index b4976dcb41ee..33c5c62b11d7 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -830,7 +830,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -831,7 +831,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -858,7 +858,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -859,7 +859,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 67d127038144..d403d641214f 100644 --- a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -322,7 +322,7 @@ const struct { +@@ -315,7 +315,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h index f17c1c4867fd..0feadeb71304 100644 --- a/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h +++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -1,8 +1,8 @@ ---- chrome/browser/first_run/first_run_dialog.h.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/first_run/first_run_dialog.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/first_run/first_run_dialog.h @@ -12,7 +12,7 @@ // Hide this function on platforms where the dialog does not exist. - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index a08d84799c27..73af10456ccd 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,33 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/flag_descriptions.cc -@@ -7251,7 +7251,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -2923,7 +2923,7 @@ const char kCbdTimeframeRequiredDescription[] = + "value to the list."; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + const char kPolicyIndicationForManagedDefaultSearchName[] = + "Enable policy indication for managed Default Search provider"; + const char kPolicyIndicationForManagedDefaultSearchDescription[] = +@@ -3220,7 +3220,7 @@ const char kShowAutofillTypePredictionsDescription[] = + "text."; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kShowFeaturedEnterpriseSiteSearchName[] = + "Show featured Enterprise site search engines in Omnibox"; + const char kShowFeaturedEnterpriseSiteSearchDescription[] = +@@ -3245,7 +3245,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] + "but in the same SiteInstanceGroup, and thus the same process."; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; + const char kSiteSearchSettingsPolicyDescription[] = + "Allow site search engines to be defined by the SiteSearchSettings policy."; +@@ -7485,7 +7485,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,43 +36,33 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7490,7 +7490,7 @@ const char kSearchWebInSidePanelDescription[] = - // Random platform combinations ----------------------------------------------- +@@ -7753,7 +7753,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const char kQuickCommandsName[] = "Quick Commands"; - const char kQuickCommandsDescription[] = - "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7499,7 +7499,7 @@ const char kQuickCommandsDescription[] = - // BUILDFLAG(IS_FUCHSIA) + // Linux ----------------------------------------------------------------------- + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kOzonePlatformHintChoiceDefault[] = "Default"; + const char kOzonePlatformHintChoiceAuto[] = "Auto"; + const char kOzonePlatformHintChoiceX11[] = "X11"; +@@ -7801,14 +7801,14 @@ const char kZeroCopyVideoCaptureDescription[] = + #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7514,7 +7514,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] - "instead of JSON."; - #endif + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7538,7 +7538,7 @@ const char kWebShareDescription[] = - "platforms."; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) - --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) - const char kOzonePlatformHintChoiceDefault[] = "Default"; - const char kOzonePlatformHintChoiceAuto[] = "Auto"; - const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7558,7 +7558,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7840,7 +7840,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -54,27 +71,18 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7572,7 +7572,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail - "storage and requests initial sync."; - #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) -@@ -7671,7 +7671,7 @@ const char kElasticOverscrollDescription[] = +@@ -7980,7 +7980,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7717,7 +7717,7 @@ const char kEnableAudioFocusEnforcementDescription[] = - "any one time. Requires #enable-media-session-service to be enabled too."; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -8041,7 +8041,7 @@ const char kComposeNudgeAtCursorDescription[] = + "Shows the Compose proactive nudge at the cursor location"; + #endif // BUILDFLAG(ENABLE_COMPOSE) -#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/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index 337e91850bb2..f23aa6b55b2e 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,33 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/flag_descriptions.h -@@ -4169,7 +4169,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -1702,7 +1702,7 @@ extern const char kCbdTimeframeRequiredName[]; + extern const char kCbdTimeframeRequiredDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + extern const char kPolicyIndicationForManagedDefaultSearchName[]; + extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; + #endif +@@ -1873,7 +1873,7 @@ extern const char kShowAutofillTypePredictionsName[]; + extern const char kShowAutofillTypePredictionsDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kShowFeaturedEnterpriseSiteSearchName[]; + extern const char kShowFeaturedEnterpriseSiteSearchDescription[]; + #endif +@@ -1888,7 +1888,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] + extern const char kSiteInstanceGroupsForDataUrlsDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kSiteSearchSettingsPolicyName[]; + extern const char kSiteSearchSettingsPolicyDescription[]; + #endif +@@ -4347,7 +4347,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,78 +36,52 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4309,14 +4309,14 @@ extern const char kSearchWebInSidePanelDescription[]; - // Random platform combinations ----------------------------------------------- - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - extern const char kQuickCommandsName[]; - extern const char kQuickCommandsDescription[]; +@@ -4502,7 +4502,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // defined (OS_FUCHSIA) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - extern const char kWebShareName[]; - extern const char kWebShareDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4326,7 +4326,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa - extern const char kWebBluetoothConfirmPairingSupportDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + // Linux --------------------------------------------------------------------- -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4336,7 +4336,7 @@ extern const char kOzonePlatformHintName[]; - extern const char kOzonePlatformHintDescription[]; - #endif // BUILDFLAG(IS_LINUX) +@@ -4544,7 +4544,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa + extern const char kWebBluetoothConfirmPairingSupportDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4344,13 +4344,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt - extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; +@@ -4556,13 +4556,13 @@ extern const char kRestartToGainAccessToKeychainDescri #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) --#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) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4361,7 +4361,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; - extern const char kEnableProtoApiForClassifyUrlDescription[]; - #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) + // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4438,7 +4438,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4658,7 +4658,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4468,7 +4468,7 @@ extern const char kEnableAudioFocusEnforcementName[]; - extern const char kEnableAudioFocusEnforcementDescription[]; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -4701,7 +4701,7 @@ extern const char kComposeNudgeAtCursorName[]; + extern const char kComposeNudgeAtCursorDescription[]; + #endif // BUILDFLAG(ENABLE_COMPOSE) -#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/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc index 94ed143d25ac..4f4a6c0dc156 100644 --- a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/headless/headless_mode_util.cc -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "content/public/common/content_switches.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -81,7 +81,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand +@@ -87,7 +87,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir()); } diff --git a/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h index 7e289ba8d868..6fe08bc60ad0 100644 --- a/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h +++ b/www/iridium/files/patch-chrome_browser_intranet__redirect__detector.h @@ -1,11 +1,11 @@ ---- chrome/browser/intranet_redirect_detector.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/intranet_redirect_detector.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/intranet_redirect_detector.h @@ -25,7 +25,7 @@ class SimpleURLLoader; class PrefRegistrySimple; #if !(BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) +- BUILDFLAG(IS_CHROMEOS)) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) #error "IntranetRedirectDetector should only be built on Desktop platforms." #endif diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 8736bdfb1d7d..078080a6c8ff 100644 --- a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2023-08-28 20:17:35 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -586,7 +586,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc index ebb76a3598ac..a1478513857d 100644 --- a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media/audio_service_util.cc @@ -21,7 +21,7 @@ @@ -11,7 +11,7 @@ const policy::PolicyMap& policies = @@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* policy_name, const bool IsAudioServiceSandboxEnabled() { - // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being + // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn index 98c3f060eeb2..c27c15d67edd 100644 --- a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media/router/discovery/BUILD.gn -@@ -81,7 +81,7 @@ static_library("discovery") { +@@ -82,7 +82,7 @@ static_library("discovery") { ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc deleted file mode 100644 index 914f57b640a0..000000000000 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2024-02-04 14:46:08 UTC -+++ chrome/browser/media/webrtc/capture_policy_utils.cc -@@ -140,7 +140,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry - } - - bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; -@@ -175,7 +175,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br - - bool IsGetAllScreensMediaAllowed(content::BrowserContext* context, - const GURL& url) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Profile* profile = Profile::FromBrowserContext(context); - if (!profile) { - return false; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc index b4f7f3f2eb8f..8d4ff99d5f2f 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc @@ -21,7 +21,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -9,8 +9,8 @@ #include "base/functional/callback.h" #include "content/public/browser/desktop_capture.h" #endif -@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru - root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER; +@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<raw_ptr<aura::Window, V + DestructorAtExit root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER; } // namespace -#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ namespace { base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER; -@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( +@@ -79,7 +79,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( return stream_devices_set; } @@ -27,7 +27,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens( blink::mojom::MediaStreamType stream_type) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); -@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( +@@ -130,7 +130,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting( root_windows_for_testing_.Get() = std::move(root_windows); } @@ -36,7 +36,7 @@ void ChromeScreenEnumerator::SetDesktopCapturerForTesting( std::unique_ptr<webrtc::DesktopCapturer> capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); -@@ -142,7 +142,7 @@ void ChromeScreenEnumerator::EnumerateScreens( +@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens( ScreensCallback screens_callback) const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h index 5330b06f10bd..d4f8d8b32cc8 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.h @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.h -@@ -21,7 +21,7 @@ namespace aura { +@@ -20,7 +20,7 @@ namespace aura { class Window; } @@ -10,9 +10,9 @@ class DesktopCapturer; } @@ -42,7 +42,7 @@ class ChromeScreenEnumerator : public media::ScreenEnu - #if BUILDFLAG(IS_CHROMEOS_ASH) - static void SetRootWindowsForTesting(std::vector<aura::Window*> root_windows); + static void SetRootWindowsForTesting( + std::vector<raw_ptr<aura::Window, VectorExperimental>> root_windows); -#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static void SetDesktopCapturerForTesting( diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc new file mode 100644 index 000000000000..0faeb8843ab3 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc @@ -0,0 +1,11 @@ +--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc +@@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur + #if BUILDFLAG(IS_MAC) + return request_source == Params::RequestSource::kCast || + base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (request_source == Params::RequestSource::kCast) { + return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast); + } else { diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc deleted file mode 100644 index 547bd04114df..000000000000 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-07-24 14:27:53 UTC -+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome"; - const char kProduct[] = "Chrome_Mac"; - #elif BUILDFLAG(IS_CHROMEOS_ASH) - const char kProduct[] = "Chrome_ChromeOS"; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - const char kProduct[] = "Chrome_Linux"; - #elif BUILDFLAG(IS_ANDROID) - const char kProduct[] = "Chrome_Android"; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index a20d112ce168..8b414ec1966a 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,13 +1,11 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -374,6 +374,10 @@ void WebRtcLogUploader::SetupMultipart( - const char product[] = "Chrome_ChromeOS"; - #elif BUILDFLAG(IS_FUCHSIA) - const char product[] = "Chrome_Fuchsia"; -+#elif defined(OS_OPENBSD) -+ const char product[] = "Chrome_OpenBSD"; -+#elif defined(OS_FREEBSD) -+ const char product[] = "Chrome_FreeBSD"; +@@ -101,7 +101,7 @@ std::string GetLogUploadProduct() { + const char product[] = "Chrome_Mac"; + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #if !defined(ADDRESS_SANITIZER) + const char product[] = "Chrome_Linux"; #else - #error Platform not supported. - #endif diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index fba01b2bc6fb..0afde625c6d0 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -25,10 +25,10 @@ #include "components/webrtc_logging/browser/text_log_list.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -284,7 +284,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -288,7 +288,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -329,7 +329,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -334,7 +334,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } @@ -30,4 +30,4 @@ +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void WebRtcLoggingController::OnRtpPacket( - std::unique_ptr<uint8_t[]> packet_header, + base::HeapArray<uint8_t> packet_header, diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index 2227982ab37c..c077614dd449 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h -@@ -134,7 +134,7 @@ class WebRtcLoggingController +@@ -133,7 +133,7 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -9,7 +9,7 @@ // Ensures that the WebRTC Logs directory exists and then grants render // process access to the 'WebRTC Logs' directory, and invokes |callback| with // the ids necessary to create a DirectoryEntry object. -@@ -199,7 +199,7 @@ class WebRtcLoggingController +@@ -197,7 +197,7 @@ class WebRtcLoggingController content::BrowserContext* GetBrowserContext() const; diff --git a/www/iridium/files/patch-chrome_browser_memory__details.cc b/www/iridium/files/patch-chrome_browser_memory__details.cc index bb463f460631..4653778fce48 100644 --- a/www/iridium/files/patch-chrome_browser_memory__details.cc +++ b/www/iridium/files/patch-chrome_browser_memory__details.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/memory_details.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/memory_details.cc @@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" @@ -9,8 +9,8 @@ #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { - std::ref(process))); +@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { + }); } -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index a1f60bd1b3d3..be8cad3d5b50 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,8 +1,8 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -78,8 +78,10 @@ +@@ -81,8 +81,10 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -108,7 +110,7 @@ +@@ -106,7 +108,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -117,7 +119,7 @@ +@@ -115,7 +117,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -917,7 +919,7 @@ void RecordStartupMetrics() { +@@ -862,7 +864,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1239,11 +1241,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1154,11 +1156,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h index 2f8947b9c10f..b7e50d0a9176 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-09-14 08:08:21 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h -@@ -33,7 +33,7 @@ class PowerMetricsReporter; +@@ -28,7 +28,7 @@ class PowerMetricsReporter; class ProcessMonitor; #endif @@ -9,7 +9,7 @@ class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -139,7 +139,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro +@@ -115,7 +115,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 437e543b1aed..c690427963dd 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -184,7 +184,7 @@ +@@ -195,7 +195,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,16 +9,34 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -210,7 +210,7 @@ +@@ -212,7 +212,7 @@ + #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/metrics/bluetooth_metrics_provider.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "chrome/browser/metrics/family_link_user_metrics_provider.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID)) -@@ -810,7 +810,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -534,7 +534,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + metrics::structured::StructuredMetricsService::RegisterPrefs(registry); + + #if !BUILDFLAG(IS_CHROMEOS_ASH) +@@ -706,7 +706,7 @@ void ChromeMetricsServiceClient::Initialize() { + RegisterUKMProviders(); + } + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( + base::SequencedTaskRunner::GetCurrentDefault()); + #endif +@@ -757,7 +757,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -27,16 +45,16 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -894,7 +894,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +@@ -842,7 +842,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -1013,7 +1013,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || +@@ -944,7 +944,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -45,12 +63,21 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1212,7 +1212,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve - #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +@@ -1131,7 +1131,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. + metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( +@@ -1465,7 +1465,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri + recorder = + std::make_unique<metrics::structured::AshStructuredMetricsRecorder>( + cros_system_profile_provider_.get()); +-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + + // Make sure that Structured Metrics recording delegates have been created + // before the service is created. This is handled in other places for ChromeOS diff --git a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index d4ba6c25ae1c..d6085d75e335 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc -@@ -141,7 +141,7 @@ CPUIdentity GetCPUIdentity() { +@@ -142,7 +142,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS_ASH) base::SysInfo::KernelVersion(); diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc index a2b475fb749f..b053d2dad451 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/metrics/power/process_metrics_recorder_util.cc -@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf +@@ -65,7 +65,7 @@ void RecordProcessHistograms(const char* histogram_suf const ProcessMonitor::Metrics& metrics) { RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc index cbf7c750bf35..371d74da61ae 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -1,7 +1,7 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/metrics/power/process_monitor.cc -@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet - #endif +@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet + process_metrics.GetPlatformIndependentCPUUsage()); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) @@ -9,8 +9,8 @@ metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); #endif #if BUILDFLAG(IS_MAC) -@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do - metrics->cpu_usage *= factor; +@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do + } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) @@ -18,8 +18,8 @@ metrics->idle_wakeups *= factor; #endif -@@ -172,7 +172,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me - lhs.cpu_usage += rhs.cpu_usage; +@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me + } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h index b3b19d7ff967..8ca778a3412d 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h @@ -1,7 +1,7 @@ ---- chrome/browser/metrics/power/process_monitor.h.orig 2022-12-06 08:09:13 UTC +--- chrome/browser/metrics/power/process_monitor.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/metrics/power/process_monitor.h -@@ -75,7 +75,7 @@ class ProcessMonitor : public content::BrowserChildPro - double cpu_usage = 0.0; +@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro + std::optional<double> cpu_usage; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc index 0d3cfab039fd..0e5825e11f36 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,15 +1,15 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -92,7 +92,7 @@ +@@ -97,7 +97,7 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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/common/chrome_paths_internal.h" #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -136,7 +136,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -141,7 +141,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +18,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -144,7 +144,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -149,7 +149,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +27,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -190,7 +190,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -195,7 +195,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +36,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -205,7 +205,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -210,7 +210,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -220,7 +220,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +54,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -257,11 +257,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -262,11 +262,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +68,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -277,7 +277,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -282,7 +282,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -472,7 +472,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -512,7 +512,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -530,7 +530,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -570,7 +570,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -544,7 +544,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -584,7 +584,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,8 +104,8 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -577,7 +577,7 @@ SystemNetworkContextManager::SystemNetworkContextManag - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -610,7 +610,7 @@ SystemNetworkContextManager::SystemNetworkContextManag + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -113,7 +113,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -632,7 +632,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -665,7 +665,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -122,16 +122,16 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -661,7 +661,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false); - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -689,7 +689,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -670,11 +670,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -698,11 +698,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -145,7 +145,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -727,7 +727,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -755,7 +755,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -154,7 +154,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -938,7 +938,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -972,7 +972,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } @@ -163,8 +163,8 @@ if (!enabled) { g_network_service_will_allow_gssapi_library_load = true; } -@@ -1052,7 +1052,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -1059,7 +1059,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h index b066bb707cb4..b8f5abfa4f18 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/net/system_network_context_manager.h -@@ -185,7 +185,7 @@ class SystemNetworkContextManager { +@@ -197,7 +197,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; class NetworkProcessLaunchWatcher; @@ -9,8 +9,8 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -229,7 +229,7 @@ class SystemNetworkContextManager { - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -233,7 +233,7 @@ class SystemNetworkContextManager { + void UpdateExplicitlyAllowedNetworkPorts(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -18,12 +18,12 @@ // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled // pref to the enforcement state. void UpdateEnforceLocalAnchorConstraintsEnabled(); -@@ -277,7 +277,7 @@ class SystemNetworkContextManager { - - static absl::optional<bool> certificate_transparency_enabled_for_testing_; +@@ -285,7 +285,7 @@ class SystemNetworkContextManager { + std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_; + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) GssapiLibraryLoadObserver gssapi_library_loader_observer_{this}; #endif // BUILDFLAG(IS_LINUX) - }; + diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc index 16b8cff8559e..055e1d1d5528 100644 --- a/www/iridium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc +++ b/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc @@ -1,5 +1,5 @@ ---- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2023-10-21 11:51:27 UTC -+++ chrome/browser/new_tab_page/modules/drive/drive_service.cc +--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc @@ -32,7 +32,7 @@ #include "services/network/public/cpp/resource_request.h" diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc index 2ba9f63bdfb3..68e686687f69 100644 --- a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc +++ b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -1,15 +1,6 @@ ---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-06-25 12:08:48 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; -@@ -27,7 +27,7 @@ bool IsOsSupportedForCart() { +@@ -20,7 +20,7 @@ bool IsOsSupportedForCart() { } bool IsOsSupportedForDrive() { diff --git a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index db2fa7fcfd2d..7e8b14545a9c 100644 --- a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -32,7 +32,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" #endif diff --git a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc new file mode 100644 index 000000000000..151a0a0f6aee --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -0,0 +1,20 @@ +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/password_manager/chrome_password_manager_client.cc +@@ -488,7 +488,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin + + bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling( + device_reauth::DeviceAuthenticator* authenticator) { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { + return false; + } +@@ -712,7 +712,7 @@ void ChromePasswordManagerClient::NotifyUserCredential + } + + void ChromePasswordManagerClient::NotifyKeychainError() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + PasswordsClientUIDelegate* manage_passwords_ui_controller = + PasswordsClientUIDelegateFromWebContents(web_contents()); + manage_passwords_ui_controller->OnKeychainError(); diff --git a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 6404c759b1e9..ca39be5ec5bc 100644 --- a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,7 +1,7 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -115,7 +115,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +@@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc index a70da98a434d..7342e609e27a 100644 --- a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,8 +1,8 @@ ---- chrome/browser/platform_util_linux.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/platform_util_linux.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/platform_util_linux.cc -@@ -299,7 +299,9 @@ void RunCommand(const std::string& command, - - base::LaunchOptions options; +@@ -300,7 +300,9 @@ void OnLaunchOptionsCreated(const std::string& command + argv.push_back(command); + argv.push_back(arg); options.current_directory = working_directory; +#if !BUILDFLAG(IS_BSD) options.allow_new_privs = true; diff --git a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 8013c13605d5..9675e9f13446 100644 --- a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -58,7 +58,7 @@ +@@ -59,7 +59,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -87,7 +87,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); @@ -27,7 +27,7 @@ storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); -@@ -245,7 +245,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -255,7 +255,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 23389e1214cd..4123f17cb544 100644 --- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -218,19 +218,20 @@ +@@ -234,19 +234,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -18,32 +18,47 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || \ -+ BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || -@@ -827,7 +828,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +@@ -260,13 +260,13 @@ + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #include "chrome/browser/policy/battery_saver_policy_handler.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/search_engines/site_search_policy_handler.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -871,7 +871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ -- || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) -+ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +- || BUILDFLAG(IS_MAC) ++ || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -837,7 +838,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -880,7 +880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) - // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ -- || BUILDFLAG(IS_FUCHSIA) -+ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1569,7 +1570,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::LIST }, +@@ -1664,7 +1664,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -51,7 +66,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1614,7 +1615,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1715,7 +1715,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -60,7 +75,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1640,12 +1641,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1741,12 +1741,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -75,25 +90,25 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1654,7 +1655,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1754,7 +1754,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kProfileSeparationDomainExceptionList, base::Value::Type::LIST }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ -- || BUILDFLAG(IS_FUCHSIA) -+ || BUILDFLAG(IS_FUCHSIA) || 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) { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1667,7 +1668,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1766,7 +1766,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ -- || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- || BUILDFLAG(IS_CHROMEOS) ++ || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1768,7 +1769,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1867,7 +1867,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -102,26 +117,17 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1870,7 +1871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, - #endif // BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1454054): replace the - // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that - // matches the name of the new `getAllScreensMedia` API. -@@ -1879,7 +1880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1972,7 +1972,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#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 }, -@@ -1910,7 +1911,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) +@@ -1997,7 +1997,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + #endif // BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) @@ -129,43 +135,61 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1986,7 +1987,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2055,7 +2055,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - { key::kBatterySaverModeAvailability, - performance_manager::user_tuning::prefs::kBatterySaverModeState, - base::Value::Type::INTEGER }, -@@ -2017,7 +2018,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kCloudApAuthEnabled, - base::Value::Type::INTEGER }, + { key::kTabDiscardingExceptions, + performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, + base::Value::Type::LIST }, +@@ -2084,7 +2084,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kUiAutomationProviderEnabled, + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2057,7 +2058,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kManagedPrivateNetworkAccessRestrictionsEnabled, - base::Value::Type::BOOLEAN }, +@@ -2118,7 +2118,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::INTEGER }, + #endif #if BUILDFLAG(ENABLE_EXTENSIONS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2154,7 +2155,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2139,7 +2139,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed, + base::Value::Type::INTEGER}, + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + { key::kChromeForTestingAllowed, + prefs::kChromeForTestingAllowed, + base::Value::Type::BOOLEAN }, +@@ -2267,7 +2267,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( + key::kMemorySaverModeSavings, + performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, +@@ -2283,7 +2283,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) handlers->AddHandler( - std::make_unique<performance_manager::HighEfficiencyPolicyHandler>()); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2350,7 +2351,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); + +@@ -2489,7 +2489,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -174,7 +198,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2408,7 +2409,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2547,7 +2547,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -183,7 +207,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2472,7 +2473,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2661,7 +2661,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) || \ @@ -192,7 +216,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2834,7 +2835,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3018,7 +3018,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -201,7 +225,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2842,7 +2843,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3026,7 +3026,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -210,12 +234,21 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2859,7 +2860,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - /*new_policy_handler=*/std::make_unique< +@@ -3044,7 +3044,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( - policy::key::kRelatedWebsiteSetsOverrides, chrome_schema))); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) + key::kRelatedWebsiteSetsOverrides, chrome_schema))); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +@@ -3067,7 +3067,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + base::Value::Type::BOOLEAN))); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 6a5b761ed10c..c07b12283d47 100644 --- a/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -22,7 +22,7 @@ +@@ -24,7 +24,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/connectors_service.h" #endif -@@ -100,7 +100,7 @@ DeviceManagementServiceConfiguration::GetReportingConn +@@ -102,7 +102,7 @@ DeviceManagementServiceConfiguration::GetReportingConn content::BrowserContext* context) const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ diff --git a/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc index 07b8d403a488..6e1dcf13de3f 100644 --- a/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc +++ b/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/policy/policy_value_and_status_aggregator.cc @@ -53,7 +53,7 @@ #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h" @@ -9,12 +9,3 @@ #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -99,7 +99,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP - #else // BUILDFLAG(IS_CHROMEOS_ASH) - policy::CloudPolicyManager* cloud_policy_manager = - profile->GetUserCloudPolicyManager(); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!cloud_policy_manager) { - cloud_policy_manager = profile->GetProfileCloudPolicyManager(); - } diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc index 319fb3ce85cd..a7b0443658dd 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -485,18 +485,18 @@ +@@ -489,18 +489,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ @@ -18,11 +18,11 @@ #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -528,7 +528,7 @@ +@@ -535,7 +535,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -31,25 +31,16 @@ #include "ui/color/system_theme.h" #endif -@@ -652,7 +652,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li - const char kPluginsShowDetails[] = "plugins.show_details"; - - // Deprecated 02/2023. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - -@@ -982,7 +982,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -1861,7 +1861,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + true); + #endif // BUILDFLAG(ENABLE_PDF) - // Deprecated 02/2023. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); + #endif -@@ -1959,12 +1959,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2213,12 +2213,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -64,12 +55,3 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); enterprise_signin::RegisterProfilePrefs(registry); #endif -@@ -2121,7 +2121,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - - // Added 02/2023 --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - local_state->ClearPref(kWebAppsUrlHandlerInfo); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index cc8726779e3f..4895c69366c1 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-08-28 20:17:35 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -168,7 +168,7 @@ const char* const kPersistentPrefNames[] = { +@@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index 53dd6df2f25f..c7a5aa9140a5 100644 --- a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,7 +1,7 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -33,7 +33,7 @@ - #include "printing/buildflags/buildflags.h" +@@ -35,7 +35,7 @@ + #include "printing/printing_context.h" #include "printing/printing_features.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -849,7 +849,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -862,7 +862,7 @@ PrintBackendServiceManager::GetServiceFromBundle( host.BindNewPipeAndPassReceiver(), content::ServiceProcessHost::Options() .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) @@ -18,7 +18,7 @@ .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) #endif .Pass()); -@@ -1022,7 +1022,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1039,7 +1039,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // No need to update if there were other query with UI clients. if (HasQueryWithUiClientForRemoteId(remote_id)) { - return absl::nullopt; + return std::nullopt; diff --git a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc index b2e055c238a9..fb5fdc74de33 100644 --- a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc +++ b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc @@ -1,8 +1,8 @@ ---- chrome/browser/printing/printer_query.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/printing/printer_query.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/printing/printer_query.cc @@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( - print_backend->GetPrinterDriverInfo(printer_name)); + printer_name, print_backend->GetPrinterDriverInfo(printer_name)); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) +#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS) diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 88f35439e38c..edb6136bbbd2 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -401,18 +401,18 @@ +@@ -329,7 +329,7 @@ + #include "chromeos/constants/chromeos_features.h" + #endif + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" + #endif + +@@ -413,18 +413,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -20,18 +29,18 @@ -#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/browser_switcher/browser_switcher_service_factory.h" - #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" - #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -621,7 +621,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - if (breadcrumbs::IsEnabled()) { - BreadcrumbManagerKeyedServiceFactory::GetInstance(); - } + #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" + #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" +@@ -660,7 +660,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + DiceBoundSessionCookieServiceFactory::GetInstance(); + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) + #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -727,29 +727,29 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -785,29 +785,29 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -67,30 +76,39 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -865,7 +865,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -933,7 +933,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -963,7 +963,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1038,7 +1038,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::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) policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); + policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif - policy::UserCloudPolicyInvalidatorFactory::GetInstance(); -@@ -1007,7 +1007,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !BUILDFLAG(IS_ANDROID) - ProfileThemeUpdateServiceFactory::GetInstance(); +@@ -1080,7 +1080,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) + ProfileStatisticsFactory::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) ProfileTokenWebSigninInterceptorFactory::GetInstance(); + OidcAuthenticationSigninInterceptorFactory::GetInstance(); + #endif +@@ -1099,7 +1099,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #endif + ReduceAcceptLanguageFactory::GetInstance(); + RendererUpdaterFactory::GetInstance(); +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + reporting::ManualTestHeartbeatEventFactory::GetInstance(); #endif - #if !BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc index 02a49999c30b..0b235d95b52f 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -260,6 +260,10 @@ +@@ -262,6 +262,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -605,7 +609,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -596,7 +600,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async #else { #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -884,7 +888,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc index ab4ea49e183a..b20b616d7e32 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -182,7 +182,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -195,7 +195,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc index 4d81865d59d8..937692d3e701 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -152,7 +152,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif @@ -18,7 +18,7 @@ auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -175,7 +175,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -177,7 +177,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts deleted file mode 100644 index f8a903032dee..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2023-03-13 07:33:08 UTC -+++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts -@@ -2,7 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - --// <if expr="is_linux or is_chromeos"> -+// <if expr="is_posix or is_chromeos"> - import './strings.m.js'; - - import {loadTimeData} from 'chrome://resources/js/load_time_data.js'; -@@ -121,7 +121,7 @@ function androidHandler() { - } - // </if> - --// <if expr="is_linux or is_chromeos"> -+// <if expr="is_posix or is_chromeos"> - - /** - * Adds a status row that reports either Yes or No. -@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => { - // <if expr="is_android"> - androidHandler(); - // </if> -- // <if expr="is_linux or is_chromeos"> -+ // <if expr="is_posix or is_chromeos"> - linuxHandler(); - // </if> - }); diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts deleted file mode 100644 index a4e86da47afb..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2023-08-28 20:17:35 UTC -+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts -@@ -18,7 +18,7 @@ export interface AppearanceBrowserProxy { - - useDefaultTheme(): void; - -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - useGtkTheme(): void; - useQtTheme(): void; - // </if> -@@ -48,7 +48,7 @@ export class AppearanceBrowserProxyImpl implements App - chrome.send('useDefaultTheme'); - } - -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - useGtkTheme() { - chrome.send('useGtkTheme'); - } diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html deleted file mode 100644 index 61fa406b8c57..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-10-21 11:51:27 UTC -+++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -27,7 +27,7 @@ - <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" - label="$i18n{themes}" sub-label="[[themeSublabel_]]" - on-click="openThemeUrl_" external></cr-link-row> --<if expr="not is_linux"> -+<if expr="not is_posix"> - <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> - <div class="separator"></div> - <cr-button id="useDefault" on-click="onUseDefaultClick_"> -@@ -35,7 +35,7 @@ - </cr-button> - </template> - </if> --<if expr="is_linux"> -+<if expr="is_posix"> - <div class="settings-row continuation" - hidden="[[!showThemesSecondary_( - prefs.extensions.theme.id.value, systemTheme_)]]" -@@ -172,7 +172,7 @@ - </div> - </template> - --<if expr="is_linux"> -+<if expr="is_posix"> - <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div> - <settings-toggle-button - hidden="[[!showCustomChromeFrame_]]" diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts deleted file mode 100644 index 993c32e4ee82..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts +++ /dev/null @@ -1,65 +0,0 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2023-10-21 11:51:27 UTC -+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -72,7 +72,7 @@ export interface SettingsAppearancePageElement { - export enum SystemTheme { - // Either classic or web theme. - DEFAULT = 0, -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - GTK = 1, - QT = 2, - // </if> -@@ -193,7 +193,7 @@ export class SettingsAppearancePageElement extends - 'prefs.autogenerated.theme.policy.color.controlledBy)', - }, - -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - /** - * Whether to show the "Custom Chrome Frame" setting. - */ -@@ -229,7 +229,7 @@ export class SettingsAppearancePageElement extends - 'themeChanged_(' + - 'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)', - -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - 'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)', - // </if> - ]; -@@ -253,7 +253,7 @@ export class SettingsAppearancePageElement extends - private isForcedTheme_: boolean; - private showHoverCardImagesOption_: boolean; - -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - private showCustomChromeFrame_: boolean; - // </if> - -@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends - this.appearanceBrowserProxy_.useDefaultTheme(); - } - -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - private systemThemePrefChanged_(systemTheme: SystemTheme) { - this.systemTheme_ = systemTheme; - } -@@ -427,7 +427,7 @@ export class SettingsAppearancePageElement extends - } - - let i18nId; -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - switch (this.systemTheme_) { - case SystemTheme.GTK: - i18nId = 'gtkTheme'; -@@ -440,7 +440,7 @@ export class SettingsAppearancePageElement extends - break; - } - // </if> -- // <if expr="not is_linux"> -+ // <if expr="not is_posix"> - i18nId = 'chooseFromWebStore'; - // </if> - this.themeSublabel_ = this.i18n(i18nId); diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts deleted file mode 100644 index faedfe399537..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/resources/settings/route.ts.orig 2024-02-04 14:46:08 UTC -+++ chrome/browser/resources/settings/route.ts -@@ -242,7 +242,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes - r.ACCESSIBILITY = r.ADVANCED.createSection( - '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); - -- // <if expr="is_linux"> -+ // <if expr="is_posix"> - r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions'); - // </if> - diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html deleted file mode 100644 index fc8d7c08c778..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-07-24 14:27:53 UTC -+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -290,7 +290,7 @@ - autofocus="[[isModalDialog_]]"> - $i18n{syncConfirmationConfirmLabel} - </cr-button> -- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros"> -+ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros"> - <cr-button id="settingsButton" on-click="onGoToSettings_" - disabled="[[anyButtonClicked_]]" consent-confirmation> - $i18n{syncConfirmationSettingsLabel} -@@ -300,7 +300,7 @@ - disabled="[[anyButtonClicked_]]"> - $i18n{syncConfirmationUndoLabel} - </cr-button> -- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)"> -+ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)"> - <cr-button id="settingsButton" on-click="onGoToSettings_" - disabled="[[anyButtonClicked_]]" consent-confirmation> - $i18n{syncConfirmationSettingsLabel} diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_BUILD.gn b/www/iridium/files/patch-chrome_browser_safe__browsing_BUILD.gn deleted file mode 100644 index a5b1c7875a14..000000000000 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_BUILD.gn +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/safe_browsing/BUILD.gn.orig 2024-01-25 17:18:38 UTC -+++ chrome/browser/safe_browsing/BUILD.gn -@@ -144,6 +144,7 @@ static_library("safe_browsing") { - "//chrome/browser/profiles:profile", - "//chrome/common/safe_browsing:proto", - "//components/autofill/core/browser", -+ "//components/compose:buildflags", - "//components/content_settings/core/browser", - "//components/no_state_prefetch/browser", - "//components/omnibox/browser", diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index 9789f8231a15..d868027811a1 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -18,7 +18,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -421,7 +421,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -434,7 +434,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index eb95cde8f826..012575cd0643 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc @@ -21,7 +21,7 @@ #include "content/public/browser/browser_thread.h" @@ -15,10 +15,10 @@ #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) { + } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT && + !base::FeatureList::IsEnabled(kMaldocaSkipCheck)) { StartExtractDocumentFeatures(); - #endif -@@ -312,7 +312,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -324,7 +324,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc new file mode 100644 index 000000000000..500f38021daa --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc @@ -0,0 +1,20 @@ +--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/screen_ai/screen_ai_install_state.cc +@@ -22,7 +22,7 @@ + #include "services/screen_ai/public/cpp/utilities.h" + #include "ui/accessibility/accessibility_features.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/cpu.h" + #include "base/files/file_util.h" + #endif +@@ -32,7 +32,7 @@ const int kScreenAICleanUpDelayInDays = 30; + const char kMinExpectedVersion[] = "123.1"; + + bool IsDeviceCompatible() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if defined(ARCH_CPU_X86_FAMILY) + // Check if the CPU has the required instruction set to run the Screen AI + // library. diff --git a/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc new file mode 100644 index 000000000000..c0b5b4e8bb84 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -0,0 +1,20 @@ +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/screen_ai/screen_ai_service_router.cc +@@ -280,7 +280,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { + base::FilePath binary_path = state_instance->get_component_binary_path(); + #if BUILDFLAG(IS_WIN) + std::vector<base::FilePath> preload_libraries = {binary_path}; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::vector<std::string> extra_switches = { + base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), + binary_path.MaybeAsASCII().c_str())}; +@@ -294,7 +294,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { + .WithPreloadedLibraries( + preload_libraries, + content::ServiceProcessHostPreloadLibraries::GetPassKey()) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + .WithExtraCommandLineSwitches(extra_switches) + #endif // BUILDFLAG(IS_WIN) + .Pass()); diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc index 1c3ac628b2e3..9f8da6367ccd 100644 --- a/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc +++ b/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc @@ -1,20 +1,20 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "components/send_tab_to_self/features.h" #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" #endif -@@ -48,7 +48,7 @@ SendTabToSelfToolbarIconController* +@@ -47,7 +47,7 @@ SendTabToSelfToolbarIconController* ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( Profile* profile) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) for (const std::unique_ptr<ReceivingUiHandler>& handler : applicable_handlers_) { auto* button_controller = diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc index e84f454bc3ba..376f8d1f3499 100644 --- a/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ b/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ #include "components/send_tab_to_self/send_tab_to_self_model.h" #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" #endif -@@ -51,7 +51,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely( +@@ -50,7 +50,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely( const std::vector<const SendTabToSelfEntry*>& new_entries) { for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index 8793f65b16d9..b60037ae337a 100644 --- a/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -326,7 +326,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -328,7 +328,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( bool SharingDeviceRegistration::IsRemoteCopySupported() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index 02af82a89e52..244258bffe78 100644 --- a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,8 +9,8 @@ #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS) -@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl - } +@@ -74,7 +74,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl + #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_shortcuts_icon__badging.cc b/www/iridium/files/patch-chrome_browser_shortcuts_icon__badging.cc new file mode 100644 index 000000000000..09b01eaece47 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_shortcuts_icon__badging.cc @@ -0,0 +1,11 @@ +--- chrome/browser/shortcuts/icon_badging.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/shortcuts/icon_badging.cc +@@ -59,7 +59,7 @@ enum class BadgeSize { + constexpr ShortcutSize kSizesNeededForShortcutCreation[] = { + ShortcutSize::k16, ShortcutSize::k32, ShortcutSize::k128, + ShortcutSize::k256, ShortcutSize::k512}; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr ShortcutSize kSizesNeededForShortcutCreation[] = {ShortcutSize::k32, + ShortcutSize::k128}; + #elif BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc index 241d64c91cee..6b68417a0b57 100644 --- a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/signin/signin_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/signin/signin_util.cc -@@ -75,7 +75,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour +@@ -80,7 +80,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour CookiesMover::~CookiesMover() = default; void CookiesMover::StartMovingCookies() { diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc new file mode 100644 index 000000000000..6e3748cb0c50 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc +@@ -185,7 +185,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte + return; + } + } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + CHECK(contents.value()); + content::WebContents* web_contents = contents.value().get(); + if (CanInstallExtensions()) { diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc new file mode 100644 index 000000000000..4fe9cbe101da --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -0,0 +1,20 @@ +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc +@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager:: + ActivateManagementPolicyAndUpdateRegistration() { + SetActiveForSupervisedUsers(); + UpdateManagementPolicyRegistration(); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MaybeMarkExtensionsLocallyParentApproved(); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + } +@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten + return false; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void SupervisedUserExtensionsManager:: + MaybeMarkExtensionsLocallyParentApproved() { + supervised_user::LocallyParentApprovedExtensionsMigrationState diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h new file mode 100644 index 000000000000..e48d61af9102 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h @@ -0,0 +1,11 @@ +--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/supervised_user/supervised_user_extensions_manager.h +@@ -147,7 +147,7 @@ class SupervisedUserExtensionsManager : public Extensi + // launched. + bool ShouldBlockExtension(const std::string& extension_id) const; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Triggers an one-time migration of the present extensions as parent-approved + // when the feature + // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc index 3820b3f82a8a..cee4480c5635 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc -@@ -44,7 +44,7 @@ +@@ -47,7 +47,7 @@ #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h" #elif BUILDFLAG(IS_CHROMEOS) #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h" #endif -@@ -64,7 +64,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr +@@ -67,7 +67,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr #elif BUILDFLAG(IS_ANDROID) return std::make_unique<SupervisedUserWebContentHandlerImpl>( web_contents, frame_id, navigation_id); diff --git a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc index a0359f1dc947..06fe335a1d48 100644 --- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -111,7 +111,7 @@ +@@ -116,7 +116,7 @@ #endif // BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -8,17 +8,17 @@ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - #endif // !BUILDFLAG(IS_ANDROID) - + #elif BUILDFLAG(IS_ANDROID) +@@ -474,7 +474,7 @@ ChromeSyncClient::CreateModelTypeControllers( + // platforms. + bool enable_tab_group_sync = false; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) { - controllers.push_back(std::make_unique<syncer::ModelTypeController>( - syncer::SAVED_TAB_GROUP, -@@ -454,7 +454,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + enable_tab_group_sync = true; + #elif BUILDFLAG(IS_ANDROID) + enable_tab_group_sync = tab_groups::IsTabGroupSyncEnabled(GetPrefService()); +@@ -506,7 +506,7 @@ ChromeSyncClient::CreateModelTypeControllers( // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,12 +27,12 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -610,7 +610,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate> - ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) { +@@ -663,7 +663,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy switch (type) { + case syncer::SAVED_TAB_GROUP: { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - case syncer::SAVED_TAB_GROUP: { - DCHECK(base::FeatureList::IsEnabled(features::kTabGroupsSave)); - return SavedTabGroupServiceFactory::GetForProfile(profile_) + auto* keyed_service = + tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_); + CHECK(keyed_service); diff --git a/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc index b56fcedf18ab..8d90b9a8299a 100644 --- a/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc +++ b/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc @@ -1,7 +1,7 @@ ---- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/sync/device_info_sync_client_impl.cc @@ -41,7 +41,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD - // in lacros-chrome once build flag switch of lacros-chrome is + // included in lacros-chrome once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc index d5eda331b2a7..50516c7ab22b 100644 --- a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,16 +1,16 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -84,7 +84,7 @@ +@@ -82,7 +82,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || - // BUILDFLAG(IS_WIN) -@@ -131,7 +131,7 @@ std::unique_ptr<KeyedService> BuildSyncService( - // TODO(crbug.com/1052397): Reassess whether the following block needs to be + #elif BUILDFLAG(IS_ANDROID) + #include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h" +@@ -133,7 +133,7 @@ std::unique_ptr<KeyedService> BuildSyncService( + // TODO(crbug.com/40118868): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -18,12 +18,12 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -258,7 +258,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -269,7 +269,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - DependsOn(SavedTabGroupServiceFactory::GetInstance()); - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || - // BUILDFLAG(IS_WIN) + DependsOn(tab_groups::SavedTabGroupServiceFactory::GetInstance()); + #elif BUILDFLAG(IS_ANDROID) + DependsOn(tab_groups::TabGroupSyncServiceFactory::GetInstance()); diff --git a/www/iridium/files/patch-chrome_browser_sync_sync__service__util.cc b/www/iridium/files/patch-chrome_browser_sync_sync__service__util.cc index 26758cf4195c..962f7edbc959 100644 --- a/www/iridium/files/patch-chrome_browser_sync_sync__service__util.cc +++ b/www/iridium/files/patch-chrome_browser_sync_sync__service__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/sync_service_util.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/sync/sync_service_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/sync/sync_service_util.cc @@ -9,7 +9,7 @@ #include "components/sync/base/features.h" @@ -9,7 +9,7 @@ #include "components/variations/service/variations_service.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -22,7 +22,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() { +@@ -21,7 +21,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() { } #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h index a740622057ef..a49a80a381f4 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/task_manager/sampling/task_group.h @@ -44,7 +44,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -150,7 +150,7 @@ class TaskGroup { +@@ -152,7 +152,7 @@ class TaskGroup { } #endif // BUILDFLAG(ENABLE_NACL) @@ -18,7 +18,7 @@ int open_fd_count() const { return open_fd_count_; } void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -170,7 +170,7 @@ class TaskGroup { +@@ -172,7 +172,7 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -27,7 +27,7 @@ void OnOpenFdCountRefreshDone(int open_fd_count); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -243,7 +243,7 @@ class TaskGroup { +@@ -244,7 +244,7 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index ca139cbcef5b..1afc9938f0dc 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -46,7 +46,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -9,7 +9,7 @@ const OnOpenFdCountCallback& on_open_fd_count, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority) -@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -56,7 +56,7 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), @@ -18,7 +18,7 @@ on_open_fd_count_callback_(on_open_fd_count), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) on_process_priority_callback_(on_process_priority) { -@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(on_swapped_mem_refresh_callback_)); } @@ -27,7 +27,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { blocking_pool_runner_->PostTaskAndReplyWithResult( -@@ -95,7 +95,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -36,7 +36,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { blocking_pool_runner_->PostTaskAndReplyWithResult( -@@ -144,7 +144,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -150,7 +150,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index dbb47575bbd4..c8197f68ca21 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -217,7 +217,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -218,7 +218,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc index c6873801825e..8130d5a37acf 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/themes/theme_service.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/themes/theme_service.cc -@@ -74,7 +74,7 @@ +@@ -73,7 +73,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -330,7 +330,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -329,7 +329,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc index 0a9c917bd8ba..e408b88ad0a7 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,8 +1,8 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -27,11 +27,11 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) @@ -25,7 +25,7 @@ @@ -117,9 +117,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index 778861cb7cc8..cd6830ba8607 100644 --- a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -526,7 +526,7 @@ +@@ -518,7 +518,7 @@ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ E(kActionContentContextQuickAnswersInlineQuery, \ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) diff --git a/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc new file mode 100644 index 000000000000..4e4c2eb1a4c1 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc +@@ -47,7 +47,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { + DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( + ContentAutofillClient* client) + : client_(CHECK_DEREF(client)) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + scoped_observation_.Observe(BrowserList::GetInstance()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + } +@@ -90,7 +90,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye + } + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void DesktopPaymentsWindowManager::OnBrowserSetLastActive(Browser* browser) { + // If there is an ongoing payments window manager pop-up flow, and the + // original tab's WebContents become active, activate the pop-up's diff --git a/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h new file mode 100644 index 000000000000..b06a0ad49133 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h @@ -0,0 +1,38 @@ +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h +@@ -14,7 +14,7 @@ + #include "components/autofill/core/browser/payments/payments_window_manager.h" + #include "content/public/browser/web_contents_observer.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #include "base/scoped_observation.h" + #include "chrome/browser/ui/browser_list.h" + #include "chrome/browser/ui/browser_list_observer.h" +@@ -39,7 +39,7 @@ class PaymentsWindowUserConsentDialogControllerImpl; + // WebContents of the original tab that the pop-up is created in. If there is a + // pop-up currently present, `this` will observe the WebContents of that pop-up. + class DesktopPaymentsWindowManager : public PaymentsWindowManager, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + public BrowserListObserver, + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + public content::WebContentsObserver { +@@ -58,7 +58,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi + content::NavigationHandle* navigation_handle) override; + void WebContentsDestroyed() override; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // BrowserListObserver: + void OnBrowserSetLastActive(Browser* browser) override; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -132,7 +132,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi + std::unique_ptr<PaymentsWindowUserConsentDialogControllerImpl> + payments_window_user_consent_dialog_controller_; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + base::ScopedObservation<BrowserList, BrowserListObserver> scoped_observation_{ + this}; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h index 44221748edf0..73d688bc1c56 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser.h +++ b/www/iridium/files/patch-chrome_browser_ui_browser.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/browser.h.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/browser.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/browser.h -@@ -293,7 +293,7 @@ class Browser : public TabStripModelObserver, - absl::optional<int64_t> display_id; +@@ -329,7 +329,7 @@ class Browser : public TabStripModelObserver, + std::optional<int64_t> display_id; #endif -#if BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc index deb74337775e..a6a860d1d96a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -121,7 +121,7 @@ +@@ -127,7 +127,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" #endif -@@ -303,7 +303,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -309,7 +309,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,16 +18,16 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -561,7 +561,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -573,7 +573,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,9 +36,18 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -1234,12 +1234,12 @@ void BrowserCommandController::InitCommandState() { +@@ -767,7 +767,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + break; + case IDC_CREATE_SHORTCUT: + base::RecordAction(base::UserMetricsAction("CreateShortcut")); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { + chrome::CreateDesktopShortcutForActiveWebContents(browser_); + } else { +@@ -1270,12 +1270,12 @@ void BrowserCommandController::InitCommandState() { #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc new file mode 100644 index 000000000000..0c64382ee7b2 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/browser_ui_prefs.cc +@@ -175,7 +175,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry + registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); + registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); + registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + } diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc index 4108379dcf17..0c6779375185 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -79,7 +79,7 @@ +@@ -86,7 +86,7 @@ + #include "components/signin/public/identity_manager/identity_manager.h" #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -672,7 +672,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -719,7 +719,7 @@ void ShowShortcutCustomizationApp(Profile* profile, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) void ShowWebAppSettingsImpl(Browser* browser, Profile* profile, const std::string& app_id, diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h index c517e0bb026e..f57ae1750336 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,20 +1,20 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/chrome_pages.h -@@ -38,7 +38,7 @@ enum class ConsentLevel; +@@ -39,7 +39,7 @@ namespace signin { + enum class ConsentLevel; } // namespace signin - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -255,7 +255,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -196,7 +196,7 @@ void ShowShortcutCustomizationApp(Profile* profile, + const std::string& category); #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) // Show chrome://app-settings/<app-id> page. void ShowWebAppSettings(Browser* browser, const std::string& app_id, diff --git a/www/iridium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/iridium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc deleted file mode 100644 index 253b89303686..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2023-11-22 14:00:11 UTC -+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc -@@ -19,7 +19,7 @@ - - // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding - // here. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const int ExclusiveAccessBubble::kPaddingPx = 8; - #else - const int ExclusiveAccessBubble::kPaddingPx = 15; diff --git a/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index 53c167424e67..2bd2af96071d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1995,7 +1995,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { - OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() - ? omnibox::kShareWinChromeRefreshIcon - : omnibox::kShareWinIcon; +@@ -1978,7 +1978,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { + return omnibox::kShareMacChromeRefreshIcon; + #elif BUILDFLAG(IS_WIN) + return omnibox::kShareWinChromeRefreshIcon; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return OmniboxFieldTrial::IsChromeRefreshIconsEnabled() || - OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() - ? omnibox::kShareLinuxChromeRefreshIcon + return omnibox::kShareLinuxChromeRefreshIcon; + #else + return omnibox::kShareChromeRefreshIcon; diff --git a/www/iridium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc b/www/iridium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc new file mode 100644 index 000000000000..574a6b1c5260 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_passwords_bubble__controllers_relaunch__chrome__bubble__controller.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/passwords/bubble_controllers/relaunch_chrome_bubble_controller.cc +@@ -44,7 +44,7 @@ std::u16string RelaunchChromeBubbleController::GetTitl + #if BUILDFLAG(IS_MAC) + ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_BRANDED + : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_NON_BRANDED +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_BRANDED + : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_TITLE_LINUX_NON_BRANDED + #endif +@@ -57,7 +57,7 @@ std::u16string RelaunchChromeBubbleController::GetBody + #if BUILDFLAG(IS_MAC) + ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_BRANDED + : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_NON_BRANDED +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ? IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_BRANDED + : IDS_PASSWORD_MANAGER_RELAUNCH_CHROME_BUBBLE_DESCRIPTION_LINUX_NON_BRANDED + #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc new file mode 100644 index 000000000000..00936cdfe263 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc +@@ -92,7 +92,7 @@ int ManagePasswordsUIController::save_fallback_timeout + + namespace { + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Should be kept in sync with constant declared in + // bubble_controllers/relaunch_chrome_bubble_controller.cc. + constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; +@@ -475,7 +475,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor + } + + void ManagePasswordsUIController::OnKeychainError() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + CHECK(!dialog_controller_); + PrefService* prefs = + Profile::FromBrowserContext(web_contents()->GetBrowserContext()) diff --git a/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h b/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h index 2bb7860233a3..68d099570054 100644 --- a/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h +++ b/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2023-04-22 17:45:15 UTC +--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h -@@ -37,7 +37,7 @@ class SharingHubBubbleController { +@@ -36,7 +36,7 @@ class SharingHubBubbleController { + // Returns true if the omnibox icon should be shown. virtual bool ShouldOfferOmniboxIcon() = 0; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) // This method returns the set of first-party actions, which are actions // internal to Chrome. Third-party actions (those outside Chrome) are // currently not supported. diff --git a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 60b873d9f8dd..826d711c637b 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -253,7 +253,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -334,7 +334,7 @@ void SigninViewController::ShowModalManagedUserNoticeD bool show_link_data_option, signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -8,4 +8,4 @@ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) CloseModalSignin(); dialog_ = std::make_unique<SigninModalDialogImpl>( - SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate( + SigninViewControllerDelegate::CreateManagedUserNoticeDelegate( diff --git a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h index 7f784b331e72..3e9b52c1cc24 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/signin/signin_view_controller_delegate.h @@ -81,7 +81,7 @@ class SigninViewControllerDelegate { #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -7,5 +7,5 @@ - BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Returns a platform-specific SigninViewContolllerDelegate instance that - // displays the enterprise confirmation modal dialog. The returned object + // displays the managed user notice modal dialog. The returned object // should delete itself when the window it's managing is closed. diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 32a843e2deb7..66a0ced82677 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -104,7 +104,7 @@ const char* const kBadFlags[] = { +@@ -107,7 +107,7 @@ const char* const kBadFlags[] = { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index a1953c67cc87..c4687fbbd655 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -133,7 +133,7 @@ +@@ -136,7 +136,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "components/headless/policy/headless_mode_policy.h" -@@ -925,7 +925,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -965,7 +965,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl"); ComputeAndRecordLaunchMode(command_line); @@ -18,7 +18,7 @@ if (headless::IsHeadlessMode() && headless::HeadlessModePolicy::IsHeadlessModeDisabled( g_browser_process->local_state())) { -@@ -1029,7 +1029,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1078,7 +1078,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -27,7 +27,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1242,7 +1242,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1288,7 +1288,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/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc index d551e1a43e74..df3b46d199be 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -255,7 +255,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -233,7 +233,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc new file mode 100644 index 000000000000..ceb0b5d1d629 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__tab__provider.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/startup/startup_tab_provider.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/startup/startup_tab_provider.cc +@@ -61,7 +61,7 @@ + #include "extensions/browser/extension_registry.h" + #endif // !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/headless/headless_mode_util.h" + #endif + +@@ -105,7 +105,7 @@ bool ValidateUrl(const GURL& url) { + #if BUILDFLAG(IS_CHROMEOS_LACROS) + // In ChromeOS, allow any URL pattern that matches chrome:// scheme. + url_scheme_is_chrome = url.SchemeIs(content::kChromeUIScheme); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // In Headless mode, allow any URL pattern that matches chrome:// scheme if + // the user explicitly allowed it. + if (headless::IsHeadlessMode() && url.SchemeIs(content::kChromeUIScheme)) { diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index d6336769be45..4d0aac3c5dff 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,16 +1,16 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -225,7 +225,7 @@ +@@ -241,7 +241,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -658,12 +658,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +@@ -696,12 +696,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/iridium/files/patch-chrome_browser_ui_tabs_organization_trigger__observer.h b/www/iridium/files/patch-chrome_browser_ui_tabs_organization_trigger__observer.h deleted file mode 100644 index e94cb9420e53..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_tabs_organization_trigger__observer.h +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/ui/tabs/organization/trigger_observer.h.orig 2024-02-04 14:46:08 UTC -+++ chrome/browser/ui/tabs/organization/trigger_observer.h -@@ -6,6 +6,7 @@ - #define CHROME_BROWSER_UI_TABS_ORGANIZATION_TRIGGER_OBSERVER_H_ - - #include <memory> -+#include <unordered_map> - - #include "base/functional/callback.h" - #include "chrome/browser/ui/browser_list_observer.h" diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index a7b1967541ae..f9893b21fbbb 100644 --- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc @@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -799,7 +799,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -806,7 +806,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc b/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc index ca7b950e8e40..9071934312c9 100644 --- a/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc +++ b/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/test/popup_browsertest.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/ui/test/popup_browsertest.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/test/popup_browsertest.cc @@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo const display::Display display = GetDisplayNearestBrowser(popup); @@ -6,7 +6,7 @@ expected.AdjustToFit(display.work_area()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1286870) Desktop Linux window bounds are inaccurate. + // TODO(crbug.com/40815883) Desktop Linux window bounds are inaccurate. expected.Outset(50); EXPECT_TRUE(expected.Contains(popup->window()->GetBounds())) @@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent @@ -15,6 +15,6 @@ gfx::Rect work_area(display.work_area()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1286870) Desktop Linux bounds flakily extend outside the + // TODO(crbug.com/40815883) Desktop Linux bounds flakily extend outside the // work area on trybots, when opening with excessive width and height, e.g.: // width=${screen.availWidth+300},height=${screen.availHeight+300} yields: diff --git a/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc index 469cf0b80caf..35da375e1f39 100644 --- a/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -1,17 +1,17 @@ ---- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-08-28 20:17:35 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/test/test_browser_ui.cc @@ -22,7 +22,7 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "content/public/common/content_switches.h" #include "ui/base/test/skia_gold_matching_algorithm.h" -@@ -35,7 +35,7 @@ - // TODO(https://crbug.com/958242) support Mac for pixel tests. - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +@@ -39,7 +39,7 @@ + // TODO(crbug.com/40625383) support Mac for pixel tests. + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc index 179411b97f15..6382eb5abec6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/ui_features.cc -@@ -315,7 +315,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -446,7 +446,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.h b/www/iridium/files/patch-chrome_browser_ui_ui__features.h index 131b0b76ff12..229330f2792a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/ui_features.h -@@ -195,7 +195,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -288,7 +288,7 @@ bool IsToolbarPinningEnabled(); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 8f09ce1ec46f..7c2bd0efc2bd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, @@ -27,8 +27,8 @@ IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {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}, diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index c1b7b57a67a5..7ee9f87e4ef2 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( return controller; })); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index eee2b1d17176..f83ae56a9680 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,8 +1,8 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -54,11 +54,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -59,11 +59,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc index 26ac219dd754..47c517596c02 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/chrome_views_delegate_linux.cc -@@ -23,7 +23,7 @@ bool IsDesktopEnvironmentUnity() { +@@ -26,7 +26,7 @@ bool IsDesktopEnvironmentUnity() { return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY; } @@ -9,7 +9,7 @@ int GetWindowIconResourceId() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) switch (chrome::GetChannel()) { -@@ -67,7 +67,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative +@@ -80,7 +80,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative delegate); } diff --git a/www/iridium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc new file mode 100644 index 000000000000..75aed55a8bc1 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_compose_compose__dialog__view.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/compose/compose_dialog_view.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/compose/compose_dialog_view.cc +@@ -159,7 +159,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit( + views::Widget::InitParams* params, + views::Widget* widget) const { + WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // In linux, windows may be clipped to their anchors' bounds, + // resulting in visual errors, unless they use accelerated rendering. See + // crbug.com/1445770 for details. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_dark__mode__manager__linux.h b/www/iridium/files/patch-chrome_browser_ui_views_dark__mode__manager__linux.h deleted file mode 100644 index 3ba2303d95be..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_dark__mode__manager__linux.h +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/ui/views/dark_mode_manager_linux.h.orig 2023-10-21 11:51:27 UTC -+++ chrome/browser/ui/views/dark_mode_manager_linux.h -@@ -6,6 +6,7 @@ - #define CHROME_BROWSER_UI_VIEWS_DARK_MODE_MANAGER_LINUX_H_ - - #include <string> -+#include <vector> - - #include "base/gtest_prod_util.h" - #include "base/memory/scoped_refptr.h" diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 6837b305d7dd..77d4989eec08 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -54,7 +54,7 @@ #include "components/user_manager/user_manager.h" @@ -18,15 +18,15 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -180,7 +180,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() { Init(std::move(params)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Because getting `linux_ui_theme` requires `native_widget_` to be - // initialized, this needs to happen after Init(). - if (!IsIncognitoBrowser() && + SelectNativeTheme(); + #else + SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi()); @@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), @@ -36,7 +36,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -558,7 +558,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -563,7 +563,7 @@ void BrowserFrame::OnMenuClosed() { } void BrowserFrame::SelectNativeTheme() { @@ -45,7 +45,7 @@ // Use the regular NativeTheme instance if running incognito mode, regardless // of system theme (gtk, qt etc). ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); -@@ -599,7 +599,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -604,7 +604,7 @@ void BrowserFrame::OnTouchUiChanged() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h index 3cc1f2aa6c5b..882ef949b920 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -1,29 +1,20 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/browser_frame.h -@@ -12,7 +12,7 @@ - #include "ui/views/context_menu_controller.h" - #include "ui/views/widget/widget.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "ui/base/ui_base_types.h" - #endif - -@@ -68,7 +68,7 @@ class BrowserFrame : public views::Widget, public view +@@ -65,7 +65,7 @@ class BrowserFrame : public views::Widget, public view ~BrowserFrame() override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Returns which edges of the frame are tiled. - const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; } - void set_tiled_edges(ui::WindowTiledEdges tiled_edges) { -@@ -230,7 +230,7 @@ class BrowserFrame : public views::Widget, public view +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns whether the frame is in a tiled state. + bool tiled() const { return tiled_; } + void set_tiled(bool tiled) { tiled_ = tiled; } +@@ -225,7 +225,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - ui::WindowTiledEdges tiled_edges_; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool tiled_ = false; #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc new file mode 100644 index 000000000000..8c1b162abf3d --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc +@@ -53,7 +53,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame + OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets()); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const bool tiled = delegate_->IsTiled(); + #else + const bool tiled = false; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc new file mode 100644 index 000000000000..c1b43b1a1856 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux__native.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.cc +@@ -18,7 +18,7 @@ BrowserFrameViewLayoutLinuxNative::~BrowserFrameViewLa + + ui::WindowFrameProvider* BrowserFrameViewLayoutLinuxNative::GetFrameProvider() + const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const bool tiled = delegate_->IsTiled(); + #else + const bool tiled = false; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc new file mode 100644 index 000000000000..0657c35be218 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc +@@ -60,7 +60,7 @@ gfx::ShadowValues BrowserFrameViewLinux::GetShadowValu + + void BrowserFrameViewLinux::PaintRestoredFrameBorder( + gfx::Canvas* canvas) const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const bool tiled = frame()->tiled(); + #else + const bool tiled = false; +@@ -104,7 +104,7 @@ void BrowserFrameViewLinux::OnWindowButtonOrderingChan + } + + float BrowserFrameViewLinux::GetRestoredCornerRadiusDip() const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const bool tiled = frame()->tiled(); + #else + const bool tiled = false; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 143e23cd4048..790510e57bb4 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/iridium/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 2023-07-24 14:27:53 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_win.h" @@ -18,12 +18,3 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -81,7 +81,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows - if (browser_view->browser()->is_type_picture_in_picture()) { - auto view = - std::make_unique<PictureInPictureBrowserFrameView>(frame, browser_view); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* profile = browser_view->browser()->profile(); - auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); - auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index c81f50383499..dd5e5ed1f2d4 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2168,7 +2168,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2220,7 +2220,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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)) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 121f98cdffe1..f062669012fa 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -54,7 +54,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -11,23 +11,23 @@ @@ -566,7 +566,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -589,7 +589,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -585,7 +585,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const { - return frame()->tiled_edges(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool OpaqueBrowserFrameView::IsTiled() const { + return frame()->tiled(); } -@@ -787,7 +787,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -783,7 +783,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index 00f287e16cb8..684d17a6913a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,12 +1,12 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h @@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient + void UpdateWindowControlsOverlay( const gfx::Rect& bounding_rect) const override; - bool IsTranslucentWindowOpacitySupported() const override; bool ShouldDrawRestoredFrameShadow() const override; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - ui::WindowTiledEdges GetTiledEdges() const override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool IsTiled() const override; #endif int WebAppButtonHeight() const override; @@ -232,7 +232,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h index d726dab8180f..c4707f0264a6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h @@ -10,7 +10,7 @@ #include "build/build_config.h" @@ -9,12 +9,12 @@ #include "ui/base/ui_base_types.h" #endif -@@ -97,7 +97,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { +@@ -94,7 +94,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { // Returns true if a client-side shadow should be drawn for restored windows. virtual bool ShouldDrawRestoredFrameShadow() const = 0; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Returns which edges of the window are snapped to the edges of the desktop - // (or "tiled"). - virtual ui::WindowTiledEdges GetTiledEdges() const = 0; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Returns whether the window is in a tiled state. + virtual bool IsTiled() const = 0; + #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index ea83bb851326..5c8166d32966 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,24 +1,24 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -55,7 +55,7 @@ +@@ -58,7 +58,7 @@ #include "ui/aura/window.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/themes/theme_service.h" + #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" - #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" - #endif -@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -88,7 +88,7 @@ constexpr int kContentSettingIconSize = 16; // The height of the controls bar at the top of the window. - constexpr int kTopControlsHeight = 30; + constexpr int kTopControlsHeight = 34; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -180,7 +180,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,16 +27,16 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -560,7 +560,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -579,7 +579,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - frame_background_ = std::make_unique<views::FrameBackground>(); - #endif - -@@ -736,7 +736,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( + auto* profile = browser_view->browser()->profile(); + auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); + auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); +@@ -798,7 +798,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -811,7 +811,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -880,7 +880,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1058,7 +1058,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1136,7 +1136,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -1182,7 +1182,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1270,7 +1270,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -71,22 +71,22 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); - const auto tiled_edges = frame()->tiled_edges(); -@@ -1203,7 +1203,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor + const bool tiled = frame()->tiled(); +@@ -1288,7 +1288,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return FrameBorderInsets(); - #elif BUILDFLAG(IS_CHROMEOS_ASH) - return gfx::Insets(chromeos::kResizeInsideBoundsSize); -@@ -1224,7 +1224,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie + #elif !BUILDFLAG(IS_CHROMEOS_ASH) + return gfx::Insets(kResizeBorder); +@@ -1309,7 +1309,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void PictureInPictureBrowserFrameView::SetWindowFrameProvider( - ui::WindowFrameProvider* window_frame_provider) { - DCHECK(window_frame_provider); + bool PictureInPictureBrowserFrameView::ShouldDrawFrameShadow() const { + return static_cast<DesktopBrowserFrameAuraLinux*>( + frame()->native_browser_frame()) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 8775ba806364..31e53d467f7a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -24,7 +24,7 @@ - #include "ui/views/controls/image_view.h" +@@ -27,7 +27,7 @@ + #include "ui/views/layout/flex_layout_view.h" #include "ui/views/widget/widget_observer.h" -#if BUILDFLAG(IS_LINUX) @@ -9,17 +9,17 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -32,7 +32,7 @@ - // window, so to prevent cutting off important dialogs we resize the - // picture-in-picture window to fit them. While ChromeOS also uses Aura, it does - // not have this issue so we do not resize on ChromeOS. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +@@ -35,7 +35,7 @@ + // parent window, so to prevent cutting off important dialogs we resize the + // picture-in-picture window to fit them. While ChromeOS Ash also uses Aura, it + // does not have this issue so we do not resize on ChromeOS Ash. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1 - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - -@@ -97,7 +97,7 @@ class PictureInPictureBrowserFrameView - void Layout() override; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -101,7 +101,7 @@ class PictureInPictureBrowserFrameView + void Layout(PassKey) override; void AddedToWidget() override; void RemovedFromWidget() override; -#if BUILDFLAG(IS_LINUX) @@ -27,18 +27,18 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -191,7 +191,7 @@ class PictureInPictureBrowserFrameView +@@ -192,7 +192,7 @@ class PictureInPictureBrowserFrameView // Returns true if there's an overlay view that's currently shown. bool IsOverlayViewVisible() const; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Sets the window frame provider so that it will be used for drawing. - void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); + // Returns whether a client-side shadow should be drawn for the window. + bool ShouldDrawFrameShadow() const; -@@ -358,7 +358,7 @@ class PictureInPictureBrowserFrameView +@@ -368,7 +368,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. - absl::optional<SkColor> current_foreground_color_; + std::optional<SkColor> current_foreground_color_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index e50b7003f997..2d158b557f7b 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) @@ -11,7 +11,7 @@ model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); @@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index 3da5a5738247..837c0df650c5 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -21,7 +21,7 @@ #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h" @@ -20,7 +20,7 @@ return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); @@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc index 6f705547548e..549b4ddbaaeb 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -195,7 +195,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr +@@ -193,7 +193,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr - // TODO(crbug.com/1052397): Revisit the macro expression once build flag + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index d736cac22e7f..172669e53bbf 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -405,7 +405,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -406,7 +406,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc new file mode 100644 index 000000000000..72b36aa07379 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc +@@ -1951,7 +1951,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( + } + + void OmniboxViewViews::OnPopupOpened() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // It's not great for promos to overlap the omnibox if the user opens the + // drop-down after showing the promo. This especially causes issues on Mac and + // Linux due to z-order/rendering issues, see crbug.com/1225046 and diff --git a/www/iridium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/iridium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc new file mode 100644 index 000000000000..8df0ae7f091b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc +@@ -34,7 +34,7 @@ + #include "ui/base/metadata/metadata_impl_macros.h" + #include "ui/views/controls/button/button.h" + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" + #endif + +@@ -132,7 +132,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create + } else if (model_state == + password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) { + view = new SharedPasswordsNotificationView(web_contents, anchor_view); +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + } else if (model_state == password_manager::ui::KEYCHAIN_ERROR_STATE) { + view = new RelaunchChromeView( + web_contents, anchor_view, diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_dice__web__signin__interception__backdrop__layer.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_dice__web__signin__interception__backdrop__layer.cc deleted file mode 100644 index 5123e4bec054..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_dice__web__signin__interception__backdrop__layer.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc.orig 2023-11-22 14:00:11 UTC -+++ chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc -@@ -89,7 +89,7 @@ void DiceWebSigninInterceptionBackdropLayer::DrawDarkB - // The dark layer should be drawn on top of this region, but it's not easily - // accessible in code, and requires specific implementations. - // After the 2023 refresh, this drag area no longer exists. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // On linux, the drag area is accessible through the - // `MirroredFrameBorderInsets()` function, which crashes on non-Linux - // platforms. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc new file mode 100644 index 000000000000..e61dedfb5c1d --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/profiles/profile_menu_view.cc +@@ -83,7 +83,7 @@ + #include "ui/strings/grit/ui_strings.h" + #include "ui/views/accessibility/view_accessibility.h" + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" + #endif + +@@ -589,7 +589,7 @@ void ProfileMenuView::BuildIdentity() { + badge_image_model, menu_title_, menu_subtitle_, management_label); + } else { + std::string profile_user_display_name, profile_user_email; +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + profile_user_display_name = profile->GetPrefs()->GetString( + enterprise_signin::prefs::kProfileUserDisplayName); + profile_user_email = profile->GetPrefs()->GetString( diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 4ddde57cd516..e3b596d7cc48 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -660,7 +660,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -723,7 +723,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // TODO(crbug.com/40118868): Revisit 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) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 7447ff45c171..9dd0ac7011dc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -56,7 +56,7 @@ namespace { +@@ -58,7 +58,7 @@ namespace { const int kModalDialogWidth = 448; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - const int kEnterpriseConfirmationDialogWidth = 512; - const int kEnterpriseConfirmationDialogHeight = 576; - #endif -@@ -182,7 +182,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom + const int kManagedUserNoticeConfirmationDialogWidth = 512; + const int kManagedUserNoticeConfirmationDialogHeight = 576; + const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 900; +@@ -187,7 +187,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -17,8 +17,8 @@ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // static std::unique_ptr<views::WebView> - SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -327,7 +327,7 @@ SigninViewControllerDelegateViews::SigninViewControlle + SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( +@@ -348,7 +348,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(ui::DIALOG_BUTTON_NONE); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ // On the local profile creation dialog, cancelling the dialog (for instance // through the VKEY_ESCAPE accelerator) should delete the profile. if (delete_profile_on_cancel) { -@@ -417,7 +417,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -438,7 +438,7 @@ void SigninViewControllerDelegateViews::DisplayModal() } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -490,7 +490,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -511,7 +511,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -44,4 +44,4 @@ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // static SigninViewControllerDelegate* - SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate( + SigninViewControllerDelegate::CreateManagedUserNoticeDelegate( diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 1c6b0f39b4db..0eae593e1d14 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h @@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView( + static std::unique_ptr<views::WebView> + CreateManagedUserNoticeConfirmationWebView( Browser* browser, - const AccountInfo& account_info, -@@ -137,7 +137,7 @@ class SigninViewControllerDelegateViews +@@ -139,7 +139,7 @@ class SigninViewControllerDelegateViews InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc index 70b9e75a865a..0e73ae287850 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/tab_search_bubble_host.cc -@@ -222,7 +222,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT +@@ -268,7 +268,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT // Mac should have tabsearch on the right side. Windows >= Win10 has the // Tab Search button as a FrameCaptionButton, but it still needs to be on the // left if it exists. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc index b2ede3277a75..1f5c1caca4ab 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -611,7 +611,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& - if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) +@@ -629,7 +629,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Move the hit test area for hovering up so that it is not overlapped by tab // hover cards when they are shown. - // TODO(crbug.com/978134): Once Linux/CrOS widget transparency is solved, + // TODO(crbug.com/41467565): Once Linux/CrOS widget transparency is solved, diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 831d2bd6cbd5..34b1cf55befe 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -89,7 +89,7 @@ +@@ -95,7 +95,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -206,7 +206,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -215,7 +215,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,25 +18,25 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -386,7 +386,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -405,7 +405,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - can_release_capture_ = false; + ref->can_release_capture_ = false; #endif - start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1011,7 +1011,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon + ref->start_point_in_screen_ = +@@ -1069,7 +1069,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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)) // 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. -@@ -2059,7 +2059,7 @@ void TabDragController::CompleteDrag() { +@@ -2151,7 +2151,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,9 +45,9 @@ // 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 -@@ -2483,7 +2483,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2581,7 +2581,7 @@ TabDragController::Liveness TabDragController::GetLoca } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index 8dac77099a24..247d316cec11 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -376,7 +376,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -375,7 +375,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) set_accept_events(false); #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc deleted file mode 100644 index 835f304a4916..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2023-08-28 20:17:35 UTC -+++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc -@@ -81,7 +81,7 @@ void FixWidgetStackOrder(views::Widget* widget, const - return; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Ensure the hover card Widget assumes the highest z-order to avoid occlusion - // by other secondary UI Widgets (such as the omnibox Widget, see - // crbug.com/1226536). diff --git a/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc new file mode 100644 index 000000000000..696543ca6de2 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/views/user_education/browser_user_education_service.cc +@@ -992,7 +992,7 @@ void MaybeRegisterChromeFeaturePromos( + FeaturePromoSpecification::AcceleratorInfo()) + .SetBubbleArrow(HelpBubbleArrow::kTopLeft))); + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // kIPHDesktopPWAsLinkCapturingLaunch: + registry.RegisterFeature(std::move( + FeaturePromoSpecification::CreateForCustomAction( diff --git a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index ab9269ecb188..58e5ce6864c6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,42 +1,42 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -463,7 +463,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -515,7 +515,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -1924,7 +1924,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2096,7 +2096,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated( + ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3243,7 +3243,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3410,7 +3410,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); -#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled( + ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3258,7 +3258,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3425,7 +3425,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled( + ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3268,7 +3268,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3435,7 +3435,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3284,7 +3284,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3451,7 +3451,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,25 +54,25 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4077,7 +4077,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4265,7 +4265,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return override_registration_->test_override->GetShortcutPath( + return override_registration_->test_override().GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4271,7 +4271,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4465,7 +4465,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool is_shortcut_correct = - override_registration_->test_override->IsShortcutCreated(profile, id, - name); -@@ -4315,7 +4315,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr + override_registration_->test_override().IsShortcutCreated(profile, id, + name); +@@ -4509,7 +4509,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } @@ -80,4 +80,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) SkColor expected_icon_pixel_color = GetSiteConfigurationFromAppName(name).icon_color; - absl::optional<SkColor> actual_color_install_icon_size = + std::optional<SkColor> actual_color_install_icon_size = diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h index 74b917592152..d3c8718ec6a8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h +++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/web_applications/web_app_dialogs.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/web_applications/web_app_dialogs.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/web_applications/web_app_dialogs.h -@@ -20,7 +20,7 @@ +@@ -22,7 +22,7 @@ #include "ui/gfx/native_widget_types.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)); -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)); +- BUILDFLAG(IS_CHROMEOS)); ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)); class GURL; class Profile; diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc new file mode 100644 index 000000000000..ea45aa839901 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc +@@ -578,7 +578,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun + content::WebContents* web_contents, + Profile* profile, + const std::string& app_id) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); + CHECK(provider); + +@@ -798,7 +798,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( + } + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void WebAppUiManagerImpl::ShowIPHPromoForAppsLaunchedViaLinkCapturing( + const Browser* browser, + const webapps::AppId& app_id, diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h new file mode 100644 index 000000000000..ccfe41b5f541 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h +@@ -222,7 +222,7 @@ class WebAppUiManagerImpl : public BrowserListObserver + UninstallCompleteCallback uninstall_complete_callback, + webapps::UninstallResultCode uninstall_code); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void ShowIPHPromoForAppsLaunchedViaLinkCapturing(const Browser* browser, + const webapps::AppId& app_id, + bool is_activated); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc index 6aec558afc29..ca4d77089707 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2023-07-24 14:27:53 UTC -+++ chrome/browser/ui/webui/about_ui.cc -@@ -635,7 +635,7 @@ std::string ChromeURLs() { +--- chrome/browser/ui/webui/about/about_ui.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/about/about_ui.cc +@@ -593,7 +593,7 @@ std::string ChromeURLs(content::BrowserContext* browse return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -689,7 +689,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -648,7 +648,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc index 8a0bcf9f37d7..fee47059078f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -415,7 +415,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create +@@ -376,7 +376,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create + app_info->start_url = start_url; bool deprecated_app = false; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) auto* context = extension_system_->extension_service()->GetBrowserContext(); deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); -@@ -478,7 +478,7 @@ void AppHomePageHandler::FillExtensionInfoList( +@@ -439,7 +439,7 @@ void AppHomePageHandler::FillExtensionInfoList( + continue; } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) auto* context = extension_system_->extension_service()->GetBrowserContext(); const bool is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp(context, diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 8b54a8ac54ab..51b3d6406b4e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -210,7 +210,7 @@ +@@ -196,7 +196,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -236,17 +236,17 @@ +@@ -221,17 +221,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 -@@ -403,7 +403,7 @@ bool IsAboutUI(const GURL& url) { +@@ -375,7 +375,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) -@@ -667,7 +667,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -582,7 +582,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -730,7 +730,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -638,7 +638,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) -@@ -791,27 +791,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -686,26 +686,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -84,9 +84,8 @@ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI<BrowserSwitchUI>; #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index 642fe523303e..1920cd46ec03 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc -@@ -6,7 +6,7 @@ - +@@ -7,7 +7,7 @@ #include "build/build_config.h" + #include "components/enterprise/buildflags/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/base64url.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -29,7 +29,7 @@ namespace utils { +@@ -38,7 +38,7 @@ namespace enterprise_connectors::utils { namespace { @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -97,7 +97,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu +@@ -173,7 +173,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index 121e1dba34aa..571bb39845ee 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,11 +1,16 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -92,7 +92,7 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml - {kManagementOnFileTransferVisibleData, - IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, +@@ -99,11 +99,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml + {kManagementOnFileTransferVisibleData, + IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT}, - {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA}, + {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT}, + {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA}, #endif // BUILDFLAG(IS_CHROMEOS) || 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) + {kManagementDeviceSignalsDisclosure, + IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE}, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc new file mode 100644 index 000000000000..cee56912a701 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc @@ -0,0 +1,17 @@ +--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/management/management_ui_constants.cc +@@ -78,12 +78,12 @@ const char kProfileReportingBrowser[] = "profileReport + const char kProfileReportingExtension[] = "profileReportingExtension"; + const char kProfileReportingPolicy[] = "profileReportingPolicy"; + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; + const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; + #endif // BUILDFLAG(IS_CHROMEOS) || 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) + const char kManagementDeviceSignalsDisclosure[] = + "managementDeviceSignalsDisclosure"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h new file mode 100644 index 000000000000..ea834359b26f --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h @@ -0,0 +1,19 @@ +--- chrome/browser/ui/webui/management/management_ui_constants.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/management/management_ui_constants.h +@@ -8,14 +8,14 @@ + #include "build/build_config.h" + #include "build/chromeos_buildflags.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Constants defining the IDs for the localized strings sent to the page as + // load time data. + extern const char kManagementScreenCaptureEvent[]; + extern const char kManagementScreenCaptureData[]; + #endif // BUILDFLAG(IS_CHROMEOS) || 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) + extern const char kManagementDeviceSignalsDisclosure[]; + #endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index d6db921c27a1..a9a631e9222d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,48 +1,24 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc -@@ -94,7 +94,7 @@ - #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -58,7 +58,7 @@ + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/webui/web_ui_util.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 "chrome/browser/enterprise/signals/user_permission_service_factory.h" #include "components/device_signals/core/browser/user_permission_service.h" // nogncheck #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -190,12 +190,12 @@ enum class ReportingType { - kLegacyTech, - }; - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent"; - const char kManagementScreenCaptureData[] = "managementScreenCaptureData"; - #endif // BUILDFLAG(IS_CHROMEOS) || 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) - const char kManagementDeviceSignalsDisclosure[] = - "managementDeviceSignalsDisclosure"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -773,7 +773,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value - GetReportingTypeValue(report_definition.reporting_type)); - report_sources->Append(std::move(data)); +@@ -354,7 +354,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value + report_sources->Append(std::move(data)); + } } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -1061,7 +1061,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec - kManagementOnPageVisitedVisibleData, &info); - } - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) { - AddThreatProtectionPermission(kManagementScreenCaptureEvent, - kManagementScreenCaptureData, &info); -@@ -1145,7 +1145,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -532,7 +532,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h index be4d834b762f..0949025773b0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h +++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h @@ -1,24 +1,7 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.h -@@ -24,14 +24,14 @@ - #include "extensions/common/extension_id.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Constants defining the IDs for the localized strings sent to the page as - // load time data. - extern const char kManagementScreenCaptureEvent[]; - extern const char kManagementScreenCaptureData[]; - #endif // BUILDFLAG(IS_CHROMEOS) || 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) - extern const char kManagementDeviceSignalsDisclosure[]; - #endif // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - -@@ -117,7 +117,7 @@ class StatusCollector; - class SystemLogUploader; +@@ -31,7 +31,7 @@ namespace policy { + class PolicyService; } // namespace policy -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -26,7 +9,7 @@ namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -177,7 +177,7 @@ class ManagementUIHandler : public content::WebUIMessa +@@ -72,7 +72,7 @@ class ManagementUIHandler : public content::WebUIMessa base::Value::List GetManagedWebsitesInfo(Profile* profile) const; base::Value::List GetApplicationsInfo(Profile* profile) const; virtual policy::PolicyService* GetPolicyService(); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc deleted file mode 100644 index eef103511d42..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2024-02-04 14:46:08 UTC -+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -311,7 +311,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI - bool is_deprecated_app = false; - auto* context = extension_service_->GetBrowserContext(); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - is_deprecated_app = - extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); - #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc new file mode 100644 index 000000000000..2658967fa2e7 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/password_manager/promo_cards_handler.cc +@@ -28,7 +28,7 @@ + #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h" + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h" + #endif + +@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge + .get())); + #endif + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + promo_cards.push_back( + std::make_unique<RelaunchChromePromo>(profile->GetPrefs())); + #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc new file mode 100644 index 000000000000..b79c788802dc --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards_relaunch__chrome__promo.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.cc +@@ -37,7 +37,7 @@ std::u16string RelaunchChromePromo::GetTitle() const { + return l10n_util::GetStringUTF16( + #if BUILDFLAG(IS_MAC) + IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE_LINUX + #endif + ); +@@ -47,7 +47,7 @@ std::u16string RelaunchChromePromo::GetDescription() c + return l10n_util::GetStringUTF16( + #if BUILDFLAG(IS_MAC) + IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION_LINUX + #endif + ); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc deleted file mode 100644 index 6defa669a125..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-10-21 11:51:27 UTC -+++ chrome/browser/ui/webui/realbox/realbox_handler.cc -@@ -146,7 +146,7 @@ constexpr char kMacShareIconResourceName[] = - #elif BUILDFLAG(IS_WIN) - constexpr char kWinShareIconResourceName[] = - "//resources/cr_components/omnibox/icons/win_share.svg"; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr char kLinuxShareIconResourceName[] = - "//resources/cr_components/omnibox/icons/share.svg"; - #else -@@ -745,7 +745,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN - icon.name == omnibox::kShareWinChromeRefreshIcon.name) { - return kWinShareIconResourceName; - } --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (icon.name == omnibox::kShareIcon.name || - icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) { - return kLinuxShareIconResourceName; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc new file mode 100644 index 000000000000..d598e85e90ca --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc +@@ -105,7 +105,7 @@ const char* kMacShareIconResourceName = + #elif BUILDFLAG(IS_WIN) + const char* kWinShareIconResourceName = + "//resources/cr_components/searchbox/icons/win_share.svg"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char* kLinuxShareIconResourceName = + "//resources/cr_components/searchbox/icons/share.svg"; + #else +@@ -165,7 +165,7 @@ static void DefineChromeRefreshRealboxIcons() { + #elif BUILDFLAG(IS_WIN) + kWinShareIconResourceName = + "//resources/cr_components/searchbox/icons/win_share_cr23.svg"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + kLinuxShareIconResourceName = + "//resources/cr_components/searchbox/icons/share_cr23.svg"; + #else +@@ -670,7 +670,7 @@ std::string SearchboxHandler::ActionVectorIconToResour + icon.name == omnibox::kShareWinChromeRefreshIcon.name) { + return kWinShareIconResourceName; + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (icon.name == omnibox::kShareIcon.name || + icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) { + return kLinuxShareIconResourceName; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc new file mode 100644 index 000000000000..eea239de177b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc @@ -0,0 +1,46 @@ +--- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/settings/accessibility_main_handler.cc +@@ -19,7 +19,7 @@ + #include "content/public/browser/web_contents.h" + #include "content/public/browser/web_ui.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "ui/accessibility/accessibility_features.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +@@ -39,7 +39,7 @@ void AccessibilityMainHandler::RegisterMessages() { + base::BindRepeating( + &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels, + base::Unretained(this))); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + web_ui()->RegisterMessageCallback( + "getScreenAiInstallState", + base::BindRepeating( +@@ -56,7 +56,7 @@ void AccessibilityMainHandler::OnJavascriptAllowed() { + base::Unretained(this))); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (features::IsPdfOcrEnabled()) { + CHECK(!component_ready_observer_.IsObserving()); + component_ready_observer_.Observe( +@@ -70,14 +70,14 @@ void AccessibilityMainHandler::OnJavascriptDisallowed( + accessibility_subscription_ = {}; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (features::IsPdfOcrEnabled()) { + component_ready_observer_.Reset(); + } + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + void AccessibilityMainHandler::DownloadProgressChanged(double progress) { + CHECK_GE(progress, 0.0); + CHECK_LE(progress, 1.0); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h new file mode 100644 index 000000000000..2f55a319d9d6 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h @@ -0,0 +1,47 @@ +--- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/ui/webui/settings/accessibility_main_handler.h +@@ -13,7 +13,7 @@ + #include "chrome/browser/ash/accessibility/accessibility_manager.h" + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "base/scoped_observation.h" + #include "chrome/browser/screen_ai/screen_ai_install_state.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +@@ -24,7 +24,7 @@ namespace settings { + // chrome://settings/accessibility. + class AccessibilityMainHandler + : public ::settings::SettingsPageUIHandler +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + , + public screen_ai::ScreenAIInstallState::Observer + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +@@ -40,7 +40,7 @@ class AccessibilityMainHandler + void OnJavascriptAllowed() override; + void OnJavascriptDisallowed() override; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // screen_ai::ScreenAIInstallState::Observer: + void DownloadProgressChanged(double progress) override; + void StateChanged(screen_ai::ScreenAIInstallState::State state) override; +@@ -50,7 +50,7 @@ class AccessibilityMainHandler + void HandleGetScreenReaderState(const base::Value::List& args); + void HandleCheckAccessibilityImageLabels(const base::Value::List& args); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + void HandleGetScreenAIInstallState(const base::Value::List& args); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +@@ -63,7 +63,7 @@ class AccessibilityMainHandler + base::CallbackListSubscription accessibility_subscription_; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + base::ScopedObservation<screen_ai::ScreenAIInstallState, + screen_ai::ScreenAIInstallState::Observer> + component_ready_observer_{this}; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 589aeec7d1f4..c1a75501e267 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -137,7 +137,7 @@ - #include "ash/webui/settings/public/constants/routes.mojom.h" +@@ -136,7 +136,7 @@ + #include "chrome/browser/ui/chrome_pages.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) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) #include "ui/display/screen.h" #endif -@@ -156,7 +156,7 @@ +@@ -155,7 +155,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,48 +18,39 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -264,7 +264,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s - base::FeatureList::IsEnabled( - supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); - #else - bool allow_qt_theme = false; -@@ -295,7 +295,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou - {"focusHighlightLabel", - IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, +@@ -272,7 +272,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou + {"focusHighlightLabel", + IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - {"overscrollHistoryNavigationTitle", - IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, - {"overscrollHistoryNavigationSubtitle", -@@ -434,7 +434,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, - {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, - {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, + {"overscrollHistoryNavigationTitle", + IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, + {"overscrollHistoryNavigationSubtitle", +@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, + {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, + {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"gtkTheme", IDS_SETTINGS_GTK_THEME}, - {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, - {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -444,7 +444,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"gtkTheme", IDS_SETTINGS_GTK_THEME}, + {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, + {"qtTheme", IDS_SETTINGS_QT_THEME}, +@@ -422,7 +422,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else - {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, + {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) + {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -469,7 +469,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -445,7 +445,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; diff --git a/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index e7a7be2733d9..25827a8ec42a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/iridium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -216,7 +216,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -210,7 +210,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc new file mode 100644 index 000000000000..97c120f7bd17 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc +@@ -35,7 +35,7 @@ + #include "components/visited_url_ranking/public/visited_url_ranking_service.h" + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" + #endif + +@@ -80,7 +80,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF + + std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + data_fetchers.emplace( + Fetcher::kTabModel, + std::make_unique<visited_url_ranking::DesktopTabModelURLVisitDataFetcher>( diff --git a/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc deleted file mode 100644 index c3273abb4cd9..000000000000 --- a/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-08-28 20:17:35 UTC -+++ chrome/browser/web_applications/commands/install_app_locally_command.cc -@@ -80,7 +80,7 @@ void InstallAppLocallyCommand::StartWithLock( - options.os_hooks[OsHookType::kUninstallationViaOsSettings] = - web_app->CanUserUninstallWebApp(); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; - #else diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h index b798602d27bd..e04815e8e0d2 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/extension_status_utils.h.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/web_applications/extension_status_utils.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/extension_status_utils.h -@@ -56,7 +56,7 @@ bool ClearExternalExtensionUninstalled(content::Browse +@@ -55,7 +55,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo + bool ClearExternalExtensionUninstalled(content::BrowserContext* context, const std::string& extension_id); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // Returns whether |extension_id| is a Chrome App and should be blocked by the - // Chrome Apps Deprecation. Policy installed Chrome Apps are still allowed, and - // all apps are allowed if the deprecation feature flag is not enabled. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If this method returns true, then |extension_id| will not be launchable. + // + // The eventual goal is that this method should return true for all hosted apps, diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index 781fe137b49e..3887c1f2af1e 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,20 +1,20 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc -@@ -26,7 +26,7 @@ namespace { +@@ -25,7 +25,7 @@ namespace { + const char* g_preinstalled_app_for_testing = nullptr; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) // TODO(b/268221237): Remove this allow-list. const char kDefaultAllowedExtensionIds[] = "alhngdkjgnedakdlnamimgfihgkmenbh," -@@ -116,7 +116,7 @@ bool ClearExternalExtensionUninstalled(content::Browse +@@ -113,7 +113,7 @@ bool ClearExternalExtensionUninstalled(content::Browse + extension_id); } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context, const std::string& extension_id) { if (testing::g_enable_chrome_apps_for_testing) { diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h index 297c5979cf64..03e34fecdefd 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/os_integration/os_integration_test_override.h -@@ -92,7 +92,7 @@ class OsIntegrationTestOverride - virtual const base::FilePath& chrome_apps_folder() = 0; +@@ -99,7 +99,7 @@ class OsIntegrationTestOverride + virtual base::FilePath chrome_apps_folder() = 0; virtual void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) = 0; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - virtual const base::FilePath& desktop() = 0; - virtual const base::FilePath& startup() = 0; - virtual const base::FilePath& applications_dir() = 0; + virtual base::Environment* environment() = 0; + #endif + diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index b4b2d1925454..72745423b8fc 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc @@ -65,7 +65,7 @@ namespace { @@ -11,7 +11,7 @@ const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; @@ -227,7 +227,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout - // TODO(crbug.com/1416965): Implement tests on Linux for using shortcuts_menu + // TODO(crbug.com/40257107): Implement tests on Linux for using shortcuts_menu // actions. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 6003fa0a2ec9..4025e17a545b 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -434,7 +434,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -441,7 +441,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } diff --git a/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index 677c485af02b..7bc396418d83 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -128,7 +128,7 @@ namespace web_app { +@@ -101,7 +101,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index dcc332a7b54a..25ccecb2f93b 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc @@ -1,6 +1,15 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc -@@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( +@@ -46,7 +46,7 @@ + #include "third_party/skia/include/core/SkBitmap.h" + #include "third_party/skia/include/core/SkColor.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #endif + +@@ -131,7 +131,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( } #endif @@ -9,7 +18,7 @@ // Performs a blocking read of app icons from the disk. SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager, const webapps::AppId& app_id, -@@ -224,7 +224,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor +@@ -266,7 +266,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); CHECK(base::PathExists(app_folder_shortcut_path)); return base::DeletePathRecursively(app_folder_shortcut_path); @@ -18,7 +27,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -264,7 +264,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -306,7 +306,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -27,7 +36,7 @@ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -278,7 +278,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -320,7 +320,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const webapps::AppId& app_id, const std::string& app_name) { @@ -36,25 +45,25 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -334,7 +334,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -376,7 +376,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FilePath user_applications_dir = - applications_dir().Append("applications"); + base::FilePath user_applications_dir = applications(); bool database_update_called = false; -@@ -378,7 +378,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC - return absl::nullopt; + for (const LinuxFileRegistration& command : linux_file_registration_) { +@@ -419,7 +419,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC + return std::nullopt; } return GetIconTopLeftColorFromShortcutFile(shortcut_path); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile); if (!provider) { - return absl::nullopt; -@@ -428,7 +428,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort + return std::nullopt; +@@ -469,7 +469,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -63,7 +72,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -454,7 +454,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -495,7 +495,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -72,48 +81,39 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -643,7 +643,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -683,7 +683,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const base::FilePath& OsIntegrationTestOverrideImpl::desktop() { + base::FilePath OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -678,7 +678,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri - #elif BUILDFLAG(IS_MAC) - bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path); - CHECK(success); +@@ -734,7 +734,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri + success = chrome_apps_folder_.CreateUniqueTempDirUnderPath( + outer_temp_dir_.GetPath()); + CHECK(success); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool success = desktop_.CreateUniqueTempDirUnderPath(base_path); - CHECK(success); - success = startup_.CreateUniqueTempDirUnderPath(base_path); -@@ -699,7 +699,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri - #elif BUILDFLAG(IS_MAC) - bool success = chrome_apps_folder_.CreateUniqueTempDir(); - CHECK(success); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool success = desktop_.CreateUniqueTempDir(); - CHECK(success); - success = startup_.CreateUniqueTempDir(); -@@ -709,7 +709,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri + success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); + CHECK(success); + success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); +@@ -747,7 +747,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri + CHECK(success); #endif - } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -756,7 +756,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr - } - } - } +@@ -819,7 +819,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr + EXPECT_TRUE(!startup_.IsValid() || startup_.Delete()); + #elif BUILDFLAG(IS_MAC) + EXPECT_TRUE(!chrome_apps_folder_.IsValid() || chrome_apps_folder_.Delete()); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Reset the file handling callback. - SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting( - UpdateMimeInfoDatabaseOnLinuxCallback()); + EXPECT_TRUE(!desktop_.IsValid() || desktop_.Delete()); + EXPECT_TRUE(!startup_.IsValid() || startup_.Delete()); + EXPECT_TRUE(!xdg_data_home_dir_.IsValid() || xdg_data_home_dir_.Delete()); diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h index b3f2dba29afc..fe45ac9c0766 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h -@@ -38,7 +38,7 @@ class ShellLinkItem; +@@ -40,7 +40,7 @@ class ShellLinkItem; namespace web_app { @@ -9,7 +9,7 @@ struct LinuxFileRegistration { base::FilePath file_name; std::string xdg_command; -@@ -112,7 +112,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -122,7 +122,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra bool DeleteApplicationMenuDirOnWin(); #endif // BUILDFLAG(IS_WIN) @@ -18,16 +18,16 @@ bool DeleteDesktopDirOnLinux(); #endif // BUILDFLAG(IS_LINUX) -@@ -231,7 +231,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra - const base::FilePath& chrome_apps_folder() override; +@@ -242,7 +242,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra + base::FilePath chrome_apps_folder() override; void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) override; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const base::FilePath& desktop() override; - const base::FilePath& startup() override; - const base::FilePath& applications_dir() override; -@@ -278,7 +278,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra + base::FilePath desktop(); + base::FilePath startup(); + base::FilePath applications(); +@@ -322,7 +322,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::ScopedTempDir chrome_apps_folder_; std::map<base::FilePath, bool> startup_enabled_; @@ -35,4 +35,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::ScopedTempDir desktop_; base::ScopedTempDir startup_; - base::ScopedTempDir applications_dir_; + base::ScopedTempDir xdg_data_home_dir_; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app__helpers.cc b/www/iridium/files/patch-chrome_browser_web__applications_web__app__helpers.cc new file mode 100644 index 000000000000..70bc40e5fa30 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app__helpers.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/web_app_helpers.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/web_applications/web_app_helpers.cc +@@ -145,7 +145,7 @@ bool IsValidWebAppUrl(const GURL& app_url) { + return false; + + bool allow_extension_apps = true; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Stop allowing apps to be extension urls when the shortcuts are separated - + // they can be extension urls instead. + allow_extension_apps = diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h b/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h index a51bb915675a..3f05f9dcbcfd 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_install_info.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/web_applications/web_app_install_info.h.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/web_applications/web_app_install_info.h @@ -35,7 +35,7 @@ #include "url/gurl.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)); -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)); +- BUILDFLAG(IS_CHROMEOS)); ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)); namespace web_app { diff --git a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 35244a384c03..17c560313e95 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -677,7 +677,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -916,7 +916,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc new file mode 100644 index 000000000000..814821ad5680 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -0,0 +1,20 @@ +--- chrome/browser/webauthn/enclave_manager.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/browser/webauthn/enclave_manager.cc +@@ -652,7 +652,7 @@ base::flat_set<std::string> GetGaiaIDs( + } + + std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return label; + #else + return std::string("placeholder"); +@@ -661,7 +661,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer + + std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( + std::string saved_label) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return saved_label; + #else + return std::nullopt; diff --git a/www/iridium/files/patch-chrome_common_channel__info.h b/www/iridium/files/patch-chrome_common_channel__info.h index 3d5e0bb93b68..5728c284d3a4 100644 --- a/www/iridium/files/patch-chrome_common_channel__info.h +++ b/www/iridium/files/patch-chrome_common_channel__info.h @@ -1,18 +1,20 @@ ---- chrome/common/channel_info.h.orig 2023-07-24 14:27:53 UTC +--- chrome/common/channel_info.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/channel_info.h -@@ -104,13 +104,13 @@ void ClearChannelForTesting(); +@@ -12,7 +12,7 @@ + #include "build/build_config.h" + #include "build/chromeos_buildflags.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace base { + class Environment; + } +@@ -100,7 +100,7 @@ void ClearChannelIdForTesting(); std::string GetChannelSuffixForDataDir(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string GetChannelSuffixForExtraFlagsEnvVarName(); - #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) // Returns the channel-specific filename of the desktop shortcut used to launch - // the browser. - std::string GetDesktopName(base::Environment* env); diff --git a/www/iridium/files/patch-chrome_common_channel__info__posix.cc b/www/iridium/files/patch-chrome_common_channel__info__posix.cc index 41209129405f..c11d5208163b 100644 --- a/www/iridium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/iridium/files/patch-chrome_common_channel__info__posix.cc @@ -1,6 +1,6 @@ ---- chrome/common/channel_info_posix.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/common/channel_info_posix.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/common/channel_info_posix.cc -@@ -92,7 +92,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -93,7 +93,7 @@ std::string GetChannelSuffixForDataDir() { } } @@ -9,9 +9,9 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) const auto channel_state = GetChannelImpl(); -@@ -118,7 +118,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() +@@ -121,7 +121,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index 8352b46fd1f4..65884dea8a5f 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.cc +++ b/www/iridium/files/patch-chrome_common_chrome__features.cc @@ -1,24 +1,15 @@ ---- chrome/common/chrome_features.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/common/chrome_features.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/common/chrome_features.cc -@@ -76,7 +76,7 @@ BASE_FEATURE(kAppShimNotificationAttribution, - BASE_FEATURE(kAsyncDns, - "AsyncDns", - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -84,7 +84,7 @@ BASE_FEATURE(kAsyncDns, - ); +@@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, + #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -102,7 +102,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -99,7 +99,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -27,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. -@@ -304,7 +304,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, +@@ -282,7 +282,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,16 +27,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -338,7 +338,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -324,7 +324,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, + "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) // 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. -@@ -366,7 +366,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -346,7 +346,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,25 +45,25 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -382,7 +382,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa - const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { - &kDnsOverHttps, "ShowUi", +@@ -362,7 +362,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa + const base::FeatureParam<bool> kDnsOverHttpsShowUiParam{&kDnsOverHttps, + "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - true + true #else - false -@@ -912,7 +912,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, + false +@@ -887,7 +887,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, + "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -925,7 +925,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -900,7 +900,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h index 89bfbecc192d..35a4d4b69c64 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.h +++ b/www/iridium/files/patch-chrome_common_chrome__features.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_features.h.orig 2024-02-04 14:46:08 UTC +--- chrome/common/chrome_features.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/chrome_features.h -@@ -61,13 +61,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution); - COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); +@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); + #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillAddressSurvey); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillCardSurvey); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillPasswordSurvey); @@ -16,25 +16,25 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -204,7 +204,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); - COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); +@@ -197,7 +197,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); + COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) - BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -523,7 +523,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + BASE_DECLARE_FEATURE(kShortcutsNotApps); +@@ -527,7 +527,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); + COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -531,7 +531,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -535,7 +535,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc index 115c2c36ccca..a614c6fa14ff 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.cc +++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/common/chrome_paths.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/common/chrome_paths.cc @@ -30,7 +30,7 @@ #include "base/apple/foundation_util.h" @@ -27,7 +27,7 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -220,7 +220,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -225,7 +225,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -523,7 +523,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -541,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; } break; @@ -45,7 +45,7 @@ case chrome::DIR_POLICY_FILES: { cur = base::FilePath(policy::kPolicyPath); break; -@@ -534,7 +534,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -552,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -54,7 +54,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { return false; -@@ -543,7 +543,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -561,7 +561,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,16 +63,16 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -590,7 +590,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -599,7 +599,7 @@ bool PathProvider(int key, base::FilePath* result) { break; - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_EXTENSIONS) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -602,11 +602,21 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -611,11 +611,21 @@ bool PathProvider(int key, base::FilePath* result) { #endif #else // BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.h b/www/iridium/files/patch-chrome_common_chrome__paths.h index d0de02b38814..42b86424f993 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.h +++ b/www/iridium/files/patch-chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.h.orig 2023-10-21 11:51:27 UTC +--- chrome/common/chrome_paths.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/chrome_paths.h -@@ -57,7 +57,7 @@ enum { +@@ -59,7 +59,7 @@ enum { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -9,7 +9,7 @@ DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -65,7 +65,7 @@ enum { +@@ -67,7 +67,7 @@ enum { // create it. #endif @@ -18,12 +18,12 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -123,7 +123,7 @@ enum { - // must be cleared on device reboot. +@@ -126,7 +126,7 @@ enum { #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(ENABLE_EXTENSIONS) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index 33ece160eefb..a8bae9afedd2 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/common/chrome_switches.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/common/chrome_switches.cc -@@ -857,14 +857,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -863,14 +863,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index 81ae86a5509c..6c9002e22e53 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.h +++ b/www/iridium/files/patch-chrome_common_chrome__switches.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2024-02-04 14:46:08 UTC +--- chrome/common/chrome_switches.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/chrome_switches.h -@@ -272,12 +272,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -273,12 +273,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; #endif diff --git a/www/iridium/files/patch-chrome_common_crash__keys.cc b/www/iridium/files/patch-chrome_common_crash__keys.cc deleted file mode 100644 index 03f12ea768f9..000000000000 --- a/www/iridium/files/patch-chrome_common_crash__keys.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- chrome/common/crash_keys.cc.orig 2023-11-22 14:00:11 UTC -+++ chrome/common/crash_keys.cc -@@ -32,20 +32,10 @@ namespace crash_keys { - namespace { - - // A convenient wrapper around a crash key and its name. --// --// The CrashKey contract requires that CrashKeyStrings are never --// moved, copied, or deleted (see --// third_party/crashpad/crashpad/client/annotation.h); since this class holds --// a CrashKeyString, it likewise cannot be moved, copied, or deleted. - class CrashKeyWithName { - public: - explicit CrashKeyWithName(std::string name) - : name_(std::move(name)), crash_key_(name_.c_str()) {} -- CrashKeyWithName(const CrashKeyWithName&) = delete; -- CrashKeyWithName& operator=(const CrashKeyWithName&) = delete; -- CrashKeyWithName(CrashKeyWithName&&) = delete; -- CrashKeyWithName& operator=(CrashKeyWithName&&) = delete; -- ~CrashKeyWithName() = delete; - - void Clear() { crash_key_.Clear(); } - void Set(base::StringPiece value) { crash_key_.Set(value); } diff --git a/www/iridium/files/patch-chrome_common_media_cdm__registration.cc b/www/iridium/files/patch-chrome_common_media_cdm__registration.cc index 70001c674560..1f0446372e26 100644 --- a/www/iridium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/iridium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_registration.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/common/media/cdm_registration.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/common/media/cdm_registration.cc -@@ -26,11 +26,11 @@ +@@ -30,11 +30,11 @@ #if BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck @@ -14,7 +14,7 @@ #include "base/no_destructor.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" #include "media/cdm/supported_audio_codecs.h" -@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness; +@@ -60,7 +60,7 @@ using Robustness = content::CdmInfo::Robustness; #if BUILDFLAG(ENABLE_WIDEVINE) #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ @@ -23,25 +23,25 @@ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo( -@@ -101,7 +101,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid +@@ -105,7 +105,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid // BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // On Linux/ChromeOS we have to preload the CDM since it uses the zygote - // sandbox. On Windows and Mac, the bundled CDM is handled by the component - // updater. -@@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() { + // sandbox. On Windows and Mac, CDM registration is handled by Component + // Update (as the CDM can be loaded only when needed). +@@ -129,7 +129,7 @@ content::CdmInfo* GetBundledWidevine() { // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - // This code checks to see if a component updated Widevine CDM can be found. If - // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise - // return nullptr. -@@ -160,7 +160,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd + // This code checks to see if Component Updater picked a version of the Widevine + // CDM to be used last time it ran. (Component Updater may choose the bundled + // CDM if there is not a new version available for download.) If there is one +@@ -171,7 +171,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName, kWidevineCdmType, base::Version(), base::FilePath()); @@ -50,3 +50,12 @@ #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION) base::Version glibc_version(gnu_get_libc_version()); DCHECK(glibc_version.IsValid()); +@@ -429,7 +429,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd + DVLOG(3) << __func__ << " done with " << cdms->size() << " cdms"; + } + +-#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting() { + std::vector<content::CdmInfo> cdms; + AddSoftwareSecureWidevine(&cdms); diff --git a/www/iridium/files/patch-chrome_common_media_cdm__registration.h b/www/iridium/files/patch-chrome_common_media_cdm__registration.h new file mode 100644 index 000000000000..880ffcecc975 --- /dev/null +++ b/www/iridium/files/patch-chrome_common_media_cdm__registration.h @@ -0,0 +1,11 @@ +--- chrome/common/media/cdm_registration.h.orig 2024-06-25 12:08:48 UTC ++++ chrome/common/media/cdm_registration.h +@@ -14,7 +14,7 @@ + // Register CdmInfo for Content Decryption Modules (CDM) supported. + void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms); + +-#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + // Returns the software secure Widevine CDM. + std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting(); + #endif diff --git a/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h index 3cd23d3a31a4..9970a5e100c9 100644 --- a/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h +++ b/www/iridium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h @@ -1,8 +1,8 @@ ---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2023-10-21 11:51:27 UTC +--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index d39a489336cf..df19e887ece4 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,15 +1,15 @@ ---- chrome/common/pref_names.h.orig 2024-02-04 14:46:08 UTC +--- chrome/common/pref_names.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/pref_names.h -@@ -1315,7 +1315,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1313,7 +1313,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1441,7 +1441,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1457,7 +1457,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -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). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1989,7 +1989,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2069,7 +2069,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2407,14 +2407,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2505,14 +2505,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2492,7 +2492,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2590,7 +2590,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,16 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3533,7 +3533,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3104,7 +3104,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] + + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Defines administrator-set availability of Chrome for Testing. + inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; + #endif +@@ -3673,7 +3673,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -62,18 +71,18 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3589,7 +3589,7 @@ inline constexpr char kCACertificateManagementAllowed[ - inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; +@@ -3722,7 +3722,7 @@ inline constexpr char kCACertificateManagementAllowed[ #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3903,7 +3903,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf - inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = - "new_base_url_inheritance_behavior_allowed"; +@@ -4021,7 +4021,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ + "printing.oauth2_authorization_servers"; + #endif -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h index 9c740ed5f70a..0a0b199446fc 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.h +++ b/www/iridium/files/patch-chrome_common_url__constants.h @@ -1,11 +1,11 @@ ---- chrome/common/url_constants.h.orig 2024-02-04 14:46:08 UTC +--- chrome/common/url_constants.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/url_constants.h -@@ -824,7 +824,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[ +@@ -888,7 +888,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = + inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook?p=multidevice"; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) // "Learn more" URL for the chrome apps deprecation dialog. inline constexpr char kChromeAppsDeprecationLearnMoreURL[] = "https://support.google.com/chrome?p=chrome_app_deprecation"; diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.cc b/www/iridium/files/patch-chrome_common_webui__url__constants.cc index 2300b2ea704f..9d88117bd9b1 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/common/webui_url_constants.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/common/webui_url_constants.cc -@@ -512,18 +512,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// +@@ -518,18 +518,18 @@ const char kOsUISystemURL[] = "os://system"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -538,14 +538,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -544,14 +544,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -31,15 +31,15 @@ const char kChromeUISandboxHost[] = "sandbox"; #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; - const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro + const char kChromeUIIntroHost[] = "intro"; +@@ -570,7 +570,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,16 +48,42 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -650,7 +650,7 @@ const char kCookiesSubPagePath[] = "/cookies"; +@@ -649,7 +649,7 @@ const char kTrackingProtectionSubPagePath[] = "/tracki + const char kCookiesSubPagePath[] = "/cookies"; #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -889,7 +889,7 @@ const char* const kChromeDebugURLs[] = { +@@ -795,21 +795,21 @@ const char* const kChromeHostURLs[] = { + kChromeUIAssistantOptInHost, + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + kChromeUIConnectorsInternalsHost, + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + kChromeUIDiscardsHost, + #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + kChromeUIWebAppSettingsHost, + #endif + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) + kChromeUILinuxProxyConfigHost, + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + kChromeUISandboxHost, + #endif + #if BUILDFLAG(IS_WIN) +@@ -876,7 +876,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h index 79ea5f63d330..0c9caa684d20 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2024-02-04 14:46:08 UTC +--- chrome/common/webui_url_constants.h.orig 2024-06-25 12:08:48 UTC +++ chrome/common/webui_url_constants.h -@@ -426,24 +426,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -437,23 +437,23 @@ extern const char kOsUISystemURL[]; extern const char kOsUIVersionURL[]; #endif @@ -17,19 +17,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || 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) extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -458,7 +458,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -468,14 +468,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,16 +37,15 @@ extern const char kChromeUISandboxHost[]; #endif -@@ -470,7 +470,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; - extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -486,7 +486,7 @@ extern const char kChromeUIProfilePickerUrl[]; + extern const char kChromeUIIntroHost[]; +@@ -491,7 +491,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc deleted file mode 100644 index e583e77addbf..000000000000 --- a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-10-21 11:51:27 UTC -+++ chrome/renderer/chrome_render_frame_observer.cc -@@ -349,7 +349,7 @@ void ChromeRenderFrameObserver::OnDestruct() { - - void ChromeRenderFrameObserver::DraggableRegionsChanged() { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Only the main frame is allowed to control draggable regions, to avoid other - // frames manipulate the regions in the browser process. - if (!render_frame()->IsMainFrame()) diff --git a/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h b/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h index 683dd5ccf3a7..d62a9711f577 100644 --- a/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h +++ b/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h @@ -1,6 +1,6 @@ ---- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2023-04-22 17:45:15 UTC +--- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2024-06-25 12:08:48 UTC +++ chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "mojo/public/cpp/bindings/struct_traits.h" #if !BUILDFLAG(FULL_SAFE_BROWSING) || \ diff --git a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 4ffe11cd2ff3..3da14c50d24d 100644 --- a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2024-02-04 14:46:08 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -46,7 +46,7 @@ +@@ -49,7 +49,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -9,16 +9,16 @@ #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -73,7 +73,7 @@ namespace printing { +@@ -76,7 +76,7 @@ namespace printing { namespace { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void InstantiateLinuxUiDelegate() { - // TODO(crbug.com/809738) Until a real UI can be used in a utility process, + // TODO(crbug.com/40561724) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -82,7 +82,7 @@ void InstantiateLinuxUiDelegate() { +@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() { #endif scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() { @@ -27,7 +27,7 @@ // Use task runner associated with equivalent of UI thread. Needed for calls // made through `PrintDialogLinuxInterface` to properly execute. CHECK(base::SequencedTaskRunner::HasCurrentDefault()); -@@ -460,7 +460,7 @@ void PrintBackendServiceImpl::Init( +@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -36,9 +36,9 @@ // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -681,7 +681,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( - print_backend_->GetPrinterDriverInfo(*printer_name)); + *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_CUPS) diff --git a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc index 90801cd208ce..dfa2283cd3d2 100644 --- a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc +++ b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -1,8 +1,8 @@ ---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/services/speech/audio_source_fetcher_impl.cc -@@ -129,7 +129,7 @@ void AudioSourceFetcherImpl::Start( +@@ -132,7 +132,7 @@ void AudioSourceFetcherImpl::Start( - // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and + // TODO(crbug.com/40753481): Check implementation / sandbox policy on Mac and // Windows. -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn deleted file mode 100644 index ecde3a059af3..000000000000 --- a/www/iridium/files/patch-chrome_test_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/test/BUILD.gn.orig 2024-02-04 14:46:08 UTC -+++ chrome/test/BUILD.gn -@@ -11241,7 +11241,7 @@ test("chrome_app_unittests") { - "//components/heap_profiling/in_process", - "//components/safe_browsing:buildflags", - ] -- if (!is_fuchsia && !is_mac) { -+ if (!is_fuchsia && !is_mac && !is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } - if (is_android) { diff --git a/www/iridium/files/patch-chrome_test_base_scoped__channel__override__posix.cc b/www/iridium/files/patch-chrome_test_base_scoped__channel__override__posix.cc new file mode 100644 index 000000000000..3da3d44a105b --- /dev/null +++ b/www/iridium/files/patch-chrome_test_base_scoped__channel__override__posix.cc @@ -0,0 +1,11 @@ +--- chrome/test/base/scoped_channel_override_posix.cc.orig 2024-06-25 12:08:48 UTC ++++ chrome/test/base/scoped_channel_override_posix.cc +@@ -45,7 +45,7 @@ std::string GetVersionExtra(ScopedChannelOverride::Cha + return "beta"; + case ScopedChannelOverride::Channel::kDev: + return "unstable"; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case ScopedChannelOverride::Channel::kCanary: + return "canary"; + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc index 72b4c38395ca..1ad262534417 100644 --- a/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc +++ b/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc @@ -1,8 +1,8 @@ ---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc @@ -67,7 +67,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) @@ -11,7 +11,7 @@ #else @@ -104,7 +104,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-chrome_updater_configurator.cc b/www/iridium/files/patch-chrome_updater_configurator.cc index 04544170802e..2760dd366860 100644 --- a/www/iridium/files/patch-chrome_updater_configurator.cc +++ b/www/iridium/files/patch-chrome_updater_configurator.cc @@ -1,8 +1,8 @@ ---- chrome/updater/configurator.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/updater/configurator.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/updater/configurator.cc -@@ -63,7 +63,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> - return absl::nullopt; - #endif +@@ -67,7 +67,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> + return std::nullopt; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) }()) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_updater_util_posix__util.cc b/www/iridium/files/patch-chrome_updater_util_posix__util.cc index d70923a9c542..cc3ab6996de9 100644 --- a/www/iridium/files/patch-chrome_updater_util_posix__util.cc +++ b/www/iridium/files/patch-chrome_updater_util_posix__util.cc @@ -1,6 +1,6 @@ ---- chrome/updater/util/posix_util.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/updater/util/posix_util.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/updater/util/posix_util.cc -@@ -16,7 +16,7 @@ +@@ -20,7 +20,7 @@ #include "chrome/updater/updater_branding.h" #include "chrome/updater/util/util.h" diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc index ebe09ca0476c..59353b870ee6 100644 --- a/www/iridium/files/patch-chrome_utility_services.cc +++ b/www/iridium/files/patch-chrome_utility_services.cc @@ -1,6 +1,15 @@ ---- chrome/utility/services.cc.orig 2023-11-22 14:00:11 UTC +--- chrome/utility/services.cc.orig 2024-06-25 12:08:48 UTC +++ chrome/utility/services.cc -@@ -56,7 +56,7 @@ +@@ -38,7 +38,7 @@ + #include "services/screen_ai/screen_ai_service_impl.h" // nogncheck + #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 "services/passage_embeddings/passage_embeddings_service.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(LINUX) + +@@ -61,7 +61,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) @@ -14,43 +23,43 @@ #endif -#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) ++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD) #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -218,7 +218,7 @@ auto RunMacNotificationService( +@@ -221,7 +221,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto RunSystemSignalsService( - mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> + auto RunPassageEmbeddingsService( + mojo::PendingReceiver<passage_embeddings::mojom::PassageEmbeddingsService> receiver) { -@@ -278,7 +278,7 @@ auto RunCupsIppParser( +@@ -288,7 +288,7 @@ auto RunCupsIppParser( } #endif -#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) ++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD) auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -466,7 +466,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -494,7 +494,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + services.Add(RunPassageEmbeddingsService); services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - -@@ -482,7 +482,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -511,7 +511,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif -#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) ++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD) services.Add(RunDocumentAnalysis); #endif diff --git a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 771060ce6872..3c48a1f5dacb 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,15 +1,15 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2023-07-24 14:27:53 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2024-06-25 12:08:48 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -90,7 +90,7 @@ - #include "ui/base/ui_base_switches.h" - #include "ui/gl/gl_switches.h" +@@ -94,7 +94,7 @@ + #include "ui/ozone/public/ozone_platform.h" + #endif // BUILDFLAG(IS_OZONE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -267,7 +267,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()); -@@ -309,7 +309,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -313,7 +313,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -27,7 +27,7 @@ #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. -@@ -479,7 +479,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -490,7 +490,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc index 1b3cfa104a34..d5a0e0ea63d4 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2023-11-22 14:00:11 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2024-06-25 12:08:48 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -435,7 +435,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -431,7 +431,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/iridium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc b/www/iridium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc new file mode 100644 index 000000000000..11b66d4fedd5 --- /dev/null +++ b/www/iridium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc @@ -0,0 +1,11 @@ +--- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig 2024-06-25 12:08:48 UTC ++++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc +@@ -335,7 +335,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre + GetFlagEntry(feature::kCastCoreIsRemoteControlMode, + config_.extra_features(), /*default_value=*/false); + params->enabled_for_dev = IsEnabledForDev(); +-#if BUILDFLAG(ENABLE_CAST_RECEIVER) && BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(ENABLE_CAST_RECEIVER) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + // cast_receiver::ApplicationControlsImpl constructs an instance of + // url_rewrite::UrlRequestRewriteRulesManager. CastWebContentsImpl should NOT + // construct its own instance, or UrlRequestRulesReceiver will crash when a diff --git a/www/iridium/files/patch-components_BUILD.gn b/www/iridium/files/patch-components_BUILD.gn deleted file mode 100644 index 5ad595adf643..000000000000 --- a/www/iridium/files/patch-components_BUILD.gn +++ /dev/null @@ -1,22 +0,0 @@ ---- components/BUILD.gn.orig 2024-01-25 17:18:39 UTC -+++ components/BUILD.gn -@@ -812,8 +812,7 @@ test("components_unittests") { - # Since //chrome depends on //extensions, we also only assert_no_deps on - # extensions targets for non-lacros builds. - if (!is_chromeos_lacros) { -- assert_no_deps = [ "//chrome/*" ] -- assert_no_deps += disallowed_extension_deps_ -+ assert_no_deps = disallowed_extension_deps_ - } - - if (is_ios) { -@@ -1100,8 +1099,7 @@ if (use_blink) { - # Since //chrome depends on //extensions, we also only assert_no_deps on - # extensions targets for non-lacros builds. - if (!is_chromeos_lacros) { -- assert_no_deps = [ "//chrome/*" ] -- assert_no_deps += disallowed_extension_deps_ -+ assert_no_deps = disallowed_extension_deps_ - } - - if (is_fuchsia) { diff --git a/www/iridium/files/patch-components_autofill__payments__strings.grdp b/www/iridium/files/patch-components_autofill__payments__strings.grdp deleted file mode 100644 index 0e03056f775d..000000000000 --- a/www/iridium/files/patch-components_autofill__payments__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill_payments_strings.grdp.orig 2023-11-22 14:00:11 UTC -+++ components/autofill_payments_strings.grdp -@@ -134,7 +134,7 @@ - <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> - Save card - </message> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <then> - <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt is a bubble."> - Do you want to save this card in your Google Account? diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__model_autofill__i18n__api.h b/www/iridium/files/patch-components_autofill_core_browser_data__model_autofill__i18n__api.h deleted file mode 100644 index ca0bf788b9ac..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_data__model_autofill__i18n__api.h +++ /dev/null @@ -1,16 +0,0 @@ ---- components/autofill/core/browser/data_model/autofill_i18n_api.h.orig 2024-02-04 14:46:08 UTC -+++ components/autofill/core/browser/data_model/autofill_i18n_api.h -@@ -15,9 +15,13 @@ namespace autofill::i18n_model_definition { - // Country code that represents autofill's legacy address hierarchy model as - // stored `kAutofillModelRules`. As a workaround for GCC we declare the - // std::string constexpr first. -+// XXX -+#if 0 - constexpr inline std::string kLegacyHierarchyCountryCodeString{"XX"}; - constexpr AddressCountryCode kLegacyHierarchyCountryCode = - AddressCountryCode(kLegacyHierarchyCountryCodeString); -+#endif -+inline AddressCountryCode kLegacyHierarchyCountryCode = AddressCountryCode("XX"); - - // Creates an instance of the address hierarchy model corresponding to the - // provided country. All the nodes have empty values, except for the country diff --git a/www/iridium/files/patch-components_autofill_core_browser_payments__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_payments__data__manager.cc new file mode 100644 index 000000000000..3a5a361228bb --- /dev/null +++ b/www/iridium/files/patch-components_autofill_core_browser_payments__data__manager.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/payments_data_manager.cc.orig 2024-06-25 12:08:48 UTC ++++ components/autofill/core/browser/payments_data_manager.cc +@@ -1064,7 +1064,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp + // The feature is only for Linux, Windows, Mac, and Fuchsia. + // TODO(crbug.com/40118868): 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) || \ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) + // This option should only be shown for users that have not enabled the Sync + // Feature and that have server credit cards available. diff --git a/www/iridium/files/patch-components_autofill_core_browser_payments_iban__save__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_payments_iban__save__manager.cc deleted file mode 100644 index 3c96cc48744d..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_payments_iban__save__manager.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/autofill/core/browser/payments/iban_save_manager.cc.orig 2024-02-04 14:46:08 UTC -+++ components/autofill/core/browser/payments/iban_save_manager.cc -@@ -123,7 +123,11 @@ bool IbanSaveManager::ShouldOfferUploadSave( - - // Offer server save for this IBAN if it doesn't already match an existing - // server IBAN. -+#if (_LIBCPP_VERSION >= 160000) - return std::ranges::none_of( -+#else -+ return base::ranges::none_of( -+#endif - personal_data_manager_->GetServerIbans(), - [&iban_import_candidate](const auto& iban) { - return iban->MatchesPrefixSuffixAndLength(iban_import_candidate); diff --git a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc deleted file mode 100644 index e18f696cb52f..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2024-02-04 14:46:08 UTC -+++ components/autofill/core/browser/personal_data_manager.cc -@@ -2397,7 +2397,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) || \ -- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) - // This option should only be shown for users that have not enabled the Sync - // Feature and that have server credit cards available. - // TODO(crbug.com/1462552): Simplify once ConsentLevel::kSync and diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 61769e323c4c..3bd3c60fb1fc 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,8 +1,8 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-02-04 14:46:08 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-06-25 12:08:48 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -261,7 +261,7 @@ BASE_FEATURE(kEnablePixPayments, +@@ -257,7 +257,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards, bool ShouldShowImprovedUserConsentForCreditCardSave() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || \ diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc index 42c2e456d82c..0c9e4cfb4108 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2024-02-04 14:46:08 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2024-06-25 12:08:48 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -207,7 +207,7 @@ size_t LevenshteinDistance(std::u16string_view a, +@@ -132,7 +132,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value bool ShouldAutoselectFirstSuggestionOnArrowDown() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_commerce__strings.grdp b/www/iridium/files/patch-components_commerce__strings.grdp deleted file mode 100644 index 42046dc3c9f6..000000000000 --- a/www/iridium/files/patch-components_commerce__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- components/commerce_strings.grdp.orig 2023-11-22 14:00:11 UTC -+++ components/commerce_strings.grdp -@@ -304,7 +304,7 @@ - <message name="IDS_PRICE_HISTORY_DESCRIPTION" desc="The description of the Price History section in the Shopping Insights side panel explaining how the prices are gathered."> - Typical prices are based on stores across the web over the past 90 days. - </message> -- <if expr="is_win or is_linux"> -+ <if expr="is_win or is_posix"> - <then> - <message name="IDS_PRICE_HISTORY_GRAPH_ACCESSIBILITY" desc="Accessibility string for the price history graph indicating how users can review the price changes on the graph."> - Browse mode, you can change to Forms mode to use the left/right arrow to review price changes on the graph diff --git a/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc index 2bf8f4562d9b..74164aaaf925 100644 --- a/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/iridium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,6 +1,15 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-02-04 14:46:08 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-06-25 12:08:48 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -225,7 +225,7 @@ BASE_FEATURE(kShoppingCollection, +@@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, + "PriceInsights", + base::FEATURE_DISABLED_BY_DEFAULT); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kPriceInsightsRegionLaunched, + "PriceInsightsRegionLaunched", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -248,7 +248,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-components_components__chromium__strings.grd b/www/iridium/files/patch-components_components__chromium__strings.grd deleted file mode 100644 index 5259097e52ae..000000000000 --- a/www/iridium/files/patch-components_components__chromium__strings.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- components/components_chromium_strings.grd.orig 2023-08-28 20:17:35 UTC -+++ components/components_chromium_strings.grd -@@ -226,7 +226,7 @@ - </message> - </if> - <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> - Go to - the browser menu > diff --git a/www/iridium/files/patch-components_components__google__chrome__strings.grd b/www/iridium/files/patch-components_components__google__chrome__strings.grd deleted file mode 100644 index 79a79d831760..000000000000 --- a/www/iridium/files/patch-components_components__google__chrome__strings.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- components/components_google_chrome_strings.grd.orig 2023-08-28 20:17:35 UTC -+++ components/components_google_chrome_strings.grd -@@ -226,7 +226,7 @@ - </message> - </if> - <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> - Go to - the Chrome menu > diff --git a/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc b/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc new file mode 100644 index 000000000000..0ddefdda8687 --- /dev/null +++ b/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc @@ -0,0 +1,11 @@ +--- components/constrained_window/constrained_window_views.cc.orig 2024-06-25 12:08:48 UTC ++++ components/constrained_window/constrained_window_views.cc +@@ -350,7 +350,7 @@ bool SupportsGlobalScreenCoordinates() { + } + + bool PlatformClipsChildrenToViewport() { +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc index fd458e23be4a..0cbb1745f622 100644 --- a/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc +++ b/www/iridium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -1,6 +1,6 @@ ---- components/content_settings/core/browser/website_settings_registry.cc.orig 2022-03-28 18:11:04 UTC +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2024-06-25 12:08:48 UTC +++ components/content_settings/core/browser/website_settings_registry.cc -@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re +@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re #if BUILDFLAG(IS_WIN) if (!(platform & PLATFORM_WINDOWS)) return nullptr; diff --git a/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc b/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc index dccd0b1907d8..537219bf4f68 100644 --- a/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc +++ b/www/iridium/files/patch-components_cookie__config_cookie__store__util.cc @@ -1,9 +1,9 @@ ---- components/cookie_config/cookie_store_util.cc.orig 2022-03-28 18:11:04 UTC +--- components/cookie_config/cookie_store_util.cc.orig 2024-06-25 12:08:48 UTC +++ components/cookie_config/cookie_store_util.cc @@ -12,7 +12,7 @@ namespace cookie_config { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace { diff --git a/www/iridium/files/patch-components_crash_core_app_BUILD.gn b/www/iridium/files/patch-components_crash_core_app_BUILD.gn index b72d540c392c..65a005a77abe 100644 --- a/www/iridium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/iridium/files/patch-components_crash_core_app_BUILD.gn @@ -1,15 +1,6 @@ ---- components/crash/core/app/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- components/crash/core/app/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ components/crash/core/app/BUILD.gn -@@ -76,7 +76,7 @@ static_library("app") { - "crashpad.h", - ] - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "crashpad_linux.cc" ] - } - -@@ -89,6 +89,10 @@ static_library("app") { +@@ -82,6 +82,10 @@ static_library("app") { ] } @@ -20,7 +11,16 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -117,7 +121,7 @@ static_library("app") { +@@ -95,7 +99,7 @@ static_library("app") { + "//third_party/crashpad/crashpad/util", + ] + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ "crashpad_linux.cc" ] + data_deps = [ ":chrome_crashpad_handler" ] + } +@@ -115,7 +119,7 @@ static_library("app") { libs = [ "log" ] } diff --git a/www/iridium/files/patch-components_crash_core_app_crashpad__handler__main.cc b/www/iridium/files/patch-components_crash_core_app_crashpad__handler__main.cc new file mode 100644 index 000000000000..732ba2d50247 --- /dev/null +++ b/www/iridium/files/patch-components_crash_core_app_crashpad__handler__main.cc @@ -0,0 +1,20 @@ +--- components/crash/core/app/crashpad_handler_main.cc.orig 2024-06-25 12:08:48 UTC ++++ components/crash/core/app/crashpad_handler_main.cc +@@ -10,7 +10,7 @@ + #include "third_party/crashpad/crashpad/handler/handler_main.h" + #include "third_party/crashpad/crashpad/handler/user_stream_data_source.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "components/stability_report/user_stream_data_source_posix.h" + #endif + +@@ -31,7 +31,7 @@ __attribute__((visibility("default"), used)) int Crash + char* argv[]) { + crashpad::UserStreamDataSources user_stream_data_sources; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + user_stream_data_sources.push_back( + std::make_unique<stability_report::UserStreamDataSourcePosix>()); + #endif diff --git a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc index 46feff8cd431..8298ed8b2e2f 100644 --- a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc +++ b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc @@ -1,6 +1,6 @@ ---- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2023-10-21 11:51:27 UTC +--- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2024-06-25 12:08:48 UTC +++ components/device_signals/core/browser/user_permission_service_impl.cc -@@ -92,7 +92,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() +@@ -93,7 +93,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent() consent_required_by_dependent_policy; } diff --git a/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc index fc59f04f886d..660e12bef1b5 100644 --- a/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc +++ b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -1,6 +1,6 @@ ---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2024-02-04 14:46:08 UTC +--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2024-06-25 12:08:48 UTC +++ components/discardable_memory/service/discardable_shared_memory_manager.cc -@@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() { +@@ -176,7 +176,7 @@ uint64_t GetDefaultMemoryLimit() { // Limits the number of FDs used to 32, assuming a 4MB allocation size. uint64_t max_default_memory_limit = 128 * kMegabyte; #else diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc index 76308fa7f7ff..8ce24137b9ad 100644 --- a/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc +++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils.cc @@ -1,6 +1,6 @@ ---- components/embedder_support/user_agent_utils.cc.orig 2023-10-21 11:51:27 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2024-06-25 12:08:48 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -432,6 +432,9 @@ std::string GetPlatformForUAMetadata() { +@@ -445,6 +445,9 @@ std::string GetPlatformForUAMetadata() { # else return "Chromium OS"; # endif diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index 77a8ff83e880..9a300968c8a7 100644 --- a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,20 +1,29 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-10-21 11:51:27 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -84,7 +84,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); -@@ -192,7 +192,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) - int value; - ASSERT_TRUE(base::StringToInt(pieces[i], &value)); - } +@@ -71,7 +71,7 @@ const char kDesktop[] = + "X11; CrOS x86_64 14541.0.0" + #elif BUILDFLAG(IS_FUCHSIA) + "Fuchsia" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + "X11; Linux x86_64" + #elif BUILDFLAG(IS_MAC) + "Macintosh; Intel Mac OS X 10_15_7" +@@ -171,7 +171,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) + ASSERT_EQ("CrOS", pieces[0]); + ASSERT_EQ("x86_64", pieces[1]); + ASSERT_EQ("14541.0.0", pieces[2]); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Post-UA Reduction there is a single <unifiedPlatform> value for Linux: // X11; Linux x86_64 ASSERT_EQ(2u, pieces.size()); - ASSERT_EQ("X11", pieces[0]); +@@ -727,7 +727,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) { + #endif + #elif BUILDFLAG(IS_ANDROID) + EXPECT_EQ(metadata.platform, "Android"); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + EXPECT_EQ(metadata.platform, "Linux"); + #elif BUILDFLAG(IS_FREEBSD) + EXPECT_EQ(metadata.platform, "FreeBSD"); diff --git a/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc index d9781ad62db9..7e4e16924939 100644 --- a/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc +++ b/www/iridium/files/patch-components_eye__dropper_eye__dropper__view.cc @@ -1,6 +1,6 @@ ---- components/eye_dropper/eye_dropper_view.cc.orig 2024-02-04 14:46:08 UTC +--- components/eye_dropper/eye_dropper_view.cc.orig 2024-06-25 12:08:48 UTC +++ components/eye_dropper/eye_dropper_view.cc -@@ -196,7 +196,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, +@@ -202,7 +202,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); diff --git a/www/iridium/files/patch-components_eye__dropper_eye__dropper__view__aura.cc b/www/iridium/files/patch-components_eye__dropper_eye__dropper__view__aura.cc deleted file mode 100644 index 81c7b1e669f6..000000000000 --- a/www/iridium/files/patch-components_eye__dropper_eye__dropper__view__aura.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/eye_dropper/eye_dropper_view_aura.cc.orig 2024-02-04 14:46:08 UTC -+++ components/eye_dropper/eye_dropper_view_aura.cc -@@ -129,7 +129,7 @@ void EyeDropperView::MoveViewToFront() { - } - - void EyeDropperView::CaptureInputIfNeeded() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // The eye dropper needs to capture input since it is not activated - // in order to avoid dismissing the color picker. - GetWidget()->GetNativeWindow()->SetCapture(); diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc index 9804360fd8fc..b0ed2ac0d311 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,21 +1,29 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-02-04 14:46:08 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-06-25 12:08:48 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -49,7 +49,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe - absl::optional<FeatureConfig> GetClientSideFeatureConfig( +@@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro + + std::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + + // The IPH bubble for link capturing has a trigger set to ANY so that it + // always shows up. The per app specific guardrails are independently stored +@@ -113,7 +113,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi + + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { - absl::optional<FeatureConfig> config = FeatureConfig(); + std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1440,7 +1440,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1498,7 +1498,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi + #endif // BUILDFLAG(IS_ANDROID) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) - if (kIPHAutofillExternalAccountProfileSuggestionFeature.name == - feature->name) { + if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) { diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc index 1b9ddf0959b4..5cec403924d5 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,20 +1,30 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2024-02-04 14:46:08 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-06-25 12:08:48 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH, +@@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kIPHBatterySaverModeFeature, - "IPH_BatterySaverMode", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -560,7 +560,7 @@ constexpr base::FeatureParam<int> kDefaultBrowserEligi - /*default_value=*/365}; + BASE_FEATURE(kEsbDownloadRowPromoFeature, + "EsbDownloadRowPromo", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -605,7 +605,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) - BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature, - "IPH_AutofillExternalAccountProfileSuggestion", + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) + BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature, + "IPH_AutofillCreditCardBenefit", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -736,7 +737,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // This can be enabled by default, as the DesktopPWAsLinkCapturing + // flag is needed for the IPH linked to this feature to work, and + // use-cases to show the IPH are guarded by that flag. diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h index b2c49c6c113a..74ba29c510bc 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,20 +1,30 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2024-02-04 14:46:08 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-06-25 12:08:48 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -24,7 +24,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); +@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); - BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature); -@@ -233,7 +233,7 @@ extern const base::FeatureParam<int> - kDefaultBrowserEligibilitySlidingWindowParam; +@@ -252,7 +252,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp #endif // BUILDFLAG(IS_IOS) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature); BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); - BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); + BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature); +@@ -301,7 +302,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea + BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc index 350c23f6cb1a..e623038ae526 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,20 +1,30 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-02-04 14:46:08 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-06-25 12:08:48 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -146,7 +146,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSParcelTrackingFeature, +@@ -148,7 +148,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSInlineEnhancedSafeBrowsingPromoFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + &kEsbDownloadRowPromoFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, - &kIPHCompanionSidePanelRegionSearchFeature, -@@ -196,7 +196,7 @@ const base::Feature* const kAllFeatures[] = { - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || +@@ -211,7 +211,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) + &kIPHAutofillCreditCardBenefitFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, - &kIPHAutofillVirtualCardCVCSuggestionFeature, + &kIPHAutofillManualFallbackFeature, +@@ -260,7 +261,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHScalableIphGamingFeature, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + &kIPHDesktopPWAsLinkCapturingLaunch, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h index 1b4c20c04bd5..c42d390a6ac1 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,38 +1,58 @@ ---- components/feature_engagement/public/feature_list.h.orig 2024-02-04 14:46:08 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-06-25 12:08:48 UTC +++ components/feature_engagement/public/feature_list.h -@@ -269,7 +269,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSParcelTrackingFeature, +@@ -266,7 +266,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSInlineEnhancedSafeBrowsi #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel"); - DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelRegionSearchFeature, -@@ -352,7 +352,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || +@@ -370,7 +370,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) + DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, + "IPH_AutofillCreditCardBenefit"); DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, - "IPH_AutofillExternalAccountProfileSuggestion"); -@@ -567,7 +567,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSChoiceScreenFeature), - VARIATION_ENTRY(kIPHiOSParcelTrackingFeature), +@@ -457,7 +458,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF + DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, + "IPH_DesktopPWAsLinkCapturingLaunch"); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -606,7 +607,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSPromoGenericDefaultBrowserFeature), + VARIATION_ENTRY(kIPHiOSOverflowMenuCustomizationFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -617,7 +617,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -665,7 +666,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) + VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), + VARIATION_ENTRY(kIPHAutofillManualFallbackFeature), +@@ -714,7 +716,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHScalableIphGamingFeature), + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch), + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + diff --git a/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index 2c533f56cc71..2fcee16c78b9 100644 --- a/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -781,8 +781,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -753,8 +753,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/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc index 3a91a7837cac..3d2aa33af03c 100644 --- a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc +++ b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/client/gwp_asan.cc.orig 2023-11-22 14:00:11 UTC +--- components/gwp_asan/client/gwp_asan.cc.orig 2024-06-25 12:08:48 UTC +++ components/gwp_asan/client/gwp_asan.cc -@@ -66,7 +66,7 @@ constexpr bool kCpuIs64Bit = +@@ -75,7 +75,7 @@ namespace { // ProcessSamplingBoost is the multiplier to increase the // ProcessSamplingProbability in scenarios where we want to perform additional // testing (e.g., on canary/dev builds). diff --git a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc index fb02ad99780d..5b873fee3827 100644 --- a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc +++ b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc @@ -1,11 +1,11 @@ ---- components/gwp_asan/client/gwp_asan_features.cc.orig 2023-11-22 14:00:11 UTC +--- components/gwp_asan/client/gwp_asan_features.cc.orig 2024-06-25 12:08:48 UTC +++ components/gwp_asan/client/gwp_asan_features.cc @@ -9,7 +9,7 @@ namespace gwp_asan::internal { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || \ ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT; #else - constexpr base::FeatureState kDefaultEnabled = diff --git a/www/iridium/files/patch-components_live__caption_caption__util.cc b/www/iridium/files/patch-components_live__caption_caption__util.cc index 07f55de0d362..6cc81ce2da11 100644 --- a/www/iridium/files/patch-components_live__caption_caption__util.cc +++ b/www/iridium/files/patch-components_live__caption_caption__util.cc @@ -1,15 +1,6 @@ ---- components/live_caption/caption_util.cc.orig 2023-07-24 14:27:53 UTC +--- components/live_caption/caption_util.cc.orig 2024-06-25 12:08:48 UTC +++ components/live_caption/caption_util.cc -@@ -145,7 +145,7 @@ bool IsLiveCaptionFeatureSupported() { - return false; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Check if the CPU has the required instruction set to run the Speech - // On-Device API (SODA) library. - static bool has_sse41 = base::CPU().has_sse41(); -@@ -167,7 +167,7 @@ std::string GetCaptionSettingsUrl() { +@@ -144,7 +144,7 @@ std::string GetCaptionSettingsUrl() { return "chrome://os-settings/audioAndCaptions"; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-components_live__caption_caption__util.h b/www/iridium/files/patch-components_live__caption_caption__util.h index b2d0cfbdd5b2..afd0640a8c08 100644 --- a/www/iridium/files/patch-components_live__caption_caption__util.h +++ b/www/iridium/files/patch-components_live__caption_caption__util.h @@ -1,6 +1,6 @@ ---- components/live_caption/caption_util.h.orig 2023-07-24 14:27:53 UTC +--- components/live_caption/caption_util.h.orig 2024-06-25 12:08:48 UTC +++ components/live_caption/caption_util.h -@@ -14,7 +14,7 @@ class PrefService; +@@ -15,7 +15,7 @@ class PrefService; namespace captions { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-components_management__strings.grdp b/www/iridium/files/patch-components_management__strings.grdp deleted file mode 100644 index 99e8b07b45e6..000000000000 --- a/www/iridium/files/patch-components_management__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- components/management_strings.grdp.orig 2023-10-21 11:51:27 UTC -+++ components/management_strings.grdp -@@ -346,7 +346,7 @@ - </if> - - <!-- Strings related to Chrome Enterprise Device Signals Sharing --> -- <if expr="is_win or is_linux or is_macosx"> -+ <if expr="is_win or is_posix or is_macosx"> - <message name="IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE" desc="Disclosure message explaining that device signals can be shared."> - Information about your browser, OS, device, installed software, and files - </message> diff --git a/www/iridium/files/patch-components_media__router_common_media__source.cc b/www/iridium/files/patch-components_media__router_common_media__source.cc new file mode 100644 index 000000000000..fbc1d7cb1e93 --- /dev/null +++ b/www/iridium/files/patch-components_media__router_common_media__source.cc @@ -0,0 +1,11 @@ +--- components/media_router/common/media_source.cc.orig 2024-06-25 12:08:48 UTC ++++ components/media_router/common/media_source.cc +@@ -57,7 +57,7 @@ bool IsSystemAudioCaptureSupported() { + if (!media::IsSystemLoopbackCaptureSupported()) { + return false; + } +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast); + #else + return true; diff --git a/www/iridium/files/patch-components_metrics_metrics__log.cc b/www/iridium/files/patch-components_metrics_metrics__log.cc index c45f1f0b5298..8ee149c02f45 100644 --- a/www/iridium/files/patch-components_metrics_metrics__log.cc +++ b/www/iridium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2023-10-21 11:51:27 UTC +--- components/metrics/metrics_log.cc.orig 2024-06-25 12:08:48 UTC +++ components/metrics/metrics_log.cc -@@ -53,7 +53,7 @@ +@@ -56,7 +56,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -139,7 +139,7 @@ void RecordCurrentTime( +@@ -146,7 +146,7 @@ void RecordCurrentTime( } } @@ -18,7 +18,7 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -399,7 +399,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -415,7 +415,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); @@ -27,7 +27,7 @@ // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -416,7 +416,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -432,7 +432,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h b/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h index 7f19bfdb45bd..a6a0f456f4dd 100644 --- a/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h +++ b/www/iridium/files/patch-components_named__mojo__ipc__server_connection__info.h @@ -1,6 +1,6 @@ ---- components/named_mojo_ipc_server/connection_info.h.orig 2023-03-13 07:33:08 UTC +--- components/named_mojo_ipc_server/connection_info.h.orig 2024-06-25 12:08:48 UTC +++ components/named_mojo_ipc_server/connection_info.h -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #include "base/win/scoped_handle.h" #elif BUILDFLAG(IS_MAC) #include <bsm/libbsm.h> @@ -9,8 +9,8 @@ #include <sys/socket.h> #endif -@@ -32,7 +32,7 @@ struct ConnectionInfo { - absl::optional<base::win::ScopedHandle> impersonation_token{}; +@@ -33,7 +33,7 @@ struct ConnectionInfo { + std::optional<base::win::ScopedHandle> impersonation_token{}; #elif BUILDFLAG(IS_MAC) audit_token_t audit_token{}; -#elif BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_neterror_resources_neterror.js b/www/iridium/files/patch-components_neterror_resources_neterror.js index fd5d54f50d23..b6b0547343fe 100644 --- a/www/iridium/files/patch-components_neterror_resources_neterror.js +++ b/www/iridium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2024-02-04 14:46:08 UTC +--- components/neterror/resources/neterror.js.orig 2024-06-25 12:08:48 UTC +++ components/neterror/resources/neterror.js -@@ -141,7 +141,7 @@ function detailsButtonClick() { +@@ -142,7 +142,7 @@ function detailsButtonClick() { let primaryControlOnLeft = true; // clang-format off diff --git a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index f9412560483e..68c28c255f0a 100644 --- a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-11-22 14:00:11 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-06-25 12:08:48 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -801,7 +801,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -825,7 +825,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C // backport, having it behave differently than in stable would be a bigger // problem. TODO: Does this work in later macOS releases? #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc index 90b0ec7a11dc..a5a8f298432d 100644 --- a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc +++ b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2023-10-21 11:51:27 UTC +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -775,7 +775,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { +@@ -782,7 +782,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp b/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp deleted file mode 100644 index 2c61e408293e..000000000000 --- a/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp +++ /dev/null @@ -1,20 +0,0 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2022-10-05 07:34:01 UTC -+++ components/new_or_sad_tab_strings.grdp -@@ -66,7 +66,7 @@ - Close other tabs or apps - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer."> - Close other tabs or programs - </message> -@@ -76,7 +76,7 @@ - Close other apps - </message> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux)."> - Close other programs - </message> diff --git a/www/iridium/files/patch-components_omnibox_browser_omnibox__edit__model.cc b/www/iridium/files/patch-components_omnibox_browser_omnibox__edit__model.cc deleted file mode 100644 index e356a7b084b3..000000000000 --- a/www/iridium/files/patch-components_omnibox_browser_omnibox__edit__model.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- components/omnibox/browser/omnibox_edit_model.cc.orig 2023-07-24 14:27:53 UTC -+++ components/omnibox/browser/omnibox_edit_model.cc -@@ -23,6 +23,7 @@ - #include "base/trace_event/trace_event.h" - #include "base/trace_event/typed_macros.h" - #include "build/build_config.h" -+#include "build/branding_buildflags.h" - #include "components/bookmarks/browser/bookmark_model.h" - #include "components/dom_distiller/core/url_constants.h" - #include "components/dom_distiller/core/url_utils.h" diff --git a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc index 83eca6137f89..ef92dc1834e8 100644 --- a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc +++ b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/optimization_guide_util.cc.orig 2024-02-04 14:46:08 UTC +--- components/optimization_guide/core/optimization_guide_util.cc.orig 2024-06-25 12:08:48 UTC +++ components/optimization_guide/core/optimization_guide_util.cc -@@ -34,7 +34,7 @@ optimization_guide::proto::Platform GetPlatform() { +@@ -40,7 +40,7 @@ optimization_guide::proto::Platform GetPlatform() { return optimization_guide::proto::PLATFORM_CHROMEOS; #elif BUILDFLAG(IS_ANDROID) return optimization_guide::proto::PLATFORM_ANDROID; diff --git a/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc b/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc index 1e2e752c8a8e..7037ba289ee2 100644 --- a/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc +++ b/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc @@ -1,4 +1,4 @@ ---- components/os_crypt/sync/libsecret_util_linux.cc.orig 2023-07-24 14:27:53 UTC +--- components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-06-25 12:08:48 UTC +++ components/os_crypt/sync/libsecret_util_linux.cc @@ -99,16 +99,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { @@ -19,9 +19,9 @@ // We wanted to use libsecret, but we couldn't load it. Warn, because // either the user asked for this, or we autodetected it incorrectly. (Or // the system has broken libraries, which is also good to warn about.) - // TODO(crbug.com/607435): Channel this message to the user-facing log + // TODO(crbug.com/40467093): Channel this message to the user-facing log - VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror(); -+ VLOG(1) << "Could not load << " << kSecretLib << ": " << dlerror(); ++ VLOG(1) << "Could not load " << kSecretLib << ": " << dlerror(); return false; } diff --git a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 7190f8844fa4..550676927bbb 100644 --- a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,13 +1,13 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2023-03-13 07:33:08 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2024-06-25 12:08:48 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -310,8 +310,8 @@ void PaintPreviewClient::CapturePaintPreview( - metadata->set_url(url.spec()); +@@ -313,8 +313,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); -- chromeVersion->set_major(CHROME_VERSION_MAJOR); -- chromeVersion->set_minor(CHROME_VERSION_MINOR); -+ chromeVersion->set_gmajor(CHROME_VERSION_MAJOR); -+ chromeVersion->set_gminor(CHROME_VERSION_MINOR); - chromeVersion->set_build(CHROME_VERSION_BUILD); - chromeVersion->set_patch(CHROME_VERSION_PATCH); + const auto& current_chrome_version = version_info::GetVersion(); +- chromeVersion->set_major(current_chrome_version.components()[0]); +- chromeVersion->set_minor(current_chrome_version.components()[1]); ++ chromeVersion->set_gmajor(current_chrome_version.components()[0]); ++ chromeVersion->set_gminor(current_chrome_version.components()[1]); + chromeVersion->set_build(current_chrome_version.components()[2]); + chromeVersion->set_patch(current_chrome_version.components()[3]); document_data.callback = std::move(callback); diff --git a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc index a5dcb56fe72d..7a2ff0bcdb99 100644 --- a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc +++ b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc @@ -1,13 +1,13 @@ ---- components/paint_preview/browser/paint_preview_client_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- components/paint_preview/browser/paint_preview_client_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ components/paint_preview/browser/paint_preview_client_unittest.cc -@@ -171,8 +171,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa - metadata->set_url(expected_url.spec()); +@@ -174,8 +174,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); -- chromeVersion->set_major(CHROME_VERSION_MAJOR); -- chromeVersion->set_minor(CHROME_VERSION_MINOR); -+ chromeVersion->set_gmajor(CHROME_VERSION_MAJOR); -+ chromeVersion->set_gminor(CHROME_VERSION_MINOR); - chromeVersion->set_build(CHROME_VERSION_BUILD); - chromeVersion->set_patch(CHROME_VERSION_PATCH); + const auto& current_chrome_version = version_info::GetVersion(); +- chromeVersion->set_major(current_chrome_version.components()[0]); +- chromeVersion->set_minor(current_chrome_version.components()[1]); ++ chromeVersion->set_gmajor(current_chrome_version.components()[0]); ++ chromeVersion->set_gminor(current_chrome_version.components()[1]); + chromeVersion->set_build(current_chrome_version.components()[2]); + chromeVersion->set_patch(current_chrome_version.components()[3]); PaintPreviewFrameProto* main_frame = expected_proto.mutable_root_frame(); diff --git a/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc index bda61a904c18..4686284b1111 100644 --- a/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc +++ b/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc @@ -1,13 +1,13 @@ ---- components/paint_preview/player/player_compositor_delegate.cc.orig 2023-03-13 07:33:08 UTC +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ components/paint_preview/player/player_compositor_delegate.cc -@@ -452,8 +452,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT - // use the AXTreeUpdate. +@@ -435,8 +435,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT auto chrome_version = capture_result_->proto.metadata().chrome_version(); + const auto& current_chrome_version = version_info::GetVersion(); if (capture_result_->proto.metadata().has_chrome_version() && -- chrome_version.major() == CHROME_VERSION_MAJOR && -- chrome_version.minor() == CHROME_VERSION_MINOR && -+ chrome_version.gmajor() == CHROME_VERSION_MAJOR && -+ chrome_version.gminor() == CHROME_VERSION_MINOR && - chrome_version.build() == CHROME_VERSION_BUILD && - chrome_version.patch() == CHROME_VERSION_PATCH) { +- chrome_version.major() == current_chrome_version.components()[0] && +- chrome_version.minor() == current_chrome_version.components()[1] && ++ chrome_version.gmajor() == current_chrome_version.components()[0] && ++ chrome_version.gminor() == current_chrome_version.components()[1] && + chrome_version.build() == current_chrome_version.components()[2] && + chrome_version.patch() == current_chrome_version.components()[3]) { paint_preview_service_->GetFileMixin()->GetAXTreeUpdate( diff --git a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc index 2d506dbcdba6..f1f09b30a60d 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,16 +1,7 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-02-04 14:46:08 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-06-25 12:08:48 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -8,7 +8,7 @@ +@@ -36,7 +36,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, - namespace password_manager::features { - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Enables attaching password manager and autofill internals logs to an Autofill - // Rater Extension Report. - BASE_FEATURE(kAttachLogsToAutofillRaterExtensionReport, -@@ -30,7 +30,7 @@ BASE_FEATURE(kBiometricTouchToFill, - // Delete undecryptable passwords from the store when Sync is active. BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) @@ -18,3 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT +@@ -98,7 +98,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, + "PasswordManualFallbackAvailable", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kRestartToGainAccessToKeychain, + "RestartToGainAccessToKeychain", + #if BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h index ed24c299b254..1d8b410f8219 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,11 +1,11 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-02-04 14:46:08 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-06-25 12:08:48 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -15,7 +15,7 @@ namespace password_manager::features { - // All features in alphabetical order. The features should be documented - // alongside the definition of their values in the .cc file. - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kAttachLogsToAutofillRaterExtensionReport); - #endif +@@ -82,7 +82,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); + // Enables triggering password suggestions through the context menu. + BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable); +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables "Needs access to keychain, restart chrome" bubble and banner. + BASE_DECLARE_FEATURE(kRestartToGainAccessToKeychain); + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc new file mode 100644 index 000000000000..9f2331d4aad8 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -0,0 +1,29 @@ +--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_form_manager.cc +@@ -58,7 +58,7 @@ + #include "components/webauthn/android/webauthn_cred_man_delegate.h" + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/os_crypt/sync/os_crypt.h" + #endif + +@@ -227,7 +227,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest + return false; + } + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool ShouldShowKeychainErrorBubble( + std::optional<PasswordStoreBackendError> backend_error) { + if (!backend_error.has_value()) { +@@ -869,7 +869,7 @@ void PasswordFormManager::OnFetchCompleted() { + error.value().type); + } + +-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (ShouldShowKeychainErrorBubble( + form_fetcher_->GetProfileStoreBackendError())) { + client_->NotifyKeychainError(); diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc new file mode 100644 index 000000000000..fa2acec1b2ed --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_manager.cc.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_manager.cc +@@ -373,7 +373,7 @@ void PasswordManager::RegisterProfilePrefs( + registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList); + #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) + registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, + 0); + #endif diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h new file mode 100644 index 000000000000..dfbd59cf99ed --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -0,0 +1,20 @@ +--- components/password_manager/core/browser/password_manager_client.h.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_manager_client.h +@@ -30,7 +30,7 @@ + #include "net/cert/cert_status_flags.h" + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/i18n/rtl.h" + #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" + #include "ui/gfx/geometry/rect_f.h" +@@ -505,7 +505,7 @@ class PasswordManagerClient { + virtual void RefreshPasswordManagerSettingsIfNeeded() const; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Creates and show the cross domain confirmation popup. + virtual std::unique_ptr<PasswordCrossDomainConfirmationPopupController> + ShowCrossDomainConfirmationPopup(const gfx::RectF& element_bounds, diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.cc new file mode 100644 index 000000000000..72e5c17a8f99 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_manager_switches.cc.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_manager_switches.cc +@@ -6,7 +6,7 @@ + + namespace password_manager { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Specifies which encryption storage backend to use. Possible values are + // kwallet, kwallet5, kwallet6, gnome-libsecret, basic. + // Any other value will lead to Chrome detecting the best backend automatically. diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.h new file mode 100644 index 000000000000..773b5b445623 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manager__switches.h @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_manager_switches.h.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_manager_switches.h +@@ -10,7 +10,7 @@ + + namespace password_manager { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kPasswordStore[]; + extern const char kEnableEncryptionSelection[]; + #endif diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc new file mode 100644 index 000000000000..e735bb0faa88 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_manual_fallback_flow.cc +@@ -192,7 +192,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( + payload.password)); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (payload.is_cross_domain) { + cross_domain_confirmation_popup_controller_ = + password_client_->ShowCrossDomainConfirmationPopup( diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h new file mode 100644 index 000000000000..dde66592d9b8 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h @@ -0,0 +1,20 @@ +--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_manual_fallback_flow.h +@@ -18,7 +18,7 @@ + #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || + // BUILDFLAG(IS_CHROMEOS) +@@ -159,7 +159,7 @@ class PasswordManualFallbackFlow : public autofill::Au + std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::unique_ptr<PasswordCrossDomainConfirmationPopupController> + cross_domain_confirmation_popup_controller_; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || diff --git a/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc new file mode 100644 index 000000000000..8734a2a1a520 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_store/login_database_async_helper.cc +@@ -149,7 +149,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc + std::vector<PasswordForm> matched_forms; + if (!login_db_ || + !login_db_->GetLogins(form, include_psl, &matched_forms)) { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return PasswordStoreBackendError( + OSCrypt::IsEncryptionAvailable() + ? PasswordStoreBackendErrorType::kUncategorized diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index c6e675929488..b28023869295 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2024-02-04 14:46:08 UTC -+++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2102,7 +2102,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/password_store/login_database_unittest.cc +@@ -2132,7 +2132,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, LoginDatabaseMigrationTestBroken, testing::Values(1, 2, 3, 24)); diff --git a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc new file mode 100644 index 000000000000..2b9b46af01ec --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/stub_password_manager_client.cc +@@ -175,7 +175,7 @@ version_info::Channel StubPasswordManagerClient::GetCh + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::unique_ptr< + password_manager::PasswordCrossDomainConfirmationPopupController> + StubPasswordManagerClient::ShowCrossDomainConfirmationPopup( diff --git a/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h new file mode 100644 index 000000000000..3498428d0c27 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/browser/stub_password_manager_client.h +@@ -74,7 +74,7 @@ class StubPasswordManagerClient : public PasswordManag + MockPasswordFeatureManager* GetPasswordFeatureManager(); + version_info::Channel GetChannel() const override; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::unique_ptr< + password_manager::PasswordCrossDomainConfirmationPopupController> + ShowCrossDomainConfirmationPopup( diff --git a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index 32452041c189..2b1111fede1c 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/iridium/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 2023-11-22 14:00:11 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2024-06-25 12:08:48 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -197,7 +197,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h new file mode 100644 index 000000000000..53147174ae68 --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -0,0 +1,11 @@ +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-06-25 12:08:48 UTC ++++ components/password_manager/core/common/password_manager_pref_names.h +@@ -327,7 +327,7 @@ inline constexpr char kPasswordManagerPromoCardsList[] + inline constexpr char kPasswordSharingEnabled[] = + "password_manager.password_sharing_enabled"; + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Integer pref indicating how many times relaunch Chrome bubble was dismissed. + inline constexpr char kRelaunchChromeBubbleDismissedCounter[] = + "password_manager.relaunch_chrome_bubble_dismissed_counter"; diff --git a/www/iridium/files/patch-components_performance__manager_public_features.h b/www/iridium/files/patch-components_performance__manager_public_features.h index a4f5010b8abe..6768f554382d 100644 --- a/www/iridium/files/patch-components_performance__manager_public_features.h +++ b/www/iridium/files/patch-components_performance__manager_public_features.h @@ -1,6 +1,6 @@ ---- components/performance_manager/public/features.h.orig 2023-11-22 14:00:11 UTC +--- components/performance_manager/public/features.h.orig 2024-06-25 12:08:48 UTC +++ components/performance_manager/public/features.h -@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnDedicatedThreadPoolThread); +@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThreadSync); #if !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index fdefcc7f194a..53d91dab5612 100644 --- a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/iridium/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 2023-07-24 14:27:53 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2024-06-25 12:08:48 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -327,7 +327,7 @@ class PolicyTestCase { +@@ -411,7 +411,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index c76db5ce6837..3edf70e988b7 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-02-04 14:46:08 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-06-25 12:08:48 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -508,7 +508,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -647,7 +647,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 2f70f360f6c4..bdfe4b3b3d6c 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/iridium/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 2023-11-22 14:00:11 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2024-06-25 12:08:48 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ #endif @@ -26,7 +26,7 @@ #include <algorithm> #include <utility> -@@ -86,7 +91,7 @@ namespace em = enterprise_management; +@@ -88,7 +93,7 @@ namespace em = enterprise_management; std::string GetMachineName() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -35,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -143,7 +148,7 @@ std::string GetMachineName() { +@@ -145,7 +150,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ @@ -44,7 +44,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -166,7 +171,7 @@ std::string GetOSArchitecture() { +@@ -168,7 +173,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc b/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc index fb600aaf898f..7c157a6da21a 100644 --- a/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc +++ b/www/iridium/files/patch-components_policy_core_common_policy__loader__common.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/policy_loader_common.cc.orig 2023-10-21 11:51:27 UTC +--- components/policy/core/common/policy_loader_common.cc.orig 2024-06-25 12:08:48 UTC +++ components/policy/core/common/policy_loader_common.cc @@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = { key::kDefaultSearchProviderEnabled, @@ -7,11 +7,11 @@ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) key::kAutoOpenFileTypes, - key::kSafeBrowsingAllowlistDomains, key::kHomepageIsNewTabPage, -@@ -55,7 +55,7 @@ const char* kSensitivePolicies[] = { - key::kRestoreOnStartup, - key::kRestoreOnStartupURLs, + key::kPasswordProtectionChangePasswordURL, +@@ -56,7 +56,7 @@ const char* kSensitivePolicies[] = { + key::kSafeBrowsingAllowlistDomains, + key::kSiteSearchSettings, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-components_policy_core_common_policy__paths.cc b/www/iridium/files/patch-components_policy_core_common_policy__paths.cc index 989b0cf0f210..9871d5029a2e 100644 --- a/www/iridium/files/patch-components_policy_core_common_policy__paths.cc +++ b/www/iridium/files/patch-components_policy_core_common_policy__paths.cc @@ -1,16 +1,20 @@ ---- components/policy/core/common/policy_paths.cc.orig 2023-10-21 11:51:27 UTC +--- components/policy/core/common/policy_paths.cc.orig 2024-06-25 12:08:48 UTC +++ components/policy/core/common/policy_paths.cc -@@ -15,9 +15,11 @@ namespace policy { +@@ -13,13 +13,11 @@ namespace policy { + // policies for the browser. + // Intentionally not using base::FilePath to minimize dependencies. #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ - BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) -const char kPolicyPath[] = "/etc/iridium-browser/policies"; -+const char kPolicyPath[] = "/etc/iridium/policies"; -+#elif BUILDFLAG(IS_FREEBSD) +-#elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) +-const char kPolicyPath[] = "/etc/iridium-browser/policies"; ++#if BUILDFLAG(IS_FREEBSD) +const char kPolicyPath[] = "/usr/local/etc/iridium/policies"; #else -const char kPolicyPath[] = "/etc/iridium-browser/policies"; +-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) +const char kPolicyPath[] = "/etc/iridium/policies"; - #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ - // BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) ++#endif #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) + + } // namespace policy diff --git a/www/iridium/files/patch-components_policy_core_common_policy__utils.cc b/www/iridium/files/patch-components_policy_core_common_policy__utils.cc new file mode 100644 index 000000000000..e5b84aa4240f --- /dev/null +++ b/www/iridium/files/patch-components_policy_core_common_policy__utils.cc @@ -0,0 +1,11 @@ +--- components/policy/core/common/policy_utils.cc.orig 2024-06-25 12:08:48 UTC ++++ components/policy/core/common/policy_utils.cc +@@ -28,7 +28,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, + return true; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (channel == version_info::Channel::DEV) { + return true; + } diff --git a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py index fdcd7773d314..84765c954c1a 100644 --- a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2023-10-21 11:51:27 UTC +--- components/policy/tools/generate_policy_source.py.orig 2024-06-25 12:08:48 UTC +++ components/policy/tools/generate_policy_source.py -@@ -37,9 +37,9 @@ PLATFORM_STRINGS = { +@@ -38,9 +38,9 @@ PLATFORM_STRINGS = { 'ios': ['ios'], 'fuchsia': ['fuchsia'], 'chrome.win': ['win'], diff --git a/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc index 75db3e0133e8..41fbd306b293 100644 --- a/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc +++ b/www/iridium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc @@ -1,8 +1,8 @@ ---- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ components/safe_browsing/content/common/file_type_policies_unittest.cc @@ -139,7 +139,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting()); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc index 92fc395fe523..eb9eaeb448e1 100644 --- a/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc +++ b/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2024-02-04 14:46:08 UTC +--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2024-06-25 12:08:48 UTC +++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc -@@ -116,7 +116,7 @@ std::ostream& operator<<(std::ostream& os, const ListI +@@ -118,7 +118,7 @@ std::ostream& operator<<(std::ostream& os, const ListI PlatformType GetCurrentPlatformType() { #if BUILDFLAG(IS_WIN) return WINDOWS_PLATFORM; diff --git a/www/iridium/files/patch-components_safe__browsing_core_common_features.cc b/www/iridium/files/patch-components_safe__browsing_core_common_features.cc new file mode 100644 index 000000000000..a2d4162f62ef --- /dev/null +++ b/www/iridium/files/patch-components_safe__browsing_core_common_features.cc @@ -0,0 +1,11 @@ +--- components/safe_browsing/core/common/features.cc.orig 2024-06-25 12:08:48 UTC ++++ components/safe_browsing/core/common/features.cc +@@ -160,7 +160,7 @@ BASE_FEATURE(kFriendlierSafeBrowsingSettingsStandardPr + BASE_FEATURE(kHashPrefixRealTimeLookups, + "SafeBrowsingHashPrefixRealTimeLookups", + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/iridium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc new file mode 100644 index 000000000000..49aa00b5eb2e --- /dev/null +++ b/www/iridium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc @@ -0,0 +1,11 @@ +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-06-25 12:08:48 UTC ++++ components/search_engines/search_engine_choice/search_engine_choice_service.cc +@@ -539,7 +539,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc + + int SearchEngineChoiceService::GetCountryIdInternal() { + // `country_codes::kCountryIDAtInstall` may not be set yet. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Android, ChromeOS and Linux, `country_codes::kCountryIDAtInstall` is + // computed asynchronously using platform-specific signals, and may not be + // available yet. diff --git a/www/iridium/files/patch-components_search__engines_template__url__service.cc b/www/iridium/files/patch-components_search__engines_template__url__service.cc new file mode 100644 index 000000000000..5edc377b1a5b --- /dev/null +++ b/www/iridium/files/patch-components_search__engines_template__url__service.cc @@ -0,0 +1,11 @@ +--- components/search_engines/template_url_service.cc.orig 2024-06-25 12:08:48 UTC ++++ components/search_engines/template_url_service.cc +@@ -3096,7 +3096,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( + std::unique_ptr<EnterpriseSiteSearchManager> + TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(omnibox::kSiteSearchSettingsPolicy) + ? std::make_unique<EnterpriseSiteSearchManager>( + prefs, base::BindRepeating( diff --git a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc index 94db6518d1d9..6cb8f6700a7c 100644 --- a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc +++ b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -1,6 +1,6 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-10-21 11:51:27 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2024-06-25 12:08:48 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #if BUILDFLAG(IS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -78,7 +78,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -79,7 +79,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if BUILDFLAG(IS_WIN) content::InitializeDWriteFontProxy(); @@ -18,8 +18,8 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -101,7 +101,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp - base::BindOnce([] { SkFontMgr::RefDefault(); })); +@@ -102,7 +102,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp + base::BindOnce([] { skia::DefaultFontMgr(); })); // Sanity check that fonts are working. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc deleted file mode 100644 index 99577376dfff..000000000000 --- a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2023-10-21 11:51:27 UTC -+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc -@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi - } - } - -+#if !BUILDFLAG(IS_BSD) - auto* instance = sandbox::policy::SandboxLinux::GetInstance(); - - std::vector<BrokerFilePermission> permissions{ -@@ -82,6 +83,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi - sandbox::syscall_broker::COMMAND_OPEN}), - permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); - instance->EngageNamespaceSandboxIfPossible(); -+#endif - - return true; - } diff --git a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h deleted file mode 100644 index f60166216b66..000000000000 --- a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h +++ /dev/null @@ -1,16 +0,0 @@ ---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2023-07-24 14:27:53 UTC -+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h -@@ -5,7 +5,13 @@ - #ifndef COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ - #define COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ - -+#include "build/build_config.h" -+ -+#if BUILDFLAG(IS_BSD) -+#include "sandbox/policy/sandbox.h" -+#else - #include "sandbox/policy/linux/sandbox_linux.h" -+#endif - - namespace screen_ai { - diff --git a/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc b/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc deleted file mode 100644 index 19f1df225805..000000000000 --- a/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-11-22 14:00:11 UTC -+++ components/services/screen_ai/screen_ai_library_wrapper.cc -@@ -190,7 +190,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima - - // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux - // official. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - free_library_allocated_char_array_(library_buffer.release()); - #endif - -@@ -222,7 +222,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& - - // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux - // official. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - free_library_allocated_char_array_(library_buffer.release()); - #endif - -@@ -256,7 +256,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr - - // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux - // official. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - free_library_allocated_int32_array_(library_buffer.release()); - #endif - diff --git a/www/iridium/files/patch-components_signin_public_base_signin__switches.cc b/www/iridium/files/patch-components_signin_public_base_signin__switches.cc new file mode 100644 index 000000000000..1e7270ad1c37 --- /dev/null +++ b/www/iridium/files/patch-components_signin_public_base_signin__switches.cc @@ -0,0 +1,20 @@ +--- components/signin/public/base/signin_switches.cc.orig 2024-06-25 12:08:48 UTC ++++ components/signin/public/base/signin_switches.cc +@@ -135,7 +135,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled() { + } + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn, + "MinorModeRestrictionsForHistorySyncOptIn", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -144,7 +144,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau + #if BUILDFLAG(IS_ANDROID) + // Based on Signin.AccountCapabilities.UserVisibleLatency + 400; +-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Based on Signin.SyncOptIn.PreSyncConfirmationLatency + 900; + #elif BUILDFLAG(IS_IOS) diff --git a/www/iridium/files/patch-components_signin_public_base_signin__switches.h b/www/iridium/files/patch-components_signin_public_base_signin__switches.h new file mode 100644 index 000000000000..654a962d2884 --- /dev/null +++ b/www/iridium/files/patch-components_signin_public_base_signin__switches.h @@ -0,0 +1,11 @@ +--- components/signin/public/base/signin_switches.h.orig 2024-06-25 12:08:48 UTC ++++ components/signin/public/base/signin_switches.h +@@ -115,7 +115,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(); + + // Controls the view mode for (history) sync screen. + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(SIGNIN_SWITCHES) + BASE_DECLARE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn); + diff --git a/www/iridium/files/patch-components_soda_soda__util.cc b/www/iridium/files/patch-components_soda_soda__util.cc new file mode 100644 index 000000000000..1dde2e5be512 --- /dev/null +++ b/www/iridium/files/patch-components_soda_soda__util.cc @@ -0,0 +1,29 @@ +--- components/soda/soda_util.cc.orig 2024-06-25 12:08:48 UTC ++++ components/soda/soda_util.cc +@@ -20,7 +20,7 @@ + #include "base/win/windows_version.h" + #endif + +-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_X86_FAMILY) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_FAMILY) + #include "base/cpu.h" + #endif + +@@ -45,7 +45,7 @@ bool IsSupportedChromeOS() { + } + #endif // BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool IsSupportedLinux() { + #if defined(ARCH_CPU_X86_FAMILY) + // Check if the CPU has the required instruction set to run the Speech +@@ -76,7 +76,7 @@ bool IsSupportedWin() { + bool IsOnDeviceSpeechRecognitionSupported() { + #if BUILDFLAG(IS_CHROMEOS) + return IsSupportedChromeOS(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return IsSupportedLinux(); + #elif BUILDFLAG(IS_WIN) + return IsSupportedWin(); diff --git a/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc index 258b3d54cb60..d4848700f9d7 100644 --- a/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc +++ b/www/iridium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc @@ -1,8 +1,8 @@ ---- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2023-10-21 11:51:27 UTC +--- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-06-25 12:08:48 UTC +++ components/startup_metric_utils/common/startup_metric_utils.cc -@@ -78,7 +78,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi +@@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi // Enabling this logic on OS X causes a significant performance regression. - // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are + // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once priority changes are // ignored on Mac main thread. -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc new file mode 100644 index 000000000000..e5bb36461d99 --- /dev/null +++ b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc @@ -0,0 +1,11 @@ +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-06-25 12:08:48 UTC ++++ components/supervised_user/core/browser/supervised_user_preferences.cc +@@ -153,7 +153,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry + static_cast<int>(FirstTimeInterstitialBannerState::kUnknown)); + registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); + #if BUILDFLAG(ENABLE_EXTENSIONS) && \ +- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) ++ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + registry->RegisterIntegerPref( + prefs::kLocallyParentApprovedExtensionsMigrationState, + static_cast<int>( diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index efabd8e7c09d..5fb385505db3 100644 --- a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,11 +1,11 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-02-04 14:46:08 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-06-25 12:08:48 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -212,7 +212,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -175,7 +175,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_IOS) + BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) { - if (original_state != FirstTimeInterstitialBannerState::kSetupComplete && - can_show_first_time_interstitial_banner_) { + if (original_state != FirstTimeInterstitialBannerState::kSetupComplete && + can_show_first_time_interstitial_banner_) { + target_state = FirstTimeInterstitialBannerState::kNeedToShow; diff --git a/www/iridium/files/patch-components_supervised__user_core_common_features.cc b/www/iridium/files/patch-components_supervised__user_core_common_features.cc index 96b1d359dad1..6037aa1c50fb 100644 --- a/www/iridium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/iridium/files/patch-components_supervised__user_core_common_features.cc @@ -1,7 +1,7 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-02-04 14:46:08 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-06-25 12:08:48 UTC +++ components/supervised_user/core/common/features.cc -@@ -91,7 +91,7 @@ BASE_FEATURE(kEnableManagedByParentUi, - "EnableManagedByParentUi", +@@ -59,7 +59,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt + "UpdatedSupervisedUserExtensionApprovalStrings", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) @@ -9,12 +9,12 @@ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -149,7 +149,7 @@ bool IsChildAccountSupervisionEnabled() { +@@ -70,7 +70,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens + #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( - supervised_user:: - kFilterWebsitesForSupervisedUsersOnDesktopAndIOS) || --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FeatureList::IsEnabled( - supervised_user:: - kEnableExtensionsPermissionsForSupervisedUsersOnDesktop) || + kEnableSupervisedUserSkipParentApprovalToInstallExtensions); +-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( + kEnableSupervisedUserSkipParentApprovalToInstallExtensions); + bool permissionExtensionsForSupervisedUsersEnabled = diff --git a/www/iridium/files/patch-components_supervised__user_core_common_features.h b/www/iridium/files/patch-components_supervised__user_core_common_features.h index 4e4bfb5e6899..9e0ff7940599 100644 --- a/www/iridium/files/patch-components_supervised__user_core_common_features.h +++ b/www/iridium/files/patch-components_supervised__user_core_common_features.h @@ -1,8 +1,8 @@ ---- components/supervised_user/core/common/features.h.orig 2024-02-04 14:46:08 UTC +--- components/supervised_user/core/common/features.h.orig 2024-06-25 12:08:48 UTC +++ components/supervised_user/core/common/features.h -@@ -24,7 +24,7 @@ BASE_DECLARE_FEATURE(kEnableManagedByParentUi); - extern const base::FeatureParam<std::string> kManagedByParentUiMoreInfoUrl; - BASE_DECLARE_FEATURE(kClearingCookiesKeepsSupervisedUsersSignedIn); +@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( + // Applies new informative strings during the parental extension approval flow. + BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-components_supervised__user_core_common_pref__names.h b/www/iridium/files/patch-components_supervised__user_core_common_pref__names.h new file mode 100644 index 000000000000..6a40d192be3b --- /dev/null +++ b/www/iridium/files/patch-components_supervised__user_core_common_pref__names.h @@ -0,0 +1,11 @@ +--- components/supervised_user/core/common/pref_names.h.orig 2024-06-25 12:08:48 UTC ++++ components/supervised_user/core/common/pref_names.h +@@ -136,7 +136,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat + "profile.managed.banner_state"; + + #if BUILDFLAG(ENABLE_EXTENSIONS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // An integer pref that stores the current state of the local extension + // parent approval migration when the feature + // `kEnableSupervisedUserSkipParentApprovalToInstallExtensions` becomes enabled. diff --git a/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc index b4c827d23c33..b47cb63318f7 100644 --- a/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,6 +1,6 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2023-10-21 11:51:27 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2024-06-25 12:08:48 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -82,7 +82,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na +@@ -84,7 +84,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; @@ -9,7 +9,7 @@ return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) switch (ui::GetDeviceFormFactor()) { -@@ -107,7 +107,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -109,7 +109,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { return DeviceInfo::OsType::kChromeOsAsh; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return DeviceInfo::OsType::kChromeOsLacros; @@ -18,7 +18,7 @@ return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -128,7 +128,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { DeviceInfo::FormFactor GetLocalDeviceFormFactor() { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-components_sync_base_features.cc b/www/iridium/files/patch-components_sync_base_features.cc deleted file mode 100644 index 0079b83c1436..000000000000 --- a/www/iridium/files/patch-components_sync_base_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/sync/base/features.cc.orig 2024-02-04 14:46:08 UTC -+++ components/sync/base/features.cc -@@ -101,7 +101,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage, - BASE_FEATURE(kSyncPollImmediatelyOnEveryStartup, - "SyncPollImmediatelyOnEveryStartup", - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-chrome_browser_performance__manager_metrics_cpu__probe_cpu__probe.cc b/www/iridium/files/patch-components_system__cpu_cpu__probe.cc index 7ccbea6f7466..1be44ef1b3ee 100644 --- a/www/iridium/files/patch-chrome_browser_performance__manager_metrics_cpu__probe_cpu__probe.cc +++ b/www/iridium/files/patch-components_system__cpu_cpu__probe.cc @@ -1,5 +1,5 @@ ---- chrome/browser/performance_manager/metrics/cpu_probe/cpu_probe.cc.orig 2024-02-04 14:46:08 UTC -+++ chrome/browser/performance_manager/metrics/cpu_probe/cpu_probe.cc +--- components/system_cpu/cpu_probe.cc.orig 2024-06-25 12:08:48 UTC ++++ components/system_cpu/cpu_probe.cc @@ -30,6 +30,9 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { return CpuProbeWin::Create(); #elif BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index f18662a3c77c..81f6ec539d01 100644 --- a/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2023-10-21 11:51:27 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2024-06-25 12:08:48 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -293,7 +293,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -294,7 +294,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/iridium/files/patch-components_user__education_common_product__messaging__controller.cc b/www/iridium/files/patch-components_user__education_common_product__messaging__controller.cc deleted file mode 100644 index 810724d04c1c..000000000000 --- a/www/iridium/files/patch-components_user__education_common_product__messaging__controller.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- components/user_education/common/product_messaging_controller.cc.orig 2023-11-22 14:00:11 UTC -+++ components/user_education/common/product_messaging_controller.cc -@@ -6,6 +6,7 @@ - - #include <sstream> - #include <utility> -+#include <vector> - - #include "base/containers/contains.h" - #include "base/functional/callback.h" diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc index 477042d51b6f..0ab6cd24abd3 100644 --- a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2024-02-04 14:46:08 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2024-06-25 12:08:48 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -1003,7 +1003,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -997,7 +997,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/iridium/files/patch-components_variations_service_variations__service.cc b/www/iridium/files/patch-components_variations_service_variations__service.cc index 592d598a8bb1..bb981f1205a8 100644 --- a/www/iridium/files/patch-components_variations_service_variations__service.cc +++ b/www/iridium/files/patch-components_variations_service_variations__service.cc @@ -1,6 +1,6 @@ ---- components/variations/service/variations_service.cc.orig 2024-02-04 14:46:08 UTC +--- components/variations/service/variations_service.cc.orig 2024-06-25 12:08:48 UTC +++ components/variations/service/variations_service.cc -@@ -96,7 +96,7 @@ std::string GetPlatformString() { +@@ -99,7 +99,7 @@ std::string GetPlatformString() { return "android"; #elif BUILDFLAG(IS_FUCHSIA) return "fuchsia"; diff --git a/www/iridium/files/patch-components_viz_common_features.cc b/www/iridium/files/patch-components_viz_common_features.cc new file mode 100644 index 000000000000..3c94e2432106 --- /dev/null +++ b/www/iridium/files/patch-components_viz_common_features.cc @@ -0,0 +1,20 @@ +--- components/viz/common/features.cc.orig 2024-06-25 12:08:48 UTC ++++ components/viz/common/features.cc +@@ -251,7 +251,7 @@ BASE_FEATURE(kBufferQueueImageSetPurgeable, + "BufferQueueImageSetPurgeable", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On platforms using SkiaOutputDeviceBufferQueue and not yet universally using + // SkiaRenderer-allocated images, when this is true SkiaRenderer will allocate + // and maintain a buffer queue of images for the root render pass, instead of +@@ -535,7 +535,7 @@ bool ShouldOnBeginFrameThrottleVideo() { + return base::FeatureList::IsEnabled(features::kOnBeginFrameThrottleVideo); + } + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool ShouldRendererAllocateImages() { + return base::FeatureList::IsEnabled(kRendererAllocatesImages); + } diff --git a/www/iridium/files/patch-components_viz_common_features.h b/www/iridium/files/patch-components_viz_common_features.h new file mode 100644 index 000000000000..bf5ec5852de9 --- /dev/null +++ b/www/iridium/files/patch-components_viz_common_features.h @@ -0,0 +1,20 @@ +--- components/viz/common/features.h.orig 2024-06-25 12:08:48 UTC ++++ components/viz/common/features.h +@@ -74,7 +74,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI + VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kAllowUndamagedNonrootRenderPassToSkip); + VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE( + kAllowForceMergeRenderPassWithRequireOverlayQuads); +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kRendererAllocatesImages); + #endif + VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kBufferQueueImageSetPurgeable); +@@ -134,7 +134,7 @@ VIZ_COMMON_EXPORT std::optional<double> IsDynamicSched + VIZ_COMMON_EXPORT std::optional<double> IsDynamicSchedulerEnabledForClients(); + VIZ_COMMON_EXPORT int MaxOverlaysConsidered(); + VIZ_COMMON_EXPORT bool ShouldOnBeginFrameThrottleVideo(); +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + VIZ_COMMON_EXPORT bool ShouldRendererAllocateImages(); + #endif + VIZ_COMMON_EXPORT bool IsOnBeginFrameAcksEnabled(); diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.cc b/www/iridium/files/patch-components_viz_host_host__display__client.cc new file mode 100644 index 000000000000..6e0c3964b9d7 --- /dev/null +++ b/www/iridium/files/patch-components_viz_host_host__display__client.cc @@ -0,0 +1,11 @@ +--- components/viz/host/host_display_client.cc.orig 2024-06-25 12:08:48 UTC ++++ components/viz/host/host_display_client.cc +@@ -65,7 +65,7 @@ void HostDisplayClient::AddChildWindowToBrowser( + } + #endif + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { + NOTIMPLEMENTED(); + } diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.h b/www/iridium/files/patch-components_viz_host_host__display__client.h new file mode 100644 index 000000000000..cf805ef1cc48 --- /dev/null +++ b/www/iridium/files/patch-components_viz_host_host__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/host/host_display_client.h.orig 2024-06-25 12:08:48 UTC ++++ components/viz/host/host_display_client.h +@@ -52,7 +52,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom + void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override; + #endif + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override; + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) + diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc new file mode 100644 index 000000000000..cc50c50c609d --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc @@ -0,0 +1,11 @@ +--- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-06-25 12:08:48 UTC ++++ components/viz/service/display_embedder/skia_output_device_buffer_queue.cc +@@ -197,7 +197,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue + capabilities_.only_invalidates_damage_rect = false; + capabilities_.number_of_buffers = 3; + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + capabilities_.renderer_allocates_images = + ::features::ShouldRendererAllocateImages(); + #else diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 9a56c86ee52b..95878e6ae81b 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,9 +1,9 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-11-22 14:00:11 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-06-25 12:08:48 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1512,7 +1512,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor - ->GetDeviceQueue() - ->GetVulkanPhysicalDevice(), - VK_IMAGE_TILING_OPTIMAL, vk_format, yuv_color_space, ycbcr_info); +@@ -1522,7 +1522,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor + ->GetVulkanPhysicalDevice(), + VK_IMAGE_TILING_OPTIMAL, vk_format, + si_format, yuv_color_space, ycbcr_info); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Textures that were allocated _on linux_ with ycbcr info came from diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index 4aa080e13e31..855f9a8c0940 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,17 +1,17 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-02-04 14:46:08 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-06-25 12:08:48 UTC +++ components/viz/service/display_embedder/software_output_surface.cc @@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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 (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -151,7 +151,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h index 0cee4e7ee0e7..87a6d3fec511 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,8 +1,8 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2024-02-04 14:46:08 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2024-06-25 12:08:48 UTC +++ components/viz/service/display_embedder/software_output_surface.h @@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) @@ -11,7 +11,7 @@ #endif @@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc index c657f82dbf31..11ed3f06a9af 100644 --- a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2023-11-22 14:00:11 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-06-25 12:08:48 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1219,7 +1219,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1442,7 +1442,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc new file mode 100644 index 000000000000..e119c371852d --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -0,0 +1,20 @@ +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-06-25 12:08:48 UTC ++++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc +@@ -111,7 +111,7 @@ RootCompositorFrameSinkImpl::Create( + output_surface->SetNeedsSwapSizeNotifications( + params->send_swap_size_notifications); + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + // For X11, we need notify client about swap completion after resizing, so the + // client can use it for synchronize with X11 WM. + output_surface->SetNeedsSwapSizeNotifications(true); +@@ -656,7 +656,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw + if (display_client_ && enable_swap_completion_callback_) { + display_client_->DidCompleteSwapWithSize(pixel_size); + } +-#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + if (display_client_ && pixel_size != last_swap_pixel_size_) { + last_swap_pixel_size_ = pixel_size; + display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h new file mode 100644 index 000000000000..e0642755c71c --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -0,0 +1,11 @@ +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-06-25 12:08:48 UTC ++++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h +@@ -209,7 +209,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl + // See comments on `EvictionHandler`. + EvictionHandler eviction_handler_; + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + gfx::Size last_swap_pixel_size_; + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) + diff --git a/www/iridium/files/patch-components_viz_test_fake__display__client.cc b/www/iridium/files/patch-components_viz_test_fake__display__client.cc new file mode 100644 index 000000000000..55c3ee8173d4 --- /dev/null +++ b/www/iridium/files/patch-components_viz_test_fake__display__client.cc @@ -0,0 +1,11 @@ +--- components/viz/test/fake_display_client.cc.orig 2024-06-25 12:08:48 UTC ++++ components/viz/test/fake_display_client.cc +@@ -27,7 +27,7 @@ void FakeDisplayClient::AddChildWindowToBrowser( + gpu::SurfaceHandle child_window) {} + #endif + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + void FakeDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {} + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) + diff --git a/www/iridium/files/patch-components_viz_test_fake__display__client.h b/www/iridium/files/patch-components_viz_test_fake__display__client.h new file mode 100644 index 000000000000..0d50aa0d2a1e --- /dev/null +++ b/www/iridium/files/patch-components_viz_test_fake__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/test/fake_display_client.h.orig 2024-06-25 12:08:48 UTC ++++ components/viz/test/fake_display_client.h +@@ -36,7 +36,7 @@ class FakeDisplayClient : public mojom::DisplayClient + void AddChildWindowToBrowser(gpu::SurfaceHandle child_window) override; + #endif + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override; + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) + diff --git a/www/iridium/files/patch-components_viz_test_mock__display__client.h b/www/iridium/files/patch-components_viz_test_mock__display__client.h new file mode 100644 index 000000000000..abf2c97cee7c --- /dev/null +++ b/www/iridium/files/patch-components_viz_test_mock__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/test/mock_display_client.h.orig 2024-06-25 12:08:48 UTC ++++ components/viz/test/mock_display_client.h +@@ -43,7 +43,7 @@ class MockDisplayClient : public mojom::DisplayClient + MOCK_METHOD1(SetWideColorEnabled, void(bool enabled)); + MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate)); + #endif +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&)); + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) + diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc index c8ee99e2acaf..1b4fbba39006 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2023-11-22 14:00:11 UTC +--- content/app/content_main_runner_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/app/content_main_runner_impl.cc -@@ -144,13 +144,13 @@ +@@ -144,18 +144,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,14 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -188,6 +188,10 @@ + #include "content/public/common/zygote/sandbox_support_linux.h" ++#if !BUILDFLAG(IS_BSD) + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + #include "third_party/boringssl/src/include/openssl/crypto.h" + #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck + +@@ -189,6 +191,10 @@ #include "media/base/media_switches.h" #endif @@ -27,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -374,7 +378,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -36,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -412,7 +416,10 @@ void PreloadLibraryCdms() { +@@ -422,7 +428,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -47,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -424,9 +431,16 @@ void PreSandboxInit() { +@@ -434,9 +443,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -64,8 +71,8 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -833,11 +847,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam - kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); +@@ -847,11 +863,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) @@ -78,7 +85,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1033,8 +1046,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1038,8 +1053,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +106,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1102,7 +1127,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1114,7 +1141,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -108,7 +115,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 -@@ -1137,6 +1162,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1149,6 +1176,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index ef9136e8dc3e..7e0ff026b460 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,57 +1,16 @@ ---- content/browser/BUILD.gn.orig 2024-01-25 17:18:41 UTC +--- content/browser/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ content/browser/BUILD.gn -@@ -12,6 +12,7 @@ import("//chromeos/ash/components/assistant/assistant. - import("//build/config/ozone.gni") - import("//build/config/ui.gni") - import("//chromeos/ash/components/assistant/assistant.gni") -+import("//components/supervised_user/buildflags.gni") - import("//components/viz/common/debugger/viz_debugger.gni") - import("//content/common/features.gni") - import("//content/public/common/zygote/features.gni") -@@ -66,11 +67,13 @@ source_set("browser") { - "//build:branding_buildflags", - "//build:chromecast_buildflags", - "//build:chromeos_buildflags", -+ "//build/config/chromebox_for_meetings:buildflags", - "//build/config/compiler:compiler_buildflags", - "//cc", - "//cc/animation", - "//cc/mojo_embedder", - "//cc/paint", -+ "//chrome/common:buildflags", - "//components/attribution_reporting:mojom", - "//components/back_forward_cache:enum", - "//components/browsing_topics/common:common", -@@ -91,6 +94,7 @@ source_set("browser") { - "//components/offline_pages/buildflags", - "//components/offline_pages/core/request_header", - "//components/os_crypt/sync", -+ "//components/paint_preview/buildflags:buildflags", - "//components/payments/content/icon", - "//components/payments/mojom", - "//components/power_monitor", -@@ -103,8 +107,10 @@ source_set("browser") { - "//components/services/storage/public/cpp", - "//components/services/storage/public/mojom", - "//components/sqlite_proto", -+ "//components/supervised_user/core/common:buildflags", - "//components/system_media_controls", - "//components/tracing:startup_tracing", -+ "//components/translate/content/common", - "//components/ui_devtools", - "//components/ukm", - "//components/ukm/debug:util", -@@ -2472,6 +2478,13 @@ source_set("browser") { - if (allow_oop_video_decoder) { - sources += [ "media/stable_video_decoder_factory.cc" ] +@@ -2408,6 +2408,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] -+ } -+ + } + + if (is_bsd) { + sources -= [ + "sandbox_ipc_linux.cc", + "sandbox_ipc_linux.h", + ] - } - ++ } ++ if (is_chromeos) { + sources += [ + "handwriting/handwriting_recognition_service_impl_cros.cc", diff --git a/www/iridium/files/patch-content_browser_audio_audio__service.cc b/www/iridium/files/patch-content_browser_audio_audio__service.cc index 8d5c3e894acf..b8a6b37f7aef 100644 --- a/www/iridium/files/patch-content_browser_audio_audio__service.cc +++ b/www/iridium/files/patch-content_browser_audio_audio__service.cc @@ -1,6 +1,6 @@ ---- content/browser/audio/audio_service.cc.orig 2023-04-22 17:45:15 UTC +--- content/browser/audio/audio_service.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/audio/audio_service.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS) #include "ui/display/util/edid_parser.h" @@ -9,7 +9,7 @@ #include "ui/display/display_util.h" #endif // BUILDFLAG(IS_LINUX) -@@ -225,7 +225,7 @@ audio::mojom::AudioService& GetAudioService() { +@@ -200,7 +200,7 @@ audio::mojom::AudioService& GetAudioService() { ->PostTaskAndReplyWithResult( FROM_HERE, base::BindOnce(&ScanEdidBitstreams), base::BindOnce(&LaunchAudioService, std::move(receiver))); diff --git a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc index 07aab42ed05d..f09160a41d33 100644 --- a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,15 +1,15 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -321,6 +321,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo - switches::kDisableBestEffortTasks, - switches::kDisableLogging, - switches::kEnableLogging, +@@ -330,6 +330,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo + switches::kMojoCoreLibraryPath, + switches::kPerfettoDisableInterning, + switches::kTraceToConsole, + switches::kDisableUnveil, + switches::kTrk, - switches::kIPCConnectionTimeout, - switches::kLogBestEffortTasks, - switches::kLogFile, -@@ -630,7 +632,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() + }; + cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); + +@@ -658,7 +660,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h index ee77cd8a66d5..11c0df4d0c7f 100644 --- a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h +++ b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.h.orig 2024-02-04 14:46:08 UTC +--- content/browser/browser_child_process_host_impl.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/browser_child_process_host_impl.h -@@ -33,7 +33,7 @@ +@@ -35,7 +35,7 @@ #include "base/win/object_watcher.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -261,7 +261,7 @@ class BrowserChildProcessHostImpl +@@ -273,7 +273,7 @@ class BrowserChildProcessHostImpl std::unique_ptr<tracing::SystemTracingService> system_tracing_service_; #endif diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc index 3d081a68d4c4..30d856a79f6a 100644 --- a/www/iridium/files/patch-content_browser_browser__main__loop.cc +++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/browser_main_loop.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/browser_main_loop.cc -@@ -247,6 +247,12 @@ +@@ -249,6 +249,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 -@@ -552,6 +558,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -554,6 +560,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,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -589,7 +601,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -591,7 +603,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper.h b/www/iridium/files/patch-content_browser_child__process__launcher__helper.h index bf46c747d233..0c1806259dac 100644 --- a/www/iridium/files/patch-content_browser_child__process__launcher__helper.h +++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper.h @@ -1,11 +1,11 @@ ---- content/browser/child_process_launcher_helper.h.orig 2023-11-22 14:00:11 UTC +--- content/browser/child_process_launcher_helper.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/child_process_launcher_helper.h -@@ -262,7 +262,7 @@ class ChildProcessLauncherHelper - std::unique_ptr<SandboxedProcessLauncherDelegate> delegate_; - base::WeakPtr<ChildProcessLauncher> child_process_launcher_; +@@ -297,7 +297,7 @@ class ChildProcessLauncherHelper + std::optional<base::ProcessId> process_id_ = std::nullopt; + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The priority of the process. The state is stored to avoid changing the // setting repeatedly. - absl::optional<base::Process::Priority> priority_; + std::optional<base::Process::Priority> priority_; diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 7359e1866878..465a908c6652 100644 --- a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2023-11-22 14:00:11 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/child_process_launcher_helper_linux.cc -@@ -21,7 +21,9 @@ +@@ -22,7 +22,9 @@ #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "content/public/common/zygote/sandbox_support_linux.h" @@ -10,7 +10,7 @@ #include "sandbox/policy/linux/sandbox_linux.h" namespace content { -@@ -46,14 +48,20 @@ ChildProcessLauncherHelper::GetFilesToMap() { +@@ -47,14 +49,20 @@ ChildProcessLauncherHelper::GetFilesToMap() { } bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { @@ -31,7 +31,7 @@ // Convert FD mapping to FileHandleMappingVector options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); -@@ -65,7 +73,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche +@@ -66,7 +74,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche options->environment = delegate_->GetEnvironment(); } else { @@ -41,15 +41,15 @@ // Environment variables could be supported in the future, but are not // currently supported when launching with the zygote. DCHECK(delegate_->GetEnvironment().empty()); -@@ -82,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -83,6 +93,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; Process process; +#if !BUILDFLAG(IS_BSD) ZygoteCommunication* zygote_handle = GetZygoteForLaunch(); if (zygote_handle) { - // TODO(crbug.com/569191): If chrome supported multiple zygotes they could -@@ -92,7 +103,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr + // TODO(crbug.com/40448989): If chrome supported multiple zygotes they could +@@ -93,7 +104,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -57,7 +57,7 @@ if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; -@@ -101,15 +111,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -102,15 +112,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr oom_score = content::kLowestRendererOomScore; ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score); } @@ -75,8 +75,8 @@ +#endif #if BUILDFLAG(IS_CHROMEOS) - if (GetProcessType() == switches::kRendererProcess) { -@@ -131,10 +143,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper + process_id_ = process.process.Pid(); +@@ -134,10 +146,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -91,7 +91,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -160,13 +176,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -163,13 +179,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. @@ -109,7 +109,7 @@ } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( -@@ -179,11 +199,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL +@@ -182,11 +202,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL } } diff --git a/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc b/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc index 34dcdb0969e9..7b62f69d3f63 100644 --- a/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc +++ b/www/iridium/files/patch-content_browser_child__thread__type__switcher__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_thread_type_switcher_linux.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/child_thread_type_switcher_linux.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/child_thread_type_switcher_linux.cc @@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::ThreadType thread_type) { @@ -10,7 +10,7 @@ bool ns_pid_supported = false; pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid, &ns_pid_supported); if (peer_tid == -1) { -@@ -37,6 +40,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee +@@ -38,6 +41,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type, base::IsViaIPC(true)); diff --git a/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc new file mode 100644 index 000000000000..264e8a9d62d6 --- /dev/null +++ b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -0,0 +1,11 @@ +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2024-06-25 12:08:48 UTC ++++ content/browser/compositor/viz_process_transport_factory.cc +@@ -105,7 +105,7 @@ class HostDisplayClient : public viz::HostDisplayClien + HostDisplayClient& operator=(const HostDisplayClient&) = delete; + + // viz::HostDisplayClient: +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override { + compositor_->OnCompleteSwapWithNewSize(size); + } diff --git a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h index 390f07543c26..aec9aa5d8085 100644 --- a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h +++ b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/devtools/devtools_frontend_host_impl.h.orig 2023-11-22 14:00:11 UTC +--- content/browser/devtools/devtools_frontend_host_impl.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/devtools/devtools_frontend_host_impl.h -@@ -33,7 +33,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte +@@ -34,7 +34,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte void BadMessageReceived() override; diff --git a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 94a70656f0b5..5d8438f4bed3 100644 --- a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -51,7 +51,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. diff --git a/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc index a41548a9d262..12a2b819471d 100644 --- a/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc +++ b/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc @@ -1,11 +1,11 @@ ---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2023-11-22 14:00:11 UTC +--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc -@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( - base::FilePathWatcher::WatchOptions watch_options { - .type = scope().IsRecursive() ? base::FilePathWatcher::Type::kRecursive - : base::FilePathWatcher::Type::kNonRecursive, +@@ -64,7 +64,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( + .type = scope().IsRecursive() + ? base::FilePathWatcher::Type::kRecursive + : base::FilePathWatcher::Type::kNonRecursive, -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Note: `report_modified_path` is also present on Android - // and Fuchsia. Update this switch if support for watching - // the local file system is added on those platforms. + // Note: `report_modified_path` is also present on Android + // and Fuchsia. Update this switch if support for watching + // the local file system is added on those platforms. diff --git a/www/iridium/files/patch-content_browser_generic__sensor_frame__sensor__provider__proxy.cc b/www/iridium/files/patch-content_browser_generic__sensor_frame__sensor__provider__proxy.cc deleted file mode 100644 index ca4675f6ff8c..000000000000 --- a/www/iridium/files/patch-content_browser_generic__sensor_frame__sensor__provider__proxy.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- content/browser/generic_sensor/frame_sensor_provider_proxy.cc.orig 2024-02-04 14:46:08 UTC -+++ content/browser/generic_sensor/frame_sensor_provider_proxy.cc -@@ -20,7 +20,11 @@ namespace content { - - namespace { - -+#if (_LIBCPP_VERSION >= 160000) - constexpr std::vector<blink::mojom::PermissionsPolicyFeature> -+#else -+std::vector<blink::mojom::PermissionsPolicyFeature> -+#endif - SensorTypeToPermissionsPolicyFeatures(SensorType type) { - switch (type) { - case SensorType::AMBIENT_LIGHT: diff --git a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc index ea75e04d2199..2ea325d5622a 100644 --- a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,20 +1,20 @@ ---- content/browser/gpu/compositor_util.cc.orig 2023-01-17 19:19:00 UTC +--- content/browser/gpu/compositor_util.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/gpu/compositor_util.cc -@@ -148,7 +148,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_decode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), +@@ -149,7 +149,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( + "video_decode", + SafeGetFeatureStatus( + gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || + !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) - command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), -@@ -159,7 +159,7 @@ const GpuFeatureData GetGpuFeatureData( - {"video_encode", - SafeGetFeatureStatus(gpu_feature_info, - gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), + command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), +@@ -161,7 +161,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( + "video_encode", + SafeGetFeatureStatus( + gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux), + !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux)), #else - command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode), + command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode)), diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc index a895e3b847a5..74c0a6610e71 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.cc.orig 2023-07-24 14:27:53 UTC +--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/gpu/gpu_data_manager_impl.cc -@@ -405,7 +405,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -397,7 +397,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h index 4179216277ac..8288ff33c6d6 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2023-07-24 14:27:53 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -221,7 +221,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -219,7 +219,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 84fedf4232a4..093624ea2f14 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-11-22 14:00:11 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1783,7 +1783,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index 5e00c2e0bec3..78cdc27043a4 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2023-10-21 11:51:27 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -151,7 +151,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -150,7 +150,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -306,7 +306,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -302,7 +302,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc index 4a75da317f74..a544112fe0be 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2023-07-24 14:27:53 UTC +--- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc -@@ -53,7 +53,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun +@@ -54,7 +54,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun #endif } @@ -9,10 +9,10 @@ bool IsGpuMemoryBufferNV12Supported() { static bool is_computed = false; static bool supported = false; -@@ -116,7 +116,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp +@@ -117,7 +117,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp SetNativeConfigurations(std::move(configs)); } - #endif + #endif // BUILDFLAG(IS_OZONE_X11) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Dynamic check whether the NV12 format is supported as it may be diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc index 598a58db20df..1f5bbde7fc7f 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,16 +1,16 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = { - switches::kEnableGpuRasterization, - switches::kEnableSkiaGraphite, - switches::kEnableLogging, +@@ -268,6 +268,7 @@ static const char* const kSwitchNames[] = { + switches::kEnableLowEndDeviceMode, + switches::kDisableSkiaGraphite, + switches::kDisableLowEndDeviceMode, + switches::kDisableUnveil, - switches::kDoubleBufferCompositing, - switches::kHeadless, - switches::kLoggingLevel, -@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = { + switches::kProfilingAtStart, + switches::kProfilingFile, + switches::kProfilingFlush, +@@ -295,7 +296,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, - switches::kDisableBufferBWCompression, + switches::kEnableNativeGpuMemoryBuffers, #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc b/www/iridium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc deleted file mode 100644 index c6f7265c36dc..000000000000 --- a/www/iridium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- content/browser/interest_group/header_direct_from_seller_signals.cc.orig 2023-11-22 14:00:11 UTC -+++ content/browser/interest_group/header_direct_from_seller_signals.cc -@@ -206,7 +206,11 @@ void OnJsonDecoded( - - } // namespace - -+#if defined(__clang__) && (__clang_major__ >= 16) - HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() = default; -+#else -+HeaderDirectFromSellerSignals::HeaderDirectFromSellerSignals() {} -+#endif - - HeaderDirectFromSellerSignals::~HeaderDirectFromSellerSignals() = default; - diff --git a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h index dec41f556f78..c64c1c4eebbb 100644 --- a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h +++ b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h @@ -1,4 +1,4 @@ ---- content/browser/media/frameless_media_interface_proxy.h.orig 2022-12-01 10:35:46 UTC +--- content/browser/media/frameless_media_interface_proxy.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/media/frameless_media_interface_proxy.h @@ -19,7 +19,7 @@ #include "mojo/public/cpp/bindings/receiver_set.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -100,7 +100,7 @@ class FramelessMediaInterfaceProxy final +@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final // Connections to the renderer. mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_; diff --git a/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc index 3c1dbbc00431..74a8743a6b4c 100644 --- a/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc -@@ -252,7 +252,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. +@@ -334,7 +334,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe + } + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - system_media_controls_ = system_media_controls::SystemMediaControls::Create( - media::AudioManager::GetGlobalAppName()); - #endif + // Create SystemMediaControls with the SingletonHwnd. + browser_system_media_controls_ = + system_media_controls::SystemMediaControls::Create( diff --git a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc index 11856147fa2e..83cc2c34b6eb 100644 --- a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/network_service_instance_impl.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/network_service_instance_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/network_service_instance_impl.cc -@@ -80,7 +80,7 @@ +@@ -82,7 +82,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -357,7 +357,7 @@ void CreateInProcessNetworkService( +@@ -360,7 +360,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -426,7 +426,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -429,7 +429,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index d5dd3610feed..bbd63f46297a 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -312,7 +312,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -318,7 +318,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc index 64401981d5ba..30b3627eee5e 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc @@ -25,7 +25,7 @@ #include "media/base/media_switches.h" @@ -9,7 +9,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif -@@ -172,7 +172,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs +@@ -173,7 +173,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs } #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { diff --git a/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index ac1343d8e809..8af4acb05e47 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -455,7 +455,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -462,7 +462,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -9,7 +9,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -489,7 +489,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -496,7 +496,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 042ca2265510..d815aa51d800 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -222,7 +222,7 @@ +@@ -223,7 +223,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -952,7 +952,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -964,7 +964,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,16 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1159,7 +1159,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1150,7 +1150,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public + IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete; + + void SetPid(base::ProcessId child_pid) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + child_thread_type_switcher_.SetPid(child_pid); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + } +@@ -1167,7 +1167,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +36,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1253,7 +1253,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1261,7 +1261,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -36,7 +45,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -3330,7 +3330,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3379,7 +3379,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -45,12 +54,12 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3390,6 +3390,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3437,6 +3437,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, + switches::kTrk, - switches::kDisableUseSharedImagesForPepperVideo, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, + switches::kDisableWebGLImageChromium, diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 6b2e3ac1dd6a..bec23a3a67ae 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2024-02-04 14:46:08 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -540,7 +540,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -599,7 +599,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 10992125127b..f7f76ad30964 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -121,7 +121,7 @@ +@@ -120,7 +120,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -463,7 +463,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -469,7 +469,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,8 +18,8 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1724,7 +1724,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { - return GetTextInputManager() && GetTextInputManager()->should_do_learning(); +@@ -1730,7 +1730,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { + return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2562,7 +2562,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2561,7 +2561,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 3a16fd00902a..a9c94fe8dbd3 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-10-21 11:51:27 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -257,7 +257,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -259,7 +259,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index e58090d81bb3..d34f540e35b7 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2023-07-24 14:27:53 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -597,7 +597,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 30393113c50e..4c038a5c0f55 100644 --- a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2023-08-28 20:17:35 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -340,7 +340,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -339,7 +339,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. diff --git a/www/iridium/files/patch-content_browser_utility__process__host.cc b/www/iridium/files/patch-content_browser_utility__process__host.cc index 0ddbb6187aad..84cab8021cf8 100644 --- a/www/iridium/files/patch-content_browser_utility__process__host.cc +++ b/www/iridium/files/patch-content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/utility_process_host.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/utility_process_host.cc -@@ -60,7 +60,7 @@ +@@ -61,7 +61,7 @@ #include "content/browser/v8_snapshot_files.h" #endif @@ -9,16 +9,16 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -70,7 +70,7 @@ - #include "media/capture/capture_switches.h" +@@ -74,7 +74,7 @@ + #include "services/network/public/mojom/network_service.mojom.h" #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "base/task/sequenced_task_runner.h" #include "components/viz/host/gpu_client.h" #include "media/capture/capture_switches.h" -@@ -81,7 +81,7 @@ namespace content { +@@ -85,7 +85,7 @@ namespace content { namespace { @@ -27,17 +27,36 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -130,7 +130,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr +@@ -150,7 +150,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr started_(false), name_(u"utility process"), file_data_(std::make_unique<ChildProcessLauncherFileData>()), --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + allowed_gpu_(false), gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif - client_(std::move(client)) { -@@ -417,7 +417,7 @@ bool UtilityProcessHost::StartProcess() { - file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); +@@ -209,7 +209,7 @@ void UtilityProcessHost::SetPreloadLibraries( + #endif // BUILDFLAG(IS_WIN) + + void UtilityProcessHost::SetAllowGpuClient() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + allowed_gpu_ = true; + #endif + } +@@ -349,6 +349,9 @@ bool UtilityProcessHost::StartProcess() { + switches::kFailAudioStreamCreation, + switches::kMuteAudio, + switches::kUseFileForFakeAudioCapture, ++#if BUILDFLAG(IS_BSD) ++ switches::kAudioBackend, ++#endif + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \ + BUILDFLAG(IS_SOLARIS) + switches::kAlsaInputDevice, +@@ -409,7 +412,7 @@ bool UtilityProcessHost::StartProcess() { + file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -45,12 +64,19 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -428,7 +428,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -420,13 +423,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only + // when the video capture use GPU memory buffer enabled. + if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { + bool pass_gpu_buffer_flag = + switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only - // when the video capture use GPU memory buffer enabled and NV12 GPU memory - // buffer supported. + // Check if NV12 GPU memory buffer supported at the same time. + pass_gpu_buffer_flag = + pass_gpu_buffer_flag && diff --git a/www/iridium/files/patch-content_browser_utility__process__host.h b/www/iridium/files/patch-content_browser_utility__process__host.h index 3c986baf3081..eb6fef5f4236 100644 --- a/www/iridium/files/patch-content_browser_utility__process__host.h +++ b/www/iridium/files/patch-content_browser_utility__process__host.h @@ -1,20 +1,20 @@ ---- content/browser/utility_process_host.h.orig 2023-10-21 11:51:27 UTC +--- content/browser/utility_process_host.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/utility_process_host.h -@@ -39,7 +39,7 @@ namespace base { +@@ -33,7 +33,7 @@ namespace base { class Thread; } // namespace base --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) namespace viz { class GpuClient; } // namespace viz -@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost - std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_; - #endif +@@ -200,7 +200,7 @@ class CONTENT_EXPORT UtilityProcessHost + }; + LaunchState launch_state_ = LaunchState::kLaunchInProgress; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + bool allowed_gpu_; std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_; #endif - diff --git a/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc index 98439dc90143..44b049c75294 100644 --- a/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/utility_process_host_receiver_bindings.cc @@ -10,12 +10,12 @@ #include "content/public/browser/content_browser_client.h" @@ -10,8 +10,8 @@ #include "content/browser/font_service.h" // nogncheck #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "components/viz/host/gpu_client.h" #include "content/public/browser/gpu_client.h" #endif @@ -26,8 +26,8 @@ return; } #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) { - gpu_client_ = - content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing()); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + if (allowed_gpu_) { + // TODO(crbug.com/328099369) Remove once all clients get this directly. + if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) { diff --git a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc index f2f47d4ec490..1a1a34c88497 100644 --- a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,11 +1,7 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate:: - #if BUILDFLAG(ENABLE_PPAPI) - sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || - #endif --#if BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +@@ -67,10 +67,10 @@ UtilitySandboxedProcessLauncherDelegate:: + #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -17,10 +13,10 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -125,10 +125,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe - // unsandboxed zygote and then apply their actual sandboxes in the forked +@@ -126,10 +126,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || + sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || diff --git a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc index 8a735f565b66..4a6b7e2665df 100644 --- a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,8 +1,8 @@ ---- content/browser/v8_snapshot_files.cc.orig 2023-03-13 07:33:08 UTC +--- content/browser/v8_snapshot_files.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/v8_snapshot_files.cc -@@ -13,7 +13,7 @@ namespace content { +@@ -17,7 +17,7 @@ namespace content { std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> - GetV8SnapshotFilesToPreload() { + GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) { std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index d7eb2d6574bf..699b2c01b476 100644 --- a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-02-04 14:46:08 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -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. -@@ -1319,7 +1319,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1333,7 +1333,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/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc index e85022690e8c..3e8682cf3432 100644 --- a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc +++ b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc @@ -1,4 +1,4 @@ ---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-07-24 14:27:53 UTC +--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/webui/web_ui_main_frame_observer.cc @@ -13,7 +13,7 @@ #include "content/public/browser/navigation_handle.h" @@ -29,7 +29,7 @@ blink::mojom::ConsoleMessageLevel log_level, @@ -167,7 +167,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( - // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL + // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h index 7d6f6695ec2f..ba6013af379a 100644 --- a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h +++ b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h @@ -1,8 +1,8 @@ ---- content/browser/webui/web_ui_main_frame_observer.h.orig 2022-10-05 07:34:01 UTC +--- content/browser/webui/web_ui_main_frame_observer.h.orig 2024-06-25 12:08:48 UTC +++ content/browser/webui/web_ui_main_frame_observer.h @@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W - // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL + // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index c3a1a56046f0..08719f607c02 100644 --- a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-12-06 08:09:13 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-06-25 12:08:48 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -19,8 +19,10 @@ +@@ -18,8 +18,10 @@ #include "build/chromeos_buildflags.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" @@ -11,7 +11,7 @@ #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" -@@ -38,6 +40,7 @@ namespace content { +@@ -37,6 +39,7 @@ namespace content { namespace { @@ -19,7 +19,7 @@ // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, -@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd, +@@ -58,6 +61,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -27,7 +27,7 @@ } // namespace -@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() { +@@ -67,9 +71,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -41,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -83,6 +91,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -82,6 +90,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -49,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -133,6 +142,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -132,6 +141,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -57,13 +57,13 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -157,6 +167,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -156,6 +166,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { +#if !BUILDFLAG(IS_BSD) int fds[2]; - CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); + CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); @@ -224,9 +235,12 @@ pid_t ZygoteHostImpl::LaunchZygote( diff --git a/www/iridium/files/patch-content_child_BUILD.gn b/www/iridium/files/patch-content_child_BUILD.gn index 61ca1d0573f2..ddaefaece19a 100644 --- a/www/iridium/files/patch-content_child_BUILD.gn +++ b/www/iridium/files/patch-content_child_BUILD.gn @@ -1,6 +1,6 @@ ---- content/child/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- content/child/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ content/child/BUILD.gn -@@ -128,6 +128,13 @@ target(link_target_type, "child") { +@@ -130,6 +130,13 @@ target(link_target_type, "child") { ] } diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn index c0e29c96187b..ff4d78be5f11 100644 --- a/www/iridium/files/patch-content_common_BUILD.gn +++ b/www/iridium/files/patch-content_common_BUILD.gn @@ -1,12 +1,36 @@ ---- content/common/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- content/common/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ content/common/BUILD.gn -@@ -438,6 +438,9 @@ if (is_linux || is_chromeos) { - public = [ "set_process_title_linux.h" ] - sources = [ "set_process_title_linux.cc" ] - deps = [ "//base" ] -+ if (is_bsd) { -+ sources -= [ "set_process_title_linux.cc" ] -+ } +@@ -448,19 +448,28 @@ source_set("common") { } - } + if (is_linux || is_chromeos) { +- sources += [ +- "gpu_pre_sandbox_hook_linux.cc", +- "gpu_pre_sandbox_hook_linux.h", +- ] ++ if (is_bsd) { ++ sources += [ ++ "gpu_pre_sandbox_hook_bsd.cc", ++ "gpu_pre_sandbox_hook_bsd.h", ++ ] ++ } else { ++ sources += [ ++ "gpu_pre_sandbox_hook_linux.cc", ++ "gpu_pre_sandbox_hook_linux.h", ++ ] ++ } + public_deps += [ "//sandbox/policy" ] + deps += [ + ":sandbox_support_linux", + "//media/gpu:buildflags", + "//sandbox/linux:sandbox_services", +- "//sandbox/linux:seccomp_bpf", + "//sandbox/policy:chromecast_sandbox_allowlist_buildflags", + "//third_party/fontconfig", + ] ++ if (use_seccomp_bpf) { ++ deps += [ "//sandbox/linux:seccomp_bpf" ] ++ } + if (use_v4l2_codec) { + deps += [ "//media/gpu/v4l2" ] + } diff --git a/www/iridium/files/patch-content_common_features.cc b/www/iridium/files/patch-content_common_features.cc index 933fc94e0c74..87bcfa89add2 100644 --- a/www/iridium/files/patch-content_common_features.cc +++ b/www/iridium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2024-02-04 14:46:08 UTC +--- content/common/features.cc.orig 2024-06-25 12:08:48 UTC +++ content/common/features.cc -@@ -154,7 +154,7 @@ BASE_FEATURE(kEnableBackForwardCacheForScreenReader, +@@ -164,7 +164,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_ENABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -246,7 +246,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -253,7 +253,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for children which have sandbox // restrictions. diff --git a/www/iridium/files/patch-content_common_features.h b/www/iridium/files/patch-content_common_features.h index 054af190bcdc..f5e332274853 100644 --- a/www/iridium/files/patch-content_common_features.h +++ b/www/iridium/files/patch-content_common_features.h @@ -1,15 +1,15 @@ ---- content/common/features.h.orig 2024-02-04 14:46:08 UTC +--- content/common/features.h.orig 2024-06-25 12:08:48 UTC +++ content/common/features.h -@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDeviceMonitorMac) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnumerateDevicesHideDeviceIDs); +@@ -36,7 +36,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); + CONTENT_EXPORT BASE_DECLARE_FEATURE( + kEnableBackForwardCacheForOngoingSubframeNavigation); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI); -@@ -58,7 +58,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kForwardMemoryPres + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); +@@ -59,7 +59,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); #endif CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleChildThreadTypeChangesInBrowser); #endif - CONTENT_EXPORT BASE_DECLARE_FEATURE(kHighPriorityBeforeUnload); + #if BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-content_common_font__list__unittest.cc b/www/iridium/files/patch-content_common_font__list__unittest.cc index e22751425254..e29e03beb25e 100644 --- a/www/iridium/files/patch-content_common_font__list__unittest.cc +++ b/www/iridium/files/patch-content_common_font__list__unittest.cc @@ -1,6 +1,6 @@ ---- content/common/font_list_unittest.cc.orig 2023-03-13 07:33:08 UTC +--- content/common/font_list_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ content/common/font_list_unittest.cc -@@ -47,7 +47,7 @@ TEST(FontList, GetFontList) { +@@ -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")); diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.cc b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc index 380d61491a4e..7857ccbaa44d 100644 --- a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.cc +++ b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.cc @@ -1,11 +1,11 @@ ---- content/gpu/gpu_sandbox_hook_bsd.cc.orig 2023-07-24 14:27:53 UTC -+++ content/gpu/gpu_sandbox_hook_bsd.cc -@@ -0,0 +1,69 @@ +--- content/common/gpu_pre_sandbox_hook_bsd.cc.orig 2024-06-25 12:08:48 UTC ++++ content/common/gpu_pre_sandbox_hook_bsd.cc +@@ -0,0 +1,68 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + -+#include "content/gpu/gpu_sandbox_hook_bsd.h" ++#include "content/common/gpu_pre_sandbox_hook_bsd.h" + +#include <dlfcn.h> +#include <errno.h> @@ -27,7 +27,6 @@ +#include "build/build_config.h" +#include "build/buildflag.h" +#include "build/chromeos_buildflags.h" -+#include "content/common/set_process_title.h" +#include "content/public/common/content_switches.h" +#include "media/gpu/buildflags.h" + @@ -59,7 +58,7 @@ + +} // namespace + -+bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { ++bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { + if (!LoadLibrariesForGpu(options)) + return false; + diff --git a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.h b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.h new file mode 100644 index 000000000000..4bab3a4eb258 --- /dev/null +++ b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__bsd.h @@ -0,0 +1,23 @@ +--- content/common/gpu_pre_sandbox_hook_bsd.h.orig 2024-06-25 12:08:48 UTC ++++ content/common/gpu_pre_sandbox_hook_bsd.h +@@ -0,0 +1,20 @@ ++// Copyright 2017 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_ ++#define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_ ++ ++#include "base/component_export.h" ++#include "sandbox/policy/sandbox.h" ++ ++namespace content { ++ ++// A pre-sandbox hook to use on Linux-based systems in sandboxed processes that ++// require general GPU usage. ++COMPONENT_EXPORT(GPU_PRE_SANDBOX_HOOK) ++bool GpuPreSandboxHook(sandbox::policy::SandboxLinux::Options options); ++ ++} // namespace content ++ ++#endif // CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_BSD_H_ diff --git a/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h new file mode 100644 index 000000000000..458336ec9594 --- /dev/null +++ b/www/iridium/files/patch-content_common_gpu__pre__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- content/common/gpu_pre_sandbox_hook_linux.h.orig 2024-06-25 12:08:48 UTC ++++ content/common/gpu_pre_sandbox_hook_linux.h +@@ -5,8 +5,13 @@ + #ifndef CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_ + #define CONTENT_COMMON_GPU_PRE_SANDBOX_HOOK_LINUX_H_ + ++#include "build/build_config.h" + #include "base/component_export.h" ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace content { + diff --git a/www/iridium/files/patch-content_common_mojo__core__library__support.cc b/www/iridium/files/patch-content_common_mojo__core__library__support.cc index a4c5bd9e631e..4411baf06427 100644 --- a/www/iridium/files/patch-content_common_mojo__core__library__support.cc +++ b/www/iridium/files/patch-content_common_mojo__core__library__support.cc @@ -1,9 +1,9 @@ ---- content/common/mojo_core_library_support.cc.orig 2022-03-28 18:11:04 UTC +--- content/common/mojo_core_library_support.cc.orig 2024-06-25 12:08:48 UTC +++ content/common/mojo_core_library_support.cc @@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() { } - absl::optional<base::FilePath> GetMojoCoreSharedLibraryPath() { + std::optional<base::FilePath> GetMojoCoreSharedLibraryPath() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const base::CommandLine& command_line = diff --git a/www/iridium/files/patch-content_gpu_BUILD.gn b/www/iridium/files/patch-content_gpu_BUILD.gn deleted file mode 100644 index 72f3919d7b7a..000000000000 --- a/www/iridium/files/patch-content_gpu_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- content/gpu/BUILD.gn.orig 2023-07-24 14:27:53 UTC -+++ content/gpu/BUILD.gn -@@ -104,6 +104,17 @@ target(link_target_type, "gpu_sources") { - } - } - -+ if (is_bsd) { -+ sources -= [ -+ "gpu_sandbox_hook_linux.cc", -+ "gpu_sandbox_hook_linux.h", -+ ] -+ sources += [ -+ "gpu_sandbox_hook_bsd.cc", -+ "gpu_sandbox_hook_bsd.h", -+ ] -+ } -+ - if (is_chromeos_ash) { - deps += [ - "//components/services/font/public/cpp", diff --git a/www/iridium/files/patch-content_gpu_gpu__child__thread.cc b/www/iridium/files/patch-content_gpu_gpu__child__thread.cc index 404ba05aa662..7265beb20d3e 100644 --- a/www/iridium/files/patch-content_gpu_gpu__child__thread.cc +++ b/www/iridium/files/patch-content_gpu_gpu__child__thread.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_child_thread.cc.orig 2024-02-04 14:46:08 UTC +--- content/gpu/gpu_child_thread.cc.orig 2024-06-25 12:08:48 UTC +++ content/gpu/gpu_child_thread.cc -@@ -59,7 +59,7 @@ +@@ -58,7 +58,7 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #endif @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -143,7 +143,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce +@@ -142,7 +142,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce viz_main_.gpu_service()->set_start_time(process_start_time); diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc index 29aa960e7d35..6ac0827c22da 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,15 +1,22 @@ ---- content/gpu/gpu_main.cc.orig 2024-02-04 14:46:08 UTC +--- content/gpu/gpu_main.cc.orig 2024-06-25 12:08:48 UTC +++ content/gpu/gpu_main.cc -@@ -91,7 +91,7 @@ +@@ -94,10 +94,14 @@ #include "sandbox/win/src/sandbox.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/sandboxed_process_thread_type_handler.h" - #include "content/gpu/gpu_sandbox_hook_linux.h" + #include "content/common/gpu_pre_sandbox_hook_linux.h" ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else #include "sandbox/policy/linux/sandbox_linux.h" -@@ -114,7 +114,7 @@ namespace content { ++#endif + #include "sandbox/policy/sandbox_type.h" + #endif + +@@ -117,7 +121,7 @@ namespace content { namespace { @@ -18,7 +25,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -179,7 +179,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -182,7 +186,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -289,7 +289,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -291,7 +295,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,17 +43,17 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -328,7 +328,8 @@ int GpuMain(MainFunctionParams parameters) { - // before it. - InitializeSkia(); +@@ -313,7 +317,8 @@ int GpuMain(MainFunctionParams parameters) { + + base::PlatformThread::SetName("CrGpuMain"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +// XXX BSD +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) // Thread type delegate of the process should be registered before - // first thread type change in ChildProcess constructor. - // It also needs to be registered before the process has multiple threads, -@@ -436,7 +437,7 @@ int GpuMain(MainFunctionParams parameters) { + // thread type change below for the main thread and for thread pool in + // ChildProcess constructor. +@@ -443,7 +448,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -55,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -476,7 +477,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -483,7 +488,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.h b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.h deleted file mode 100644 index e6fcc5563920..000000000000 --- a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.h +++ /dev/null @@ -1,19 +0,0 @@ ---- content/gpu/gpu_sandbox_hook_bsd.h.orig 2023-07-24 14:27:53 UTC -+++ content/gpu/gpu_sandbox_hook_bsd.h -@@ -0,0 +1,16 @@ -+// Copyright 2023 The Chromium Authors -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_ -+#define CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_ -+ -+#include "sandbox/policy/sandbox.h" -+ -+namespace content { -+ -+bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options); -+ -+} // namespace content -+ -+#endif // CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_ diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc index 99fa9507db17..c81a36d1a60f 100644 --- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2023-07-24 14:27:53 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,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" #include "mojo/public/cpp/bindings/pending_remote.h" #endif -@@ -35,7 +35,7 @@ typedef struct CGFont* CGFontRef; +@@ -36,7 +36,7 @@ typedef struct CGFont* CGFontRef; namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; ChildThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -54,7 +54,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { +@@ -55,7 +55,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { void PpapiBlinkPlatformImpl::Shutdown() {} blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index 4fe687212480..4d8fe9d4dfcf 100644 --- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2023-07-24 14:27:53 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2024-06-25 12:08:48 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h -@@ -33,7 +33,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp +@@ -34,7 +34,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp blink::WebString DefaultLocale() override; private: diff --git a/www/iridium/files/patch-content_public_browser_content__browser__client.cc b/www/iridium/files/patch-content_public_browser_content__browser__client.cc index 7c9f269af4fd..1a79c3b8ff4f 100644 --- a/www/iridium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/iridium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2024-02-04 14:46:08 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-06-25 12:08:48 UTC +++ content/public/browser/content_browser_client.cc -@@ -1273,7 +1273,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1303,7 +1303,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/www/iridium/files/patch-content_public_browser_service__process__host.cc b/www/iridium/files/patch-content_public_browser_service__process__host.cc new file mode 100644 index 000000000000..a73a723df136 --- /dev/null +++ b/www/iridium/files/patch-content_public_browser_service__process__host.cc @@ -0,0 +1,11 @@ +--- content/public/browser/service_process_host.cc.orig 2024-06-25 12:08:48 UTC ++++ content/public/browser/service_process_host.cc +@@ -70,7 +70,7 @@ ServiceProcessHost::Options::WithPreloadedLibraries( + + ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient( + base::PassKey<ServiceProcessHostGpuClient> passkey) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + allow_gpu_client = true; + #endif + return *this; diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index f621b004dc58..aba4fca69507 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,33 +1,27 @@ ---- content/public/common/content_features.cc.orig 2024-02-04 14:46:08 UTC +--- content/public/common/content_features.cc.orig 2024-06-25 12:08:48 UTC +++ content/public/common/content_features.cc -@@ -40,7 +40,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, - "AudioServiceOutOfProcess", - // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being +@@ -29,7 +29,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, + // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - base::FEATURE_ENABLED_BY_DEFAULT - #else -@@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, - // kAudioServiceOutOfProcess feature is enabled. - BASE_FEATURE(kAudioServiceSandbox, - "AudioServiceSandbox", --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1170,7 +1170,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1076,9 +1076,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", - #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC)) && \ -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ - defined(ARCH_CPU_X86_64)) || \ - (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) + #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC)) && \ ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ + defined(ARCH_CPU_X86_64)) || \ +- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \ ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ + defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1212,7 +1212,11 @@ BASE_FEATURE(kWebUICodeCache, + #else +@@ -1115,7 +1115,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/iridium/files/patch-content_public_common_content__switches.cc b/www/iridium/files/patch-content_public_common_content__switches.cc index a4eebb01ce29..8df2216b3204 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.cc +++ b/www/iridium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2024-02-04 14:46:08 UTC +--- content/public/common/content_switches.cc.orig 2024-06-25 12:08:48 UTC +++ content/public/common/content_switches.cc -@@ -364,6 +364,10 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -352,6 +352,10 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -11,9 +11,9 @@ // 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. -@@ -994,7 +998,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -990,7 +994,7 @@ const char kPreventResizingContentsForTesting[] = - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h index 37f574f1442a..1b59ac1ae6c8 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.h +++ b/www/iridium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2024-02-04 14:46:08 UTC +--- content/public/common/content_switches.h.orig 2024-06-25 12:08:48 UTC +++ content/public/common/content_switches.h -@@ -115,6 +115,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -111,6 +111,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -9,9 +9,9 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -265,7 +267,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -268,7 +270,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc b/www/iridium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc new file mode 100644 index 000000000000..f46b1e12c3e8 --- /dev/null +++ b/www/iridium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc @@ -0,0 +1,11 @@ +--- content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc.orig 2024-06-25 12:08:48 UTC ++++ content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc +@@ -47,7 +47,7 @@ bool UseSingleNV12() { + #else + static BASE_FEATURE(kUseSingleNV12ForSoftwareGMB, + "UseSingleNV12ForSoftwareGMB", +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-content_renderer_render__process__impl.cc b/www/iridium/files/patch-content_renderer_render__process__impl.cc deleted file mode 100644 index baec98608973..000000000000 --- a/www/iridium/files/patch-content_renderer_render__process__impl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/renderer/render_process_impl.cc.orig 2024-02-04 14:46:08 UTC -+++ content/renderer/render_process_impl.cc -@@ -47,7 +47,7 @@ - #if BUILDFLAG(IS_WIN) - #include "base/win/win_util.h" - #endif --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - #include "v8/include/v8-wasm-trap-handler-posix.h" - #endif - -@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl() - v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag)); - } - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) - if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - base::CommandLine* const command_line = - base::CommandLine::ForCurrentProcess(); diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc index 1e91da9dec4e..bb1409959853 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2024-02-04 14:46:08 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/renderer/render_thread_impl.cc -@@ -205,6 +205,8 @@ +@@ -206,6 +206,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1020,7 +1022,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1000,7 +1002,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1029,7 +1031,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1009,7 +1011,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1807,7 +1809,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1752,7 +1754,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc index f92aebdf4c88..0538d6966195 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2024-02-04 14:46:08 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -113,7 +113,7 @@ +@@ -115,7 +115,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,10 +9,10 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -182,13 +182,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - sudden_termination_disables_(0), +@@ -185,13 +185,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), - main_thread_scheduler_(main_thread_scheduler) { + main_thread_scheduler_(main_thread_scheduler), + next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) sk_sp<font_service::FontLoader> font_loader; @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -197,7 +197,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -200,7 +200,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -258,7 +258,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -261,7 +261,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h index 148cfbfef70e..e366e26afcdc 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2024-02-04 14:46:08 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-06-25 12:08:48 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -234,7 +234,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -246,7 +246,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index 807575701443..32ef558dcb6e 100644 --- a/www/iridium/files/patch-content_shell_BUILD.gn +++ b/www/iridium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- content/shell/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ content/shell/BUILD.gn -@@ -1026,7 +1026,7 @@ group("content_shell_crash_test") { +@@ -1094,7 +1094,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc index 97404e4ea44d..10e3e6ae3c2c 100644 --- a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -227,7 +227,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -281,7 +281,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/iridium/files/patch-content_shell_renderer_shell__content__renderer__client.cc b/www/iridium/files/patch-content_shell_renderer_shell__content__renderer__client.cc new file mode 100644 index 000000000000..f9a88659124d --- /dev/null +++ b/www/iridium/files/patch-content_shell_renderer_shell__content__renderer__client.cc @@ -0,0 +1,11 @@ +--- content/shell/renderer/shell_content_renderer_client.cc.orig 2024-06-25 12:08:48 UTC ++++ content/shell/renderer/shell_content_renderer_client.cc +@@ -54,7 +54,7 @@ + #include "media/base/media_switches.h" + #endif + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64)) + #define ENABLE_WEB_ASSEMBLY_TRAP_HANDLER_LINUX + #include "base/debug/stack_trace.h" diff --git a/www/iridium/files/patch-content_test_BUILD.gn b/www/iridium/files/patch-content_test_BUILD.gn deleted file mode 100644 index 801335317a33..000000000000 --- a/www/iridium/files/patch-content_test_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- content/test/BUILD.gn.orig 2024-02-04 14:46:08 UTC -+++ content/test/BUILD.gn -@@ -2269,7 +2269,7 @@ static_library("run_all_unittests") { - ":test_support", - "//base/test:test_support", - ] -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - deps += [ "//content/common:set_process_title_linux" ] - } - } -@@ -3367,7 +3367,7 @@ test("content_unittests") { - deps += [ "//third_party/boringssl" ] - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "../common/set_process_title_linux_unittest.cc" ] - deps += [ "//content/common:set_process_title_linux" ] - } diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 9927c15ad697..32ee417b0808 100644 --- a/www/iridium/files/patch-content_utility_services.cc +++ b/www/iridium/files/patch-content_utility_services.cc @@ -1,6 +1,6 @@ ---- content/utility/services.cc.orig 2024-02-04 14:46:08 UTC +--- content/utility/services.cc.orig 2024-06-25 12:08:48 UTC +++ content/utility/services.cc -@@ -67,7 +67,7 @@ +@@ -74,7 +74,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" -@@ -90,7 +90,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -97,7 +97,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,16 +18,23 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck -@@ -107,7 +107,7 @@ extern sandbox::TargetServices* g_utility_target_servi - #include "ui/accessibility/accessibility_features.h" +@@ -115,13 +115,13 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "media/capture/capture_switches.h" + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(ENABLE_VIDEO_EFFECTS) ++ BUILDFLAG(ENABLE_VIDEO_EFFECTS) || BUILDFLAG(IS_BSD) #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -224,7 +224,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi + #include "services/viz/public/mojom/gpu.mojom.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_VIDEO_EFFECTS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #include "media/capture/capture_switches.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -239,7 +239,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -36,16 +43,16 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -306,7 +306,7 @@ auto RunVideoCapture( - mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) { +@@ -328,7 +328,7 @@ auto RunVideoCapture( + #endif // BUILDFLAG(IS_CHROMEOS_ASH) auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { - mojo::PendingRemote<viz::mojom::Gpu> remote_gpu; - content::UtilityThread::Get()->BindHostReceiver( -@@ -345,7 +345,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) + { + #else +@@ -384,7 +384,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +61,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -356,7 +356,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -395,7 +395,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,7 +70,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -379,7 +379,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -418,7 +418,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -72,7 +79,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -428,7 +428,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -470,7 +470,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -81,7 +88,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -437,7 +437,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc index a551228dc86e..7aa61249e91d 100644 --- a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2023-01-17 19:19:00 UTC +--- content/utility/speech/speech_recognition_sandbox_hook_linux.cc.orig 2024-06-25 12:08:48 UTC +++ content/utility/speech/speech_recognition_sandbox_hook_linux.cc @@ -12,11 +12,14 @@ #include "sandbox/linux/syscall_broker/broker_command.h" @@ -27,9 +27,9 @@ #if BUILDFLAG(ENABLE_SODA_INTEGRATION_TESTS) base::FilePath test_binary_path = GetSodaTestBinaryPath(); DVLOG(0) << "SODA test binary path: " << test_binary_path.value().c_str(); -@@ -77,6 +82,7 @@ bool SpeechRecognitionPreSandboxHook( - sandbox::policy::SandboxLinux::PreSandboxHook(), - options); +@@ -75,6 +80,7 @@ bool SpeechRecognitionPreSandboxHook( + }), + GetSodaFilePermissions(), options); instance->EngageNamespaceSandboxIfPossible(); +#endif diff --git a/www/iridium/files/patch-content_utility_utility__main.cc b/www/iridium/files/patch-content_utility_utility__main.cc index 11165d178764..0144b562238c 100644 --- a/www/iridium/files/patch-content_utility_utility__main.cc +++ b/www/iridium/files/patch-content_utility_utility__main.cc @@ -1,6 +1,6 @@ ---- content/utility/utility_main.cc.orig 2024-02-04 14:46:08 UTC +--- content/utility/utility_main.cc.orig 2024-06-25 12:08:48 UTC +++ content/utility/utility_main.cc -@@ -37,7 +37,7 @@ +@@ -38,17 +38,21 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" @@ -9,7 +9,11 @@ #include "base/file_descriptor_store.h" #include "base/files/file_util.h" #include "base/pickle.h" -@@ -46,7 +46,9 @@ + #include "content/child/sandboxed_process_thread_type_handler.h" ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "content/common/gpu_pre_sandbox_hook_linux.h" ++#endif + #include "content/public/common/content_descriptor_keys.h" #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" #include "gpu/config/gpu_info_collector.h" #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" @@ -19,7 +23,7 @@ #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" // gn check is not smart enough to realize that this include only applies to -@@ -58,10 +60,14 @@ +@@ -60,10 +64,15 @@ #endif #endif @@ -30,21 +34,22 @@ +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" ++#include "content/common/gpu_pre_sandbox_hook_bsd.h" +#endif + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chromeos/ash/components/assistant/buildflags.h" #include "chromeos/ash/services/ime/ime_sandbox_hook.h" -@@ -73,7 +79,7 @@ +@@ -75,7 +84,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))) - #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck + #include "services/screen_ai/public/cpp/utilities.h" // nogncheck + #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif - -@@ -99,7 +105,7 @@ namespace content { +@@ -102,7 +111,7 @@ namespace content { namespace { @@ -53,8 +58,11 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -127,7 +133,7 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -129,9 +138,10 @@ std::vector<std::string> GetNetworkContextsParentDirec + return dirs; + } ++#if !BUILDFLAG(IS_BSD) bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) { const bool obtain_gpu_info = -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -62,17 +70,25 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -248,7 +254,8 @@ int UtilityMain(MainFunctionParams parameters) { - } +@@ -146,6 +156,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san + + return false; + } ++#endif + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + + #if BUILDFLAG(IS_WIN) +@@ -250,7 +261,8 @@ int UtilityMain(MainFunctionParams parameters) { + CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +// XXX BSD +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) - // Thread type delegate of the process should be registered before - // first thread type change in ChildProcess constructor. - // It also needs to be registered before the process has multiple threads, -@@ -259,7 +266,7 @@ int UtilityMain(MainFunctionParams parameters) { + // Thread type delegate of the process should be registered before first + // thread type change in ChildProcess constructor. It also needs to be + // registered before the process has multiple threads, which may race with +@@ -262,7 +274,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -81,8 +97,8 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -288,7 +295,7 @@ int UtilityMain(MainFunctionParams parameters) { - pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); +@@ -300,7 +312,7 @@ int UtilityMain(MainFunctionParams parameters) { + screen_ai::GetBinaryPathSwitch())); break; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -90,15 +106,15 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -315,6 +322,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -327,6 +339,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } +#if !BUILDFLAG(IS_BSD) if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { - sandbox::policy::SandboxLinux::Options sandbox_options; -@@ -323,6 +331,11 @@ int UtilityMain(MainFunctionParams parameters) { + sandbox_options.use_amd_specific_policies = +@@ -334,6 +347,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/iridium/files/patch-content_utility_utility__thread__impl.cc b/www/iridium/files/patch-content_utility_utility__thread__impl.cc index 2d71815af3c6..7ca5d07cc0d7 100644 --- a/www/iridium/files/patch-content_utility_utility__thread__impl.cc +++ b/www/iridium/files/patch-content_utility_utility__thread__impl.cc @@ -1,15 +1,15 @@ ---- content/utility/utility_thread_impl.cc.orig 2024-02-04 14:46:08 UTC +--- content/utility/utility_thread_impl.cc.orig 2024-06-25 12:08:48 UTC +++ content/utility/utility_thread_impl.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ + #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/service_factory.h" - #include "third_party/abseil-cpp/absl/types/optional.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -252,7 +252,8 @@ void UtilityThreadImpl::Init() { +@@ -251,7 +251,8 @@ void UtilityThreadImpl::Init() { GetContentClient()->utility()->UtilityThreadStarted(); diff --git a/www/iridium/files/patch-content_zygote_zygote__linux.cc b/www/iridium/files/patch-content_zygote_zygote__linux.cc index a220e4cbe430..50257f317106 100644 --- a/www/iridium/files/patch-content_zygote_zygote__linux.cc +++ b/www/iridium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2023-10-21 11:51:27 UTC +--- content/zygote/zygote_linux.cc.orig 2024-06-25 12:08:48 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -707,3 +708,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -718,3 +719,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc b/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc index bcd5493669f4..aa309d9de541 100644 --- a/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc +++ b/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc @@ -1,6 +1,6 @@ ---- device/bluetooth/bluetooth_adapter.cc.orig 2023-07-24 14:27:53 UTC +--- device/bluetooth/bluetooth_adapter.cc.orig 2024-06-25 12:08:48 UTC +++ device/bluetooth/bluetooth_adapter.cc -@@ -31,7 +31,7 @@ namespace device { +@@ -32,7 +32,7 @@ namespace device { BluetoothAdapter::ServiceOptions::ServiceOptions() = default; BluetoothAdapter::ServiceOptions::~ServiceOptions() = default; diff --git a/www/iridium/files/patch-device_fido_fido__discovery__factory.cc b/www/iridium/files/patch-device_fido_fido__discovery__factory.cc new file mode 100644 index 000000000000..305e579ce50b --- /dev/null +++ b/www/iridium/files/patch-device_fido_fido__discovery__factory.cc @@ -0,0 +1,11 @@ +--- device/fido/fido_discovery_factory.cc.orig 2024-06-25 12:08:48 UTC ++++ device/fido/fido_discovery_factory.cc +@@ -127,7 +127,7 @@ std::vector<std::unique_ptr<FidoDiscoveryBase>> FidoDi + + std::optional<std::unique_ptr<FidoDiscoveryBase>> + FidoDiscoveryFactory::MaybeCreateEnclaveDiscovery() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!base::FeatureList::IsEnabled(kWebAuthnEnclaveAuthenticator) || + !enclave_ui_request_stream_ || !network_context_factory_) { + return std::nullopt; diff --git a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index ce0c6b56905f..4e7d5f48473b 100644 --- a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,8 +1,8 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-02-04 14:46:08 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-06-25 12:08:48 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -107,7 +107,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt - MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt(); +@@ -102,7 +102,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt #endif + MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-extensions_browser_api_management_management__api.cc b/www/iridium/files/patch-extensions_browser_api_management_management__api.cc index 102e0aee5d6c..593289c112c7 100644 --- a/www/iridium/files/patch-extensions_browser_api_management_management__api.cc +++ b/www/iridium/files/patch-extensions_browser_api_management_management__api.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/management/management_api.cc.orig 2024-02-04 14:46:08 UTC +--- extensions/browser/api/management/management_api.cc.orig 2024-06-25 12:08:48 UTC +++ extensions/browser/api/management/management_api.cc -@@ -278,7 +278,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { +@@ -280,7 +280,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { #if BUILDFLAG(IS_CHROMEOS) // ChromeOS devices have this feature already shipped. return true; diff --git a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc index 7793fe58fb95..48b780498070 100644 --- a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2024-02-04 14:46:08 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2024-06-25 12:08:48 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -70,7 +70,7 @@ namespace { +@@ -71,7 +71,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-extensions_common_api_runtime.json b/www/iridium/files/patch-extensions_common_api_runtime.json index 98f93a5c7e2c..508f662cfea0 100644 --- a/www/iridium/files/patch-extensions_common_api_runtime.json +++ b/www/iridium/files/patch-extensions_common_api_runtime.json @@ -1,6 +1,6 @@ ---- extensions/common/api/runtime.json.orig 2023-10-21 11:51:27 UTC +--- extensions/common/api/runtime.json.orig 2024-06-25 12:08:48 UTC +++ extensions/common/api/runtime.json -@@ -89,6 +89,7 @@ +@@ -86,6 +86,7 @@ {"name": "cros", "description": "Specifies the Chrome operating system."}, {"name": "linux", "description": "Specifies the Linux operating system."}, {"name": "openbsd", "description": "Specifies the OpenBSD operating system."}, diff --git a/www/iridium/files/patch-extensions_common_command.cc b/www/iridium/files/patch-extensions_common_command.cc index 1e01d421aaaf..80bf7382f7bd 100644 --- a/www/iridium/files/patch-extensions_common_command.cc +++ b/www/iridium/files/patch-extensions_common_command.cc @@ -1,6 +1,6 @@ ---- extensions/common/command.cc.orig 2023-10-21 11:51:27 UTC +--- extensions/common/command.cc.orig 2024-06-25 12:08:48 UTC +++ extensions/common/command.cc -@@ -282,7 +282,7 @@ std::string Command::CommandPlatform() { +@@ -283,7 +283,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; @@ -8,4 +8,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return values::kKeybindingPlatformLinux; #elif BUILDFLAG(IS_FUCHSIA) - // TODO(crbug.com/1312215): Change this once we decide what string should be + // TODO(crbug.com/40220501): Change this once we decide what string should be diff --git a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc index 99ced1448cd3..16b2cd8d4380 100644 --- a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,4 +1,4 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2023-11-22 14:00:11 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ extensions/shell/app/shell_main_delegate.cc @@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,8 +9,8 @@ #include "base/nix/xdg_util.h" #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -62,7 +62,7 @@ base::FilePath GetDataPath() { - return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); +@@ -63,7 +63,7 @@ base::FilePath GetDataPath() { + } base::FilePath data_dir; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc index f0de792e6927..41fd731ed0fb 100644 --- a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -1,8 +1,8 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2022-03-28 18:11:04 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2024-06-25 12:08:48 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc @@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h index 53afe026a8c4..b9ea61782df3 100644 --- a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h +++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -1,8 +1,8 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2022-03-28 18:11:04 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2024-06-25 12:08:48 UTC +++ extensions/shell/browser/shell_extensions_api_client.h @@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC const override; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) @@ -11,7 +11,7 @@ MessagingDelegate* GetMessagingDelegate() override; @@ -45,7 +45,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC private: - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 62050b90e388..a3bf998a2191 100644 --- a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() { #if BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ return GL_TEXTURE_EXTERNAL_OES; #elif BUILDFLAG(IS_IOS) return GL_TEXTURE_2D; -@@ -217,7 +217,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu +@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 14a33d2c0b2d..a9b9655d64a2 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-02-04 14:46:08 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -178,7 +178,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -163,7 +163,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) return wgpu::BackendType::Vulkan; #elif BUILDFLAG(IS_APPLE) return wgpu::BackendType::Metal; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index e556b8355cba..08880ee4575d 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-02-04 14:46:08 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2999,7 +2999,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2955,7 +2955,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index c76ba373f384..7d470993b422 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-07-24 14:27:53 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc @@ -21,7 +21,7 @@ namespace { // TODO(penghuang): verify the scanout is the right usage for video playback. @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SHARED_IMAGE_USAGE_SCANOUT | #endif - SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT | + SHARED_IMAGE_USAGE_GLES2_READ | SHARED_IMAGE_USAGE_GLES2_WRITE | diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index fcbde90e239d..0b09fb7df0d8 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,18 +1,18 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-11-22 14:00:11 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -47,7 +47,7 @@ +@@ -50,7 +50,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" - #endif - -@@ -679,7 +679,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma - const wgpu::Device& wgpuDevice, + #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) + #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" +@@ -695,7 +695,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, - std::vector<wgpu::TextureFormat> view_formats) { + std::vector<wgpu::TextureFormat> view_formats, + scoped_refptr<SharedContextState> context_state) { -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) auto wgpu_format = ToDawnFormat(format()); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index e9e9428146bc..0a20c0d87d78 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,20 +1,11 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-11-22 14:00:11 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -99,7 +99,7 @@ base::flat_map<VkFormat, VkImageUsageFlags> CreateImag +@@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, } // namespace constexpr uint32_t kSupportedUsage = -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | + SHARED_IMAGE_USAGE_WEBGPU_READ | SHARED_IMAGE_USAGE_WEBGPU_WRITE | + SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | - #endif -@@ -268,7 +268,7 @@ bool ExternalVkImageBackingFactory::IsSupported( - return false; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (format.IsLegacyMultiplanar()) { - // ExternalVkImageBacking doesn't work properly with external sampler - // multi-planar formats on Linux, see https://crbug.com/1394888. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_ozone__image__gl__textures__holder.h b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_ozone__image__gl__textures__holder.h deleted file mode 100644 index 98d83ea1fbd0..000000000000 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_ozone__image__gl__textures__holder.h +++ /dev/null @@ -1,10 +0,0 @@ ---- gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h.orig 2024-02-04 14:46:08 UTC -+++ gpu/command_buffer/service/shared_image/ozone_image_gl_textures_holder.h -@@ -6,6 +6,7 @@ - #define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_OZONE_IMAGE_GL_TEXTURES_HOLDER_H_ - - #include <memory> -+#include <vector> - - #include "base/memory/raw_ptr.h" - #include "base/memory/ref_counted.h" diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index 0251fc438fb8..f5beed758fef 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -142,7 +142,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index d12094736e50..b81226da43a7 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -507,7 +507,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -570,7 +570,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc index 8722098cc006..804fa8d9529d 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-11-22 14:00:11 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc -@@ -212,7 +212,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -214,7 +214,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri constexpr GrRenderable is_renderable = GrRenderable::kYes; constexpr GrProtected is_protected = GrProtected::kNo; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 687de7c299b3..bb96ae360b8d 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-02-04 14:46:08 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1252,7 +1252,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1249,7 +1249,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1879,7 +1879,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1915,7 +1915,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/iridium/files/patch-gpu_config_gpu__control__list.cc b/www/iridium/files/patch-gpu_config_gpu__control__list.cc index 35aaf33be1e2..ea21f9cccb8a 100644 --- a/www/iridium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/iridium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2023-11-22 14:00:11 UTC +--- gpu/config/gpu_control_list.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/config/gpu_control_list.cc @@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -820,7 +820,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -811,7 +811,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc index 5415bf18e090..6bb17f7e2188 100644 --- a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc +++ b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc @@ -1,21 +1,20 @@ ---- gpu/config/gpu_finch_features.cc.orig 2023-11-22 14:00:11 UTC +--- gpu/config/gpu_finch_features.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/config/gpu_finch_features.cc -@@ -63,7 +63,7 @@ bool IsDeviceBlocked(const char* field, const std::str - BASE_FEATURE(kUseGles2ForOopR, - "UseGles2ForOopR", - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT -@@ -147,7 +147,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, +@@ -137,7 +137,7 @@ const base::FeatureParam<std::string> BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+ BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -150,7 +150,7 @@ BASE_FEATURE(kCanvasOopRasterization, + "CanvasOopRasterization", + #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN) || \ + (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc new file mode 100644 index 000000000000..59b32a16a029 --- /dev/null +++ b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc @@ -0,0 +1,11 @@ +--- gpu/config/gpu_info_collector.cc.orig 2024-06-25 12:08:48 UTC ++++ gpu/config/gpu_info_collector.cc +@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance + void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { + static BASE_FEATURE(kCollectWebGPUSupportMetrics, + "CollectWebGPUSupportMetrics", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT); + #else + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc index 7a1fc15b4bc5..6111aead24b3 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2024-02-04 14:46:08 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -398,7 +398,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -394,7 +394,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -435,7 +435,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -491,7 +491,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -573,7 +573,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -726,7 +726,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -782,7 +782,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -781,7 +781,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -837,7 +837,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -935,7 +935,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1025,7 +1025,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1005,7 +1005,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1085,7 +1085,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/iridium/files/patch-gpu_ipc_service_x__util.h b/www/iridium/files/patch-gpu_ipc_service_x__util.h index 55f9da599e4b..6bce1d225131 100644 --- a/www/iridium/files/patch-gpu_ipc_service_x__util.h +++ b/www/iridium/files/patch-gpu_ipc_service_x__util.h @@ -1,16 +1,11 @@ ---- gpu/ipc/service/x_util.h.orig 2022-03-28 18:11:04 UTC +--- gpu/ipc/service/x_util.h.orig 2024-06-25 12:08:48 UTC +++ gpu/ipc/service/x_util.h -@@ -11,11 +11,11 @@ - #include "build/build_config.h" +@@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_config.h" + #include "ui/base/ozone_buildflags.h" --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/ozone/buildflags.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(OZONE_PLATFORM_X11) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) namespace gpu { + diff --git a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py index 577c3ad149e1..37a55ab051c8 100644 --- a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py +++ b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py @@ -1,6 +1,6 @@ ---- gpu/vulkan/generate_bindings.py.orig 2023-11-22 14:00:11 UTC +--- gpu/vulkan/generate_bindings.py.orig 2024-06-25 12:08:48 UTC +++ gpu/vulkan/generate_bindings.py -@@ -270,7 +270,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -271,7 +271,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc index a1c2c9be222d..b1f4cead2f01 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -125,7 +125,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -263,7 +263,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -268,7 +268,7 @@ bool VulkanDeviceQueue::Initialize( // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler // support. #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h index a45b9fe4b020..a9f518e232ed 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2023-10-21 11:51:27 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2024-06-25 12:08:48 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue +@@ -169,7 +169,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue bool allow_protected_memory_ = false; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index e649124ac948..5d1c081fe2c3 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-11-22 14:00:11 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -1241,7 +1241,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1297,7 +1297,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } @@ -8,8 +8,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { - vkGetImageDrmFormatModifierPropertiesEXT = -@@ -1440,7 +1440,7 @@ void VulkanFunctionPointers::ResetForTesting() { + constexpr char kvkGetImageDrmFormatModifierPropertiesEXT[] = +@@ -1498,7 +1498,7 @@ void VulkanFunctionPointers::ResetForTesting() { vkGetSwapchainImagesKHR = nullptr; vkQueuePresentKHR = nullptr; diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 34b784a2ab4f..6c515861575a 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2023-11-22 14:00:11 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2024-06-25 12:08:48 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -321,7 +321,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1324,7 +1324,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1334,4 +1334,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc index aed12cab5d0e..31c047bb2967 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_util.cc.orig 2024-02-04 14:46:08 UTC +--- gpu/vulkan/vulkan_util.cc.orig 2024-06-25 12:08:48 UTC +++ gpu/vulkan/vulkan_util.cc -@@ -433,7 +433,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan +@@ -468,7 +468,7 @@ bool CheckVulkanCompatibilities( } } diff --git a/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc index d217f23137a4..9bccb7ea83ae 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2022-03-28 18:11:04 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2024-06-25 12:08:48 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p +@@ -66,7 +66,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p return; done_once = true; diff --git a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index 3e7c917cf5f0..9a59b38a3697 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2023-07-24 14:27:53 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2024-06-25 12:08:48 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -60,7 +60,7 @@ namespace headless { +@@ -62,7 +62,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc index 9ac6bb042b86..7e67eb4ee138 100644 --- a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -362,7 +362,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -371,7 +371,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/iridium/files/patch-ipc_ipc__channel.h b/www/iridium/files/patch-ipc_ipc__channel.h index 75c2def84f6d..10bcdb7d3e01 100644 --- a/www/iridium/files/patch-ipc_ipc__channel.h +++ b/www/iridium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2023-03-13 07:33:08 UTC +--- ipc/ipc_channel.h.orig 2024-06-25 12:08:48 UTC +++ ipc/ipc_channel.h -@@ -233,7 +233,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -218,7 +218,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.cc b/www/iridium/files/patch-ipc_ipc__message__utils.cc index 9ed1eff71f54..66947b4cd4f9 100644 --- a/www/iridium/files/patch-ipc_ipc__message__utils.cc +++ b/www/iridium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2023-10-21 11:51:27 UTC +--- ipc/ipc_message_utils.cc.orig 2024-06-25 12:08:48 UTC +++ ipc/ipc_message_utils.cc -@@ -393,7 +393,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -395,7 +395,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index 30e67ee34d81..308729c15f21 100644 --- a/www/iridium/files/patch-media_BUILD.gn +++ b/www/iridium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- media/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ media/BUILD.gn -@@ -89,6 +89,9 @@ config("media_config") { +@@ -90,6 +90,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index ef04c7755db2..348773ee95aa 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,7 +1,7 @@ ---- media/audio/BUILD.gn.orig 2023-11-22 14:00:11 UTC +--- media/audio/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ media/audio/BUILD.gn -@@ -286,9 +286,20 @@ source_set("audio") { - ] +@@ -270,9 +270,20 @@ source_set("audio") { + deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux || is_chromeos) { diff --git a/www/iridium/files/patch-media_audio_audio__input__device.cc b/www/iridium/files/patch-media_audio_audio__input__device.cc index bc1baee9b121..5f6330bea569 100644 --- a/www/iridium/files/patch-media_audio_audio__input__device.cc +++ b/www/iridium/files/patch-media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_input_device.cc.orig 2023-07-24 14:27:53 UTC +--- media/audio/audio_input_device.cc.orig 2024-06-25 12:08:48 UTC +++ media/audio/audio_input_device.cc -@@ -262,7 +262,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -264,7 +264,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/iridium/files/patch-media_audio_pulse_pulse__util.cc b/www/iridium/files/patch-media_audio_pulse_pulse__util.cc new file mode 100644 index 000000000000..38a438974423 --- /dev/null +++ b/www/iridium/files/patch-media_audio_pulse_pulse__util.cc @@ -0,0 +1,14 @@ +--- media/audio/pulse/pulse_util.cc.orig 2024-06-25 12:08:48 UTC ++++ media/audio/pulse/pulse_util.cc +@@ -45,7 +45,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows + + #if defined(DLOPEN_PULSEAUDIO) + static const base::FilePath::CharType kPulseLib[] = ++#if BUILDFLAG(IS_BSD) ++ FILE_PATH_LITERAL("libpulse.so"); ++#else + FILE_PATH_LITERAL("libpulse.so.0"); ++#endif + #endif + + void DestroyMainloop(pa_threaded_mainloop* mainloop) { diff --git a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc index a8897c485059..e8a0321b47e1 100644 --- a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2022-12-01 10:35:46 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2024-06-25 12:08:48 UTC +++ media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,181 @@ +@@ -0,0 +1,240 @@ +// 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. @@ -17,18 +17,19 @@ +#include "media/audio/sndio/sndio_input.h" +#include "media/audio/sndio/sndio_output.h" +#endif ++#if defined(USE_PULSEAUDIO) ++#include "media/audio/pulse/audio_manager_pulse.h" ++#include "media/audio/pulse/pulse_util.h" ++#endif ++#if defined(USE_ALSA) ++#include "media/audio/alsa/audio_manager_alsa.h" ++#endif +#include "media/audio/fake_audio_manager.h" +#include "media/base/limits.h" +#include "media/base/media_switches.h" + +namespace media { + -+enum SndioAudioIO { -+ kPulse, -+ kSndio, -+ kAudioIOMax = kSndio -+}; -+ +#if defined(USE_SNDIO) +// Maximum number of output streams that can be open simultaneously. +static const int kMaxOutputStreams = 50; @@ -36,6 +37,12 @@ +// Default sample rate for input and output streams. +static const int kDefaultSampleRate = 48000; + ++#if BUILDFLAG(IS_OPENBSD) ++static const std::string kDefaultAudioBackend = "sndio"; ++#else ++static const std::string kDefaultAudioBackend = "auto"; ++#endif ++ +void AddDefaultDevice(AudioDeviceNames* device_names) { + DCHECK(device_names->empty()); + device_names->push_front(AudioDeviceName::CreateDefault()); @@ -164,21 +171,73 @@ + std::unique_ptr<AudioThread> audio_thread, + AudioLogFactory* audio_log_factory) { + DLOG(WARNING) << "CreateAudioManager"; ++ std::string audio_backend = kDefaultAudioBackend; ++ ++ std::vector<std::string> kSupportedAudioBackends = {"auto"}; ++ ++#if defined(USE_SNDIO) ++ kSupportedAudioBackends.push_back(std::string("sndio")); ++#endif ++#if defined(USE_PULSEAUDIO) ++ kSupportedAudioBackends.push_back(std::string("pulse")); ++#endif ++#if defined(USE_ALSA) ++ kSupportedAudioBackends.push_back(std::string("alsa")); ++#endif ++ ++ if (base::CommandLine::ForCurrentProcess()->HasSwitch( ++ switches::kAudioBackend)) { ++ audio_backend = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( ++ switches::kAudioBackend); ++ } ++ + // For testing allow audio output to be disabled. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableAudioOutput)) { + return std::make_unique<FakeAudioManager>(std::move(audio_thread), + audio_log_factory); + } ++ ++ if (std::find(std::begin(kSupportedAudioBackends), std::end(kSupportedAudioBackends), ++ audio_backend) == std::end(kSupportedAudioBackends)) { ++ LOG(ERROR) << "Unsupported audio backend specified. Falling back to " << kDefaultAudioBackend; ++ audio_backend = kDefaultAudioBackend; ++ } ++ ++#if defined(USE_PULSEAUDIO) ++ pa_threaded_mainloop* pa_mainloop = nullptr; ++ pa_context* pa_context = nullptr; ++ if (audio_backend != "sndio" && pulse::InitPulse(&pa_mainloop, &pa_context)) { ++ return std::make_unique<AudioManagerPulse>( ++ std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context); ++ } else if (audio_backend == "auto") { ++ LOG(WARNING) << "Falling back to SNDIO for audio output. PulseAudio is not " ++ "available or could not be initialized."; ++ } ++#endif ++ +#if defined(USE_SNDIO) -+ UMA_HISTOGRAM_ENUMERATION("Media.SndioAudioIO", kSndio, kAudioIOMax + 1); -+ return std::make_unique<AudioManagerSndio>(std::move(audio_thread), -+ audio_log_factory); -+#else -+ return std::make_unique<FakeAudioManager>(std::move(audio_thread), -+ audio_log_factory); ++ if (audio_backend != "pulse") { ++ return std::make_unique<AudioManagerSndio>(std::move(audio_thread), ++ audio_log_factory); ++ } else if (audio_backend == "auto") { ++ LOG(WARNING) << "Falling back to ALSA audio output. SNDIO is not " ++ "available or could not be initialized."; ++ } ++#endif ++ ++#if defined(USE_ALSA) ++ if (audio_backend != "pulse" && audio_backend != "sndio") { ++ return std::make_unique<AudioManagerAlsa>(std::move(audio_thread), ++ audio_log_factory); ++ } else if (audio_backend == "auto") { ++ LOG(WARNING) << "Falling back to fake audio output. ALSA is not " ++ "available or could not be initialized."; ++ } +#endif + ++ return std::make_unique<FakeAudioManager>(std::move(audio_thread), ++ audio_log_factory); +} + +} // namespace media diff --git a/www/iridium/files/patch-media_base_libaom__thread__wrapper.cc b/www/iridium/files/patch-media_base_libaom__thread__wrapper.cc new file mode 100644 index 000000000000..53bd9e79b1f5 --- /dev/null +++ b/www/iridium/files/patch-media_base_libaom__thread__wrapper.cc @@ -0,0 +1,24 @@ +--- media/base/libaom_thread_wrapper.cc.orig 2024-06-25 12:08:48 UTC ++++ media/base/libaom_thread_wrapper.cc +@@ -5,17 +5,21 @@ + #include "base/logging.h" + #include "media/base/codec_worker_impl.h" + #include "media/base/libvpx_thread_wrapper.h" ++#if !BUILDFLAG(IS_BSD) + #include "third_party/libaom/source/libaom/aom_util/aom_thread.h" ++#endif + + namespace media { + + void InitLibAomThreadWrapper() { ++#if !BUILDFLAG(IS_BSD) + const AVxWorkerInterface interface = + CodecWorkerImpl<AVxWorkerInterface, AVxWorkerImpl, AVxWorker, + AVxWorkerStatus, AVX_WORKER_STATUS_NOT_OK, + AVX_WORKER_STATUS_OK, + AVX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface(); + CHECK(aom_set_worker_interface(&interface)); ++#endif + } + + } // namespace media diff --git a/www/iridium/files/patch-media_base_libvpx__thread__wrapper.cc b/www/iridium/files/patch-media_base_libvpx__thread__wrapper.cc new file mode 100644 index 000000000000..d06e5c479448 --- /dev/null +++ b/www/iridium/files/patch-media_base_libvpx__thread__wrapper.cc @@ -0,0 +1,25 @@ +--- media/base/libvpx_thread_wrapper.cc.orig 2024-06-25 12:08:48 UTC ++++ media/base/libvpx_thread_wrapper.cc +@@ -5,11 +5,14 @@ + #include "media/base/libvpx_thread_wrapper.h" + + #include "media/base/codec_worker_impl.h" ++#if !BUILDFLAG(IS_OPENBSD) + #include "third_party/libvpx/source/libvpx/vpx_util/vpx_thread.h" ++#endif + + namespace media { + + void InitLibVpxThreadWrapper() { ++#if !BUILDFLAG(IS_OPENBSD) + const VPxWorkerInterface interface = + CodecWorkerImpl<VPxWorkerInterface, VPxWorkerImpl, VPxWorker, + VPxWorkerStatus, VPX_WORKER_STATUS_NOT_OK, +@@ -17,6 +20,7 @@ void InitLibVpxThreadWrapper() { + VPX_WORKER_STATUS_WORKING>::GetCodecWorkerInterface(); + + CHECK(vpx_set_worker_interface(&interface)); ++#endif + } + + } // namespace media diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index dfe145828187..a62daf3f981b 100644 --- a/www/iridium/files/patch-media_base_media__switches.cc +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -1,6 +1,6 @@ ---- media/base/media_switches.cc.orig 2024-02-04 14:46:08 UTC +--- media/base/media_switches.cc.orig 2024-06-25 12:08:48 UTC +++ media/base/media_switches.cc -@@ -17,7 +17,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" #include "ui/gl/gl_utils.h" @@ -9,7 +9,29 @@ #include "base/cpu.h" #endif -@@ -702,7 +702,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -60,6 +60,10 @@ const char kDisableBackgroundMediaSuspend[] = + const char kReportVp9AsAnUnsupportedMimeType[] = + "report-vp9-as-an-unsupported-mime-type"; + ++#if BUILDFLAG(IS_BSD) ++const char kAudioBackend[] = "audio-backend"; ++#endif ++ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \ + BUILDFLAG(IS_SOLARIS) + // The Alsa device to use when opening an audio input stream. +@@ -368,8 +372,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare, + "MacLoopbackAudioForScreenShare", + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_MAC) +- +-#if BUILDFLAG(IS_LINUX) ++ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Enables system audio mirroring using pulseaudio. + BASE_FEATURE(kPulseaudioLoopbackForCast, + "PulseaudioLoopbackForCast", +@@ -688,7 +692,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +40,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -725,7 +725,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -716,7 +720,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -27,7 +49,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -737,7 +737,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -728,7 +732,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +58,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -776,7 +776,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -757,7 +761,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,21 +67,48 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -856,7 +856,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -848,7 +852,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. - BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, - "V4L2FlatStatelessVideoDecoder", -@@ -1384,7 +1384,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo - }; + // Enables the new V4L2 flat video decoder clients instead of V4L2VideoDecoder. + // Owners: frkoenig@chromium.org, mcasas@chromium.org + // Expiry: When flat decoders are supported on all platforms and the legacy +@@ -978,7 +982,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, + // Live Caption can be used in multiple languages, as opposed to just English. + BASE_FEATURE(kLiveCaptionMultiLanguage, + "LiveCaptionMultiLanguage", +-#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 +@@ -1008,7 +1012,7 @@ BASE_FEATURE(kLiveCaptionWebAudio, + // Live Translate translates captions generated by Live Caption. + BASE_FEATURE(kLiveTranslate, + "LiveTranslate", +-#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 +@@ -1472,7 +1476,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, + base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. - const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoEncoding{ + BASE_FEATURE(kUseOutOfProcessVideoEncoding, +@@ -1552,7 +1556,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, + "RecordWebAudioEngagement", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Reduces the number of buffers needed in the output video frame pool to + // populate the Renderer pipeline for hardware accelerated VideoDecoder in + // non-low latency scenarios. diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h index cf96a08ce699..bdd9bfcecf2b 100644 --- a/www/iridium/files/patch-media_base_media__switches.h +++ b/www/iridium/files/patch-media_base_media__switches.h @@ -1,25 +1,52 @@ ---- media/base/media_switches.h.orig 2024-02-04 14:46:08 UTC +--- media/base/media_switches.h.orig 2024-06-25 12:08:48 UTC +++ media/base/media_switches.h -@@ -322,7 +322,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseElementInsteadOfRegionCapture); +@@ -43,6 +43,10 @@ MEDIA_EXPORT extern const char kDisableBackgroundMedia + + MEDIA_EXPORT extern const char kReportVp9AsAnUnsupportedMimeType[]; + ++#if BUILDFLAG(IS_BSD) ++MEDIA_EXPORT extern const char kAudioBackend[]; ++#endif ++ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \ + BUILDFLAG(IS_SOLARIS) + MEDIA_EXPORT extern const char kAlsaInputDevice[]; +@@ -324,13 +328,13 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare); + #endif // BUILDFLAG(IS_LINUX) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordMediaEngagementScores); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordWebAudioEngagement); +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); +@@ -345,7 +349,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -340,7 +340,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa +@@ -364,7 +368,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -461,7 +461,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); +@@ -506,7 +510,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-media_base_scopedfd__helper.h b/www/iridium/files/patch-media_base_scopedfd__helper.h deleted file mode 100644 index ce41e2598404..000000000000 --- a/www/iridium/files/patch-media_base_scopedfd__helper.h +++ /dev/null @@ -1,11 +0,0 @@ ---- media/base/scopedfd_helper.h.orig 2022-03-28 18:11:04 UTC -+++ media/base/scopedfd_helper.h -@@ -15,7 +15,7 @@ namespace media { - // but since the only current user is V4L2 we are limiting the scope to OS_LINUX - // so the binary size does not inflate on non-using systems. Feel free to adapt - // this and BUILD.gn as our needs evolve. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - - // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an - // error. diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc index 7b63a8646a6a..2f0bb9ee7005 100644 --- a/www/iridium/files/patch-media_base_video__frame.cc +++ b/www/iridium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2023-11-22 14:00:11 UTC +--- media/base/video_frame.cc.orig 2024-06-25 12:08:48 UTC +++ media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -306,7 +306,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -306,7 +306,7 @@ static std::optional<VideoFrameLayout> GetDefaultLayou return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,16 +27,16 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM - for (size_t i = 0; i < num_planes; ++i) +@@ -440,7 +440,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForGp planes[i].stride = gpu_memory_buffer->stride(i); + } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -778,7 +778,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -903,7 +903,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -997,7 +997,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,16 +54,16 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1311,7 +1311,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( - : mailbox_holders_[texture_index]; +@@ -1471,7 +1471,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar + : shared_images_[texture_index]; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { - DCHECK_EQ(storage_type_, STORAGE_DMABUFS); - -@@ -1424,7 +1424,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, + size_t VideoFrame::NumDmabufFds() const { + return dmabuf_fds_->size(); + } +@@ -1588,7 +1588,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/iridium/files/patch-media_base_video__frame.h b/www/iridium/files/patch-media_base_video__frame.h index 8c51ca85f196..329253a3b609 100644 --- a/www/iridium/files/patch-media_base_video__frame.h +++ b/www/iridium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2023-10-21 11:51:27 UTC +--- media/base/video_frame.h.orig 2024-06-25 12:08:48 UTC +++ media/base/video_frame.h -@@ -44,7 +44,7 @@ +@@ -45,7 +45,7 @@ #include "base/apple/scoped_cftyperef.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -110,7 +110,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -111,7 +111,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 read-only 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 -@@ -313,7 +313,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -341,7 +341,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,16 +27,16 @@ // 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 -@@ -593,7 +593,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; +@@ -650,7 +650,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + scoped_refptr<gpu::ClientSharedImage> shared_image( + size_t texture_index) const; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // 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 number of 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 -@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // remaining planes. Should be > 0 for STORAGE_DMABUFS. +@@ -886,7 +886,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/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 359edd88b7c6..13de90cd045b 100644 --- a/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2023-08-28 20:17:35 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2024-06-25 12:08:48 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -229,7 +229,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( +@@ -231,7 +231,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( int entry_index = 0; for (const auto& entry : devices_config_) { VideoCaptureApi api = diff --git a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index c5138927695a..43cf7b9fe99d 100644 --- a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-10-21 11:51:27 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2024-06-25 12:08:48 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -560,7 +560,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -562,7 +562,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 9d16ccf40b40..4d5ef885b5f0 100644 --- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-11-22 14:00:11 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -5,8 +5,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -26,17 +28,19 @@ +@@ -27,17 +29,19 @@ #include "media/capture/video/blob_utils.h" #include "media/capture/video/linux/video_capture_device_linux.h" @@ -32,7 +32,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -46,6 +50,14 @@ using media::mojom::MeteringMode; +@@ -47,6 +51,14 @@ using media::mojom::MeteringMode; #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z') #endif @@ -47,7 +47,7 @@ namespace media { namespace { -@@ -260,7 +272,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control +@@ -264,7 +276,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control // static bool V4L2CaptureDelegate::IsControllableControl( int control_id, @@ -56,7 +56,7 @@ const int special_control_id = GetControllingSpecialControl(control_id); if (!special_control_id) { // The control is not controlled by a special control thus the control is -@@ -316,7 +328,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( +@@ -320,7 +332,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate( is_capturing_(false), timeout_count_(0), rotation_(rotation) { @@ -65,7 +65,7 @@ use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); #endif // BUILDFLAG(IS_LINUX) } -@@ -443,7 +455,7 @@ void V4L2CaptureDelegate::AllocateAndStart( +@@ -447,7 +459,7 @@ void V4L2CaptureDelegate::AllocateAndStart( client_->OnStarted(); @@ -74,7 +74,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>( std::move(gmb_support_test_)); -@@ -793,7 +805,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( +@@ -797,7 +809,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -83,7 +83,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -803,7 +815,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -807,7 +819,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } @@ -92,7 +92,7 @@ return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp)); } -@@ -814,6 +826,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -818,6 +830,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co } void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() { @@ -100,7 +100,7 @@ constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS, V4L2_CID_AUTO_WHITE_BALANCE, V4L2_CID_BRIGHTNESS, -@@ -841,6 +854,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -845,6 +858,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -108,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1021,7 +1035,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1025,7 +1039,11 @@ void V4L2CaptureDelegate::DoCapture() { pollfd device_pfd = {}; device_pfd.fd = device_fd_.get(); @@ -120,7 +120,7 @@ const int result = HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs)); -@@ -1059,6 +1077,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1063,6 +1081,7 @@ void V4L2CaptureDelegate::DoCapture() { timeout_count_ = 0; } @@ -128,7 +128,7 @@ // Dequeue events if the driver has filled in some. if (device_pfd.revents & POLLPRI) { bool controls_changed = false; -@@ -1093,6 +1112,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1097,6 +1116,7 @@ void V4L2CaptureDelegate::DoCapture() { client_->OnCaptureConfigurationChanged(); } } @@ -136,7 +136,7 @@ // Deenqueue, send and reenqueue a buffer if the driver has filled one in. if (device_pfd.revents & POLLIN) { -@@ -1146,7 +1166,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1150,7 +1170,7 @@ void V4L2CaptureDelegate::DoCapture() { // workable on Linux. // See http://crbug.com/959919. @@ -145,7 +145,7 @@ if (use_gpu_buffer_) { v4l2_gpu_helper_->OnIncomingCapturedData( client_.get(), buffer_tracker->start(), -@@ -1219,7 +1239,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1223,7 +1243,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr client_->OnError(error, from_here, reason); } diff --git a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc index ca77175e971c..a5e3075fcd21 100644 --- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc +++ b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc @@ -1,6 +1,20 @@ ---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2023-07-24 14:27:53 UTC +--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2024-06-25 12:08:48 UTC +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc -@@ -75,6 +75,9 @@ class DevVideoFilePathsDeviceProvider +@@ -38,6 +38,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf + return a.descriptor < b.descriptor; + } + ++#if !BUILDFLAG(IS_OPENBSD) + // USB VID and PID are both 4 bytes long. + const size_t kVidPidSize = 4; + const size_t kMaxInterfaceNameSize = 256; +@@ -70,11 +71,15 @@ std::string ExtractFileNameFromDeviceId(const std::str + DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE)); + return device_id.substr(strlen(kDevDir), device_id.length()); + } ++#endif + + class DevVideoFilePathsDeviceProvider : public VideoCaptureDeviceFactoryV4L2::DeviceProvider { public: void GetDeviceIds(std::vector<std::string>* target_container) override { @@ -10,7 +24,7 @@ const base::FilePath path("/dev/"); base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES, "video*"); -@@ -82,9 +85,13 @@ class DevVideoFilePathsDeviceProvider +@@ -82,9 +87,13 @@ class DevVideoFilePathsDeviceProvider const base::FileEnumerator::FileInfo info = enumerator.GetInfo(); target_container->emplace_back(path.value() + info.GetName().value()); } @@ -20,21 +34,33 @@ std::string GetDeviceModelId(const std::string& device_id) override { +#if BUILDFLAG(IS_OPENBSD) + return std::string(); -+#endif ++#else const std::string file_name = ExtractFileNameFromDeviceId(device_id); std::string usb_id; const std::string vid_path = -@@ -104,6 +111,9 @@ class DevVideoFilePathsDeviceProvider +@@ -101,9 +110,13 @@ class DevVideoFilePathsDeviceProvider + } + + return usb_id; ++#endif } std::string GetDeviceDisplayName(const std::string& device_id) override { +#if BUILDFLAG(IS_OPENBSD) + return std::string(); -+#endif ++#else const std::string file_name = ExtractFileNameFromDeviceId(device_id); const std::string interface_path = base::StringPrintf(kInterfacePathTemplate, file_name.c_str()); -@@ -219,7 +229,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( +@@ -114,6 +127,7 @@ class DevVideoFilePathsDeviceProvider + return std::string(); + } + return display_name; ++#endif + } + }; + +@@ -219,7 +233,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( std::move(callback).Run(std::move(devices_info)); } diff --git a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc index 6767f8b0e5fc..54f83e2a97ba 100644 --- a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2024-02-04 14:46:08 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2024-06-25 12:08:48 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -150,7 +150,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -164,7 +164,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( CHECK(!is_width_odd && !is_height_odd); return {libyuv::FOURCC_UYVY}; case media::PIXEL_FORMAT_RGB24: diff --git a/www/iridium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py b/www/iridium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py new file mode 100644 index 000000000000..aea0217399ce --- /dev/null +++ b/www/iridium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py @@ -0,0 +1,83 @@ +--- media/ffmpeg/scripts/build_ffmpeg.py.orig 2024-06-25 12:08:48 UTC ++++ media/ffmpeg/scripts/build_ffmpeg.py +@@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath( + SUCCESS_TOKEN = 'THIS_BUILD_WORKED' + + sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build')) +-import gn_helpers ++#import gn_helpers + + BRANDINGS = [ + 'Chrome', +@@ -44,6 +44,8 @@ BRANDINGS = [ + ARCH_MAP = { + 'android': ['ia32', 'x64', 'arm-neon', 'arm64'], + 'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'], ++ 'openbsd': ['x64', 'arm64', 'ia32'], ++ 'freebsd': ['x64', 'arm64', 'ia32'], + 'mac': ['x64', 'arm64'], + 'win': ['ia32', 'x64', 'arm64'], + } +@@ -123,7 +125,7 @@ def PrintAndCheckCall(argv, *args, **kwargs): + + + def GetDsoName(target_os, dso_name, dso_version): +- if target_os in ('linux', 'linux-noasm', 'android'): ++ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): + return 'lib%s.so.%s' % (dso_name, dso_version) + elif target_os == 'mac': + return 'lib%s.%s.dylib' % (dso_name, dso_version) +@@ -476,7 +478,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ + # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation + # #warning which will be converted to an error via -Werror. + # There is also no prctl.h +- if target_os in ['linux', 'linux-noasm']: ++ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: + pre_make_rewrites += [ + (r'(#define HAVE_SYSCTL [01])', + r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), +@@ -599,7 +601,7 @@ def main(argv): + configure_args = args[2:] + + if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', +- 'all'): ++ 'all', 'openbsd', 'freebsd'): + parser.print_help() + return 1 + +@@ -672,7 +674,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + '--disable-securetransport', + '--disable-faan', + '--disable-alsa', +- '--disable-iamf', + + # Disable automatically detected external libraries. This prevents + # automatic inclusion of things like hardware decoders. Each roll should +@@ -713,7 +714,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + '--optflags="-O2"', + ]) + +- if target_os in ('linux', 'linux-noasm', 'android'): ++ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): + if target_arch == 'x64': + if target_os == 'android': + configure_flags['Common'].extend([ +@@ -828,9 +829,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + + configure_flags['Common'].extend([ + '--target-os=linux', +- '--sysroot=' + +- os.path.join(CHROMIUM_ROOT_DIR, +- 'build/linux/debian_bullseye_arm64-sysroot'), + # See crbug.com/1467681. These could be removed eventually + '--disable-dotprod', + '--disable-i8mm', +@@ -1034,7 +1032,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, + 'Chrome', configure_flags['Common'] + + configure_flags['ChromeAndroid'] + configure_args) + +- if target_os in ['linux', 'linux-noasm']: ++ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: + # ChromeOS enables MPEG4 which requires error resilience :( + chrome_os_flags = (configure_flags['Common'] + + configure_flags['Chrome'] + diff --git a/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py b/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py new file mode 100644 index 000000000000..df8091383fef --- /dev/null +++ b/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py @@ -0,0 +1,56 @@ +--- media/ffmpeg/scripts/robo_lib/config.py.orig 2024-06-25 12:08:48 UTC ++++ media/ffmpeg/scripts/robo_lib/config.py +@@ -55,19 +55,13 @@ class RoboConfiguration: + self._llvm_path = os.path.join(self.chrome_src(), "third_party", + "llvm-build", "Release+Asserts", "bin") + +- self.EnsurePathContainsLLVM() +- self.EnsureNoMakeInfo() + self.EnsureFFmpegHome() + self.EnsureGNConfig() +- self.ComputeBranchName() + + if not quiet: + shell.log(f"Using chrome src: {self.chrome_src()}") + shell.log(f"Using script dir: {self._script_directory}") + shell.log(f"Using ffmpeg home: {self.ffmpeg_home()}") +- shell.log(f"On branch: {self.branch_name()}") +- if self.sushi_branch_name(): +- shell.log(f"On sushi branch: {self.sushi_branch_name()}") + + # Filename that we'll ask generate_gn.py to write git commands to. + # TODO: Should this use script_directory, or stay with ffmpeg? As long as +@@ -186,9 +180,9 @@ class RoboConfiguration: + + if re.match(r"i.86", platform.machine()): + self._host_architecture = "ia32" +- elif platform.machine() == "x86_64" or platform.machine() == "AMD64": ++ elif platform.machine() == "x86_64" or platform.machine() == "AMD64" or platform.machine() == "amd64": + self._host_architecture = "x64" +- elif platform.machine() == "aarch64": ++ elif platform.machine() == "aarch64" or platform.machine() == "arm64": + self._host_architecture = "arm64" + elif platform.machine() == "mips32": + self._host_architecture = "mipsel" +@@ -223,6 +217,10 @@ class RoboConfiguration: + elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system( + ): + self._host_operating_system = "win" ++ elif platform.system() == "OpenBSD": ++ self._host_operating_system = "openbsd" ++ elif platform.system() == "FreeBSD": ++ self._host_operating_system = "freebsd" + else: + raise ValueError(f"Unsupported platform: {platform.system()}") + +@@ -231,8 +229,8 @@ class RoboConfiguration: + wd = os.getcwd() + # Walk up the tree until we find src/AUTHORS + while wd != "/": +- if os.path.isfile(os.path.join(wd, "src", "AUTHORS")): +- self._chrome_src = os.path.join(wd, "src") ++ if os.path.isfile(os.path.join(wd, "third_party", "DEPS")): ++ self._chrome_src = wd + return + wd = os.path.dirname(wd) + raise Exception("could not find src/AUTHORS in any parent of the wd") diff --git a/www/iridium/files/patch-media_gpu_buffer__validation.cc b/www/iridium/files/patch-media_gpu_buffer__validation.cc index 812bf1d84b03..a9fdfd6bf069 100644 --- a/www/iridium/files/patch-media_gpu_buffer__validation.cc +++ b/www/iridium/files/patch-media_gpu_buffer__validation.cc @@ -1,29 +1,46 @@ ---- media/gpu/buffer_validation.cc.orig 2023-11-22 14:00:11 UTC +--- media/gpu/buffer_validation.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/buffer_validation.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <drm_fourcc.h> #include <sys/types.h> #include <unistd.h> - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -23,7 +23,7 @@ +@@ -29,7 +29,7 @@ namespace media { + namespace { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS + // TODO(b/271455200): Remove this definition once drm_fourcc.h contains it. + /* +@@ -55,7 +55,7 @@ bool IsIntelMediaCompressedModifier(uint64_t modifier) + } // namespace + bool GetFileSize(const int fd, size_t* size) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (fd < 0) { VLOG(1) << "Invalid file descriptor"; return false; -@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle( +@@ -109,14 +109,14 @@ bool VerifyGpuMemoryBufferHandle( VLOG(1) << "Unsupported: " << pixel_format; return false; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); - if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || - num_planes == 0) { + const uint64_t modifier = gmb_handle.native_pixmap_handle.modifier; + const bool is_intel_media_compressed_buffer = + IsIntelMediaCompressedModifier(modifier); + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + diff --git a/www/iridium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc b/www/iridium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc new file mode 100644 index 000000000000..34c856c58baf --- /dev/null +++ b/www/iridium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc @@ -0,0 +1,13 @@ +--- media/gpu/chromeos/gl_image_processor_backend.cc.orig 2024-06-25 12:08:48 UTC ++++ media/gpu/chromeos/gl_image_processor_backend.cc +@@ -28,6 +28,10 @@ + #include "ui/ozone/public/ozone_platform.h" + #include "ui/ozone/public/surface_factory_ozone.h" + ++#ifndef GL_CONTEXT_LOST_KHR ++#define GL_CONTEXT_LOST_KHR 0x0507 ++#endif ++ + namespace media { + + namespace { diff --git a/www/iridium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/iridium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc new file mode 100644 index 000000000000..7c10b8240d91 --- /dev/null +++ b/www/iridium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -0,0 +1,29 @@ +--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-06-25 12:08:48 UTC ++++ media/gpu/chromeos/libyuv_image_processor_backend.cc +@@ -48,7 +48,7 @@ static constexpr struct { + #define CONV(in, out, trans, result) \ + {Fourcc::in, Fourcc::out, Transform::trans, SupportResult::result} + // Conversion. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + CONV(NV12, AR24, kConversion, Supported), + #endif + CONV(NV12, NV12, kConversion, Supported), +@@ -415,7 +415,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr + fr->GetWritableVisibleData(VideoFrame::Plane::kUV)), \ + fr->stride(VideoFrame::Plane::kUV) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define ARGB_DATA(fr) \ + fr->GetWritableVisibleData(VideoFrame::Plane::kARGB), \ + fr->stride(VideoFrame::Plane::kARGB) +@@ -577,7 +577,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr + } + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (output->format() == PIXEL_FORMAT_ARGB) { + if (input_config_.fourcc == Fourcc(Fourcc::NV12)) { + return LIBYUV_FUNC(NV12ToARGB, Y_UV_DATA(input), diff --git a/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc index 8f7e2fc36a2e..2399036ebf4b 100644 --- a/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2023-11-22 14:00:11 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc -@@ -59,7 +59,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe +@@ -65,7 +65,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast<int>(buffer_format); NOTREACHED_NORETURN(); } diff --git a/www/iridium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc b/www/iridium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc new file mode 100644 index 000000000000..1652a1b78170 --- /dev/null +++ b/www/iridium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc @@ -0,0 +1,11 @@ +--- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-06-25 12:08:48 UTC ++++ media/gpu/chromeos/native_pixmap_frame_resource.cc +@@ -154,7 +154,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + CHECK(!is_intel_media_compressed_buffer || diff --git a/www/iridium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/www/iridium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc new file mode 100644 index 000000000000..dd2ea53afac8 --- /dev/null +++ b/www/iridium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc @@ -0,0 +1,29 @@ +--- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-06-25 12:08:48 UTC ++++ media/gpu/chromeos/platform_video_frame_utils.cc +@@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( + const base::FilePath dev_path(FILE_PATH_LITERAL( + base::StrCat({drm_node_file_prefix, base::NumberToString(i)}))); + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC) + const bool is_render_node = base::Contains(drm_node_file_prefix, "render"); + + // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind +@@ -196,7 +196,7 @@ class GbmDeviceWrapper { + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + if (is_intel_media_compression_enabled) { +@@ -350,7 +350,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameFromGpuMemor + const bool is_intel_media_compression_enabled = + #if BUILDFLAG(IS_CHROMEOS) + base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + false; + #endif + diff --git a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index e0c348b94a68..bb2a13bad898 100644 --- a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-02-04 14:46:08 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1048,14 +1048,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1097,7 +1097,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,20 +9,21 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); - CHECK(main_frame_pool_->AsPlatformVideoFramePool()); +@@ -1106,7 +1106,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( + // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( - *allocator); + *allocator, VideoFrame::STORAGE_DMABUFS); -#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC) +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC) // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1192,7 +1192,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1294,7 +1294,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The custom allocator creates frames backed by NativePixmap, which uses a + // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( - *allocator); - #endif diff --git a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index 7f208b8f30d4..5a33e70bacd8 100644 --- a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-10-21 11:51:27 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -119,7 +119,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -118,7 +118,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index c9aa0777c55e..7f9c2129cbae 100644 --- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-07-24 14:27:53 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc -@@ -15,7 +15,9 @@ +@@ -16,7 +16,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" #endif @@ -10,7 +10,7 @@ // TODO(b/195769334): the hardware video decoding sandbox is really only useful // when building with VA-API or V4L2 (otherwise, we're not really doing hardware -@@ -31,6 +33,7 @@ using sandbox::syscall_broker::BrokerFilePermission; +@@ -32,6 +34,7 @@ using sandbox::syscall_broker::BrokerFilePermission; namespace media { namespace { @@ -18,7 +18,7 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -172,6 +175,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED_NORETURN(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -187,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,10 +34,10 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -232,6 +237,7 @@ bool HardwareVideoDecodingPreSandboxHook( + // |permissions| is empty? sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( - command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), - options); + command_set, permissions, options); +#endif return true; } diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc index 1f047c4877ba..6d4154122145 100644 --- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-10-21 11:51:27 UTC +--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc @@ -18,12 +18,15 @@ #include "media/gpu/v4l2/v4l2_device.h" @@ -16,7 +16,7 @@ sandbox::syscall_broker::BrokerCommandSet command_set; std::vector<BrokerFilePermission> permissions; -@@ -121,6 +124,7 @@ bool HardwareVideoEncodingPreSandboxHook( +@@ -120,6 +123,7 @@ bool HardwareVideoEncodingPreSandboxHook( return false; } } diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 570dba11b18a..14e77f012a09 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,11 +1,11 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-02-04 14:46:08 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -776,7 +776,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -775,7 +775,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - absl::optional<DmabufVideoFramePool::CreateFrameCB> allocator = + std::optional<DmabufVideoFramePool::CreateFrameCB> allocator = base::BindRepeating(&AllocateCustomFrameProxy, weak_this_); std::vector<ImageProcessor::PixelLayoutCandidate> candidates = { diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 8dce144a5574..6a2c8603c6ab 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,4 +1,4 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-02-04 14:46:08 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-06-25 12:08:48 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc @@ -71,7 +71,7 @@ using media_gpu_vaapi::kModuleVa_prot; @@ -9,39 +9,3 @@ #include "base/files/file_util.h" #include "base/strings/string_split.h" #endif -@@ -1445,7 +1445,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) { - return VASupportedProfiles::Get().IsProfileSupported(mode, va_profile); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Some VA-API drivers (vdpau-va-driver) will crash if used with VA/DRM on - // NVIDIA GPUs. This function checks if such drivers are present. - bool IsBrokenNvidiaVaapiDriverPresent() { -@@ -1506,7 +1506,7 @@ void VADisplayStateSingleton::PreSandboxInitialization - VADisplayStateSingleton& va_display_state = GetInstance(); - base::AutoLock lock(va_display_state.lock_); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string va_driver_name; - auto env = base::Environment::Create(); - if (env->GetVar("LIBVA_DRIVER_NAME", &va_driver_name) && -@@ -1543,7 +1543,7 @@ void VADisplayStateSingleton::PreSandboxInitialization - if (base::EqualsCaseInsensitiveASCII(version_name, "vgem")) { - continue; - } --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Skip NVIDIA GPUs if the VA-API driver used for them is known for crashing - // with VA/DRM. - if (is_nvidia_va_drm_broken && -@@ -1576,7 +1576,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl - return {}; - } - --#if BUILDFLAG(IS_OZONE) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on - // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi - // for more details. This will also require revisiting everything that's diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni index 94be4d5f497f..225c465eaadb 100644 --- a/www/iridium/files/patch-media_media__options.gni +++ b/www/iridium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2024-02-04 14:46:08 UTC +--- media/media_options.gni.orig 2024-06-25 12:08:48 UTC +++ media/media_options.gni -@@ -187,12 +187,15 @@ declare_args() { +@@ -190,12 +190,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -17,14 +17,3 @@ (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || is_cast_audio_only)) { use_alsa = true -@@ -208,6 +211,10 @@ declare_args() { - if (!use_cras && !is_castos && !is_asan && !is_tsan) { - use_pulseaudio = true - } -+ } -+ if (is_openbsd) { -+ use_sndio = true -+ use_pulseaudio = false - } - } - diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index 4dca267a7d90..992b2e999bee 100644 --- a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2023-10-21 11:51:27 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2024-06-25 12:08:48 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -693,7 +693,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem +@@ -690,7 +690,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem static const gfx::GpuMemoryBufferId& id( const gfx::GpuMemoryBufferHandle& input); diff --git a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc index 2ad5b71b7d3a..4421750964a9 100644 --- a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2022-03-28 18:11:04 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2024-06-25 12:08:48 UTC +++ media/video/fake_gpu_memory_buffer.cc @@ -9,7 +9,7 @@ #include "media/base/format_utils.h" @@ -9,7 +9,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -47,7 +47,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -52,7 +52,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace @@ -18,7 +18,7 @@ base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -77,7 +77,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si +@@ -82,7 +82,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si static base::AtomicSequenceNumber buffer_id_generator; handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); @@ -27,12 +27,12 @@ for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { const gfx::Size plane_size_in_bytes = VideoFrame::PlaneSize(video_pixel_format_, i, size_); -@@ -134,7 +134,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handle.native_pixmap_handle = gfx::CloneHandleForIPC(handle_.native_pixmap_handle); #endif diff --git a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 3e09a814dd32..54237c5c8921 100644 --- a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-06-25 12:08:48 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -774,7 +774,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -758,7 +758,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,21 +9,21 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1224,7 +1224,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - } +@@ -1234,7 +1234,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + gpu_memory_buffer->CloneHandle().io_surface.get()); #endif -#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 + is_webgpu_compatible = + gpu_memory_buffer->CloneHandle() + .native_pixmap_handle.supports_zero_copy_webgpu_import; +@@ -1250,7 +1250,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1241537): Always add the flag once the + // TODO(crbug.com/40194712): Always add the flag once the // OzoneImageBacking is by default turned on. if (base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc index 506b491f92b2..404780403a04 100644 --- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2024-02-04 14:46:08 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-06-25 12:08:48 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -153,7 +153,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -157,7 +157,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -478,7 +478,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -482,7 +482,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/iridium/files/patch-media_webrtc_audio__processor.cc b/www/iridium/files/patch-media_webrtc_audio__processor.cc index 5294b1a4358e..fb567e7392b0 100644 --- a/www/iridium/files/patch-media_webrtc_audio__processor.cc +++ b/www/iridium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2023-03-13 07:33:08 UTC +--- media/webrtc/audio_processor.cc.orig 2024-06-25 12:08:48 UTC +++ media/webrtc/audio_processor.cc -@@ -513,7 +513,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -513,7 +513,7 @@ std::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/files/patch-media_webrtc_helpers.cc b/www/iridium/files/patch-media_webrtc_helpers.cc index 82db463ad7d4..31ab894f12c6 100644 --- a/www/iridium/files/patch-media_webrtc_helpers.cc +++ b/www/iridium/files/patch-media_webrtc_helpers.cc @@ -1,11 +1,19 @@ ---- media/webrtc/helpers.cc.orig 2023-03-13 07:33:08 UTC +--- media/webrtc/helpers.cc.orig 2024-06-25 12:08:48 UTC +++ media/webrtc/helpers.cc -@@ -40,7 +40,7 @@ void ConfigAutomaticGainControl(const AudioProcessingS - apm_config.gain_controller2.enabled = false; +@@ -41,14 +41,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS return; } + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Use the Hybrid AGC setup, which combines the AGC1 input volume controller - // and the AGC2 digital adaptive controller. + const bool kInputVolumeAdjustmentOverrideAllowed = true; + #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + const bool kInputVolumeAdjustmentOverrideAllowed = false; + #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Use AGC2 digital and input volume controller. + // TODO(crbug.com/40872787): Remove `kWebRtcAllowInputVolumeAdjustment` safely + // and set `input_volume_controller.enabled` true. diff --git a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc index afe0efa8d20d..10c7e7308af5 100644 --- a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,24 +1,33 @@ ---- media/webrtc/helpers_unittests.cc.orig 2023-03-13 07:33:08 UTC +--- media/webrtc/helpers_unittests.cc.orig 2024-06-25 12:08:48 UTC +++ media/webrtc/helpers_unittests.cc -@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau - EXPECT_FALSE(config.pre_amplifier.enabled); +@@ -40,7 +40,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_TRUE(config.echo_canceller.enabled); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - EXPECT_TRUE(config.gain_controller1.enabled); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + EXPECT_FALSE(config.gain_controller1.enabled); EXPECT_TRUE(config.gain_controller2.enabled); - #elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -@@ -77,7 +77,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, - EXPECT_EQ(config.gain_controller2, kDefaultApmConfig.gain_controller2); + #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID) +@@ -73,7 +73,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, } + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + TEST(CreateWebRtcAudioProcessingModuleTest, + InputVolumeAdjustmentEnabledWithAgc2) { + ::base::test::ScopedFeatureList feature_list; +@@ -89,7 +89,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) TEST(CreateWebRtcAudioProcessingModuleTest, - InputVolumeAdjustmentEnabledWithHybridAgc) { + CanDisableInputVolumeAdjustmentWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -103,7 +103,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -106,7 +106,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-mojo_core_channel.cc b/www/iridium/files/patch-mojo_core_channel.cc index 8e4d3cc8f3ae..78d7dae245b8 100644 --- a/www/iridium/files/patch-mojo_core_channel.cc +++ b/www/iridium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2023-03-13 07:33:08 UTC +--- mojo/core/channel.cc.orig 2024-06-25 12:08:48 UTC +++ mojo/core/channel.cc -@@ -75,7 +75,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -71,7 +71,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/iridium/files/patch-mojo_public_c_system_thunks.cc b/www/iridium/files/patch-mojo_public_c_system_thunks.cc index ef3766cb135b..f6d11ee2d810 100644 --- a/www/iridium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/iridium/files/patch-mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- mojo/public/c/system/thunks.cc.orig 2023-11-22 14:00:11 UTC +--- mojo/public/c/system/thunks.cc.orig 2024-06-25 12:08:48 UTC +++ mojo/public/c/system/thunks.cc -@@ -24,7 +24,7 @@ +@@ -25,7 +25,7 @@ #include "mojo/public/c/system/message_pipe.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" -@@ -73,7 +73,7 @@ class CoreLibraryInitializer { +@@ -72,7 +72,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -18,7 +18,7 @@ if (library_ && library_->is_valid()) return MOJO_RESULT_OK; -@@ -87,7 +87,7 @@ class CoreLibraryInitializer { +@@ -86,7 +86,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -27,12 +27,12 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif BUILDFLAG(IS_FUCHSIA) -@@ -143,7 +143,7 @@ class CoreLibraryInitializer { +@@ -142,7 +142,7 @@ class CoreLibraryInitializer { private: #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - absl::optional<base::ScopedNativeLibrary> library_; + std::optional<base::ScopedNativeLibrary> library_; #endif }; diff --git a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni index 00a65ef2d02d..0632cb2bd708 100644 --- a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2024-02-04 14:46:08 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2024-06-25 12:08:48 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -758,6 +758,16 @@ template("mojom") { +@@ -746,6 +746,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } @@ -16,4 +16,4 @@ + action(parser_target_name) { allow_remote = true - custom_processor = "mojom_parser" + diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index a2d622107922..8edfb30b729d 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2024-01-25 17:17:56 UTC +--- net/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ net/BUILD.gn -@@ -122,7 +122,7 @@ net_configs = [ +@@ -123,7 +123,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,15 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1095,6 +1095,7 @@ component("net") { - ":net_deps", - "//build:chromeos_buildflags", - "//components/miracle_parameter/common", -+ "//media:media_buildflags", - "//net/http:transport_security_state_generated_files", - ] - -@@ -1240,6 +1241,19 @@ component("net") { +@@ -1200,6 +1200,19 @@ component("net") { ] } @@ -37,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1396,7 +1410,7 @@ component("net") { +@@ -1357,7 +1370,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -46,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2886,7 +2900,7 @@ test("net_unittests") { +@@ -2846,7 +2859,7 @@ test("net_unittests") { ] } @@ -55,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2974,6 +2988,10 @@ test("net_unittests") { +@@ -2934,6 +2947,10 @@ test("net_unittests") { ] } @@ -66,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3044,7 +3062,7 @@ test("net_unittests") { +@@ -2994,7 +3011,7 @@ test("net_unittests") { ] } @@ -75,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3179,7 +3197,7 @@ test("net_unittests") { +@@ -3130,7 +3147,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/iridium/files/patch-net_base_features.cc b/www/iridium/files/patch-net_base_features.cc index ff1a422855e7..078a9f4e3c70 100644 --- a/www/iridium/files/patch-net_base_features.cc +++ b/www/iridium/files/patch-net_base_features.cc @@ -1,15 +1,24 @@ ---- net/base/features.cc.orig 2024-02-04 14:46:08 UTC +--- net/base/features.cc.orig 2024-06-25 12:08:48 UTC +++ net/base/features.cc -@@ -468,7 +468,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, + BASE_FEATURE(kAsyncDns, + "AsyncDns", + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -516,7 +516,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); +#if BUILDFLAG(IS_OPENBSD) +// No IP_RECVTOS support - BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); +#else -+BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT); ++BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); +#endif - // TODO(crbug.com/634470): Remove this feature flag in January 2024 if the new - // limit sticks. + BASE_FEATURE(kUseNewAlpsCodepointHttp2, + "UseNewAlpsCodepointHttp2", diff --git a/www/iridium/files/patch-net_base_network__change__notifier.cc b/www/iridium/files/patch-net_base_network__change__notifier.cc index 7f4f176adda6..33cf1b2bfceb 100644 --- a/www/iridium/files/patch-net_base_network__change__notifier.cc +++ b/www/iridium/files/patch-net_base_network__change__notifier.cc @@ -1,9 +1,9 @@ ---- net/base/network_change_notifier.cc.orig 2023-07-24 14:27:53 UTC +--- net/base/network_change_notifier.cc.orig 2024-06-25 12:08:48 UTC +++ net/base/network_change_notifier.cc @@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) - #include "net/base/network_change_notifier_mac.h" + #include "net/base/network_change_notifier_apple.h" -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "net/base/network_change_notifier_passive.h" diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc.h b/www/iridium/files/patch-net_cert_cert__verify__proc.h index 8e17186753cd..5e118353cdae 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc.h +++ b/www/iridium/files/patch-net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.h.orig 2023-08-28 20:17:35 UTC +--- net/cert/cert_verify_proc.h.orig 2024-06-25 12:08:48 UTC +++ net/cert/cert_verify_proc.h -@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc +@@ -176,7 +176,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; diff --git a/www/iridium/files/patch-net_cert_pki_general__names.h b/www/iridium/files/patch-net_cert_pki_general__names.h deleted file mode 100644 index be26517abdb5..000000000000 --- a/www/iridium/files/patch-net_cert_pki_general__names.h +++ /dev/null @@ -1,10 +0,0 @@ ---- net/cert/pki/general_names.h.orig 2023-11-22 14:00:11 UTC -+++ net/cert/pki/general_names.h -@@ -8,6 +8,7 @@ - #include <memory> - #include <string_view> - #include <vector> -+#include <string> - - #include "net/base/net_export.h" - #include "net/cert/pki/cert_error_id.h" diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn index f30aaac0dd85..d6d9eb50daec 100644 --- a/www/iridium/files/patch-net_dns_BUILD.gn +++ b/www/iridium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2024-01-25 17:17:56 UTC +--- net/dns/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ net/dns/BUILD.gn -@@ -128,7 +128,7 @@ source_set("dns") { +@@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,17 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -162,6 +162,9 @@ source_set("dns") { - } - - deps = [ "//net:net_deps" ] -+ if (is_bsd) { -+ deps += [ "//components/services/screen_ai/buildflags" ] -+ } - - public_deps = [ - ":dns_client", -@@ -169,6 +172,7 @@ source_set("dns") { +@@ -179,6 +179,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -27,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -434,9 +438,9 @@ source_set("tests") { +@@ -447,9 +448,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/iridium/files/patch-net_dns_address__info.cc b/www/iridium/files/patch-net_dns_address__info.cc index 131c31564568..e582fa6ae9f3 100644 --- a/www/iridium/files/patch-net_dns_address__info.cc +++ b/www/iridium/files/patch-net_dns_address__info.cc @@ -1,6 +1,6 @@ ---- net/dns/address_info.cc.orig 2023-10-21 11:51:27 UTC +--- net/dns/address_info.cc.orig 2024-06-25 12:08:48 UTC +++ net/dns/address_info.cc -@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( +@@ -78,8 +78,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get( // error. // http://crbug.com/134142 err = ERR_NAME_NOT_RESOLVED; diff --git a/www/iridium/files/patch-net_dns_address__sorter__posix.cc b/www/iridium/files/patch-net_dns_address__sorter__posix.cc index 4416a63d9bee..af32754706f2 100644 --- a/www/iridium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/iridium/files/patch-net_dns_address__sorter__posix.cc @@ -1,4 +1,4 @@ ---- net/dns/address_sorter_posix.cc.orig 2023-07-24 14:27:53 UTC +--- net/dns/address_sorter_posix.cc.orig 2024-06-25 12:08:48 UTC +++ net/dns/address_sorter_posix.cc @@ -27,6 +27,7 @@ #include "net/dns/netinet_in_var_ios.h" @@ -7,4 +7,4 @@ +#include <netinet6/in6_var.h> #endif // BUILDFLAG(IS_IOS) #endif - + #include <vector> diff --git a/www/iridium/files/patch-net_dns_public_BUILD.gn b/www/iridium/files/patch-net_dns_public_BUILD.gn index 25e510860f23..74de88fd1a41 100644 --- a/www/iridium/files/patch-net_dns_public_BUILD.gn +++ b/www/iridium/files/patch-net_dns_public_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/public/BUILD.gn.orig 2023-11-22 14:00:11 UTC +--- net/dns/public/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ net/dns/public/BUILD.gn -@@ -77,7 +77,7 @@ source_set("tests") { +@@ -78,7 +78,7 @@ source_set("tests") { "doh_provider_entry_unittest.cc", ] diff --git a/www/iridium/files/patch-net_dns_public_scoped__res__state.h b/www/iridium/files/patch-net_dns_public_scoped__res__state.h index 209ac15b3566..3741eae536f8 100644 --- a/www/iridium/files/patch-net_dns_public_scoped__res__state.h +++ b/www/iridium/files/patch-net_dns_public_scoped__res__state.h @@ -1,4 +1,4 @@ ---- net/dns/public/scoped_res_state.h.orig 2022-03-28 18:11:04 UTC +--- net/dns/public/scoped_res_state.h.orig 2024-06-25 12:08:48 UTC +++ net/dns/public/scoped_res_state.h @@ -5,6 +5,7 @@ #ifndef NET_DNS_PUBLIC_SCOPED_RES_STATE_H_ @@ -7,4 +7,4 @@ +#include <netinet/in.h> #include <resolv.h> - #include "build/build_config.h" + #include <optional> diff --git a/www/iridium/files/patch-net_filter_zstd__source__stream.cc b/www/iridium/files/patch-net_filter_zstd__source__stream.cc index 84d24e809699..49266ce0d3bc 100644 --- a/www/iridium/files/patch-net_filter_zstd__source__stream.cc +++ b/www/iridium/files/patch-net_filter_zstd__source__stream.cc @@ -1,8 +1,8 @@ ---- net/filter/zstd_source_stream.cc.orig 2023-10-21 11:51:27 UTC +--- net/filter/zstd_source_stream.cc.orig 2024-06-25 12:08:48 UTC +++ net/filter/zstd_source_stream.cc -@@ -6,6 +6,7 @@ - +@@ -7,6 +7,7 @@ #include <algorithm> + #include <unordered_map> #include <utility> +#include <unordered_map> diff --git a/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc b/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc index 57487229e6b7..405ac02b01b1 100644 --- a/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc +++ b/www/iridium/files/patch-net_http_http__auth__handler__negotiate.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_handler_negotiate.cc.orig 2023-10-21 11:51:27 UTC +--- net/http/http_auth_handler_negotiate.cc.orig 2024-06-25 12:08:48 UTC +++ net/http/http_auth_handler_negotiate.cc -@@ -121,7 +121,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl +@@ -120,7 +120,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl #elif BUILDFLAG(IS_POSIX) if (is_unsupported_) return ERR_UNSUPPORTED_AUTH_SCHEME; diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 5f6739c44e93..cf65a208e53c 100644 --- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-07-24 14:27:53 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2024-06-25 12:08:48 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,15 +10,15 @@ #include <unistd.h> #include <map> -@@ -504,6 +506,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -505,6 +507,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) +#if !BUILDFLAG(IS_BSD) // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. - int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1032,6 +1035,7 @@ class SettingGetterImplKDE : public ProxyConfigService + int StringToIntOrDefault(std::string_view value, int default_value) { +@@ -1033,6 +1036,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr<base::SequencedTaskRunner> file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1249,9 +1253,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1251,9 +1255,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: case base::nix::DESKTOP_ENVIRONMENT_KDE6: diff --git a/www/iridium/files/patch-net_socket_udp__socket__posix.cc b/www/iridium/files/patch-net_socket_udp__socket__posix.cc index e0ce6d3c6e45..e0f9b0b2c507 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2024-02-04 14:46:08 UTC +--- net/socket/udp_socket_posix.cc.orig 2024-06-25 12:08:48 UTC +++ net/socket/udp_socket_posix.cc -@@ -612,12 +612,17 @@ int UDPSocketPosix::SetRecvEcn() { +@@ -516,12 +516,17 @@ int UDPSocketPosix::SetRecvTos() { } } @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -638,7 +643,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -542,7 +547,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -28,7 +28,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -951,7 +956,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -880,7 +885,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc index 87c95f699c2c..6ec79379aba3 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2023-04-22 17:45:15 UTC +--- net/socket/udp_socket_unittest.cc.orig 2024-06-25 12:08:48 UTC +++ net/socket/udp_socket_unittest.cc -@@ -345,7 +345,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -358,7 +358,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } @@ -9,34 +9,34 @@ // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). -@@ -656,7 +656,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -669,7 +669,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. + // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -684,7 +684,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { +@@ -697,7 +697,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. + // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #elif BUILDFLAG(IS_MAC) -@@ -749,7 +749,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { +@@ -762,7 +762,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { - // TODO(https://crbug.com/947115): failing on device on iOS 12.2. - // TODO(https://crbug.com/1227554): flaky on Mac 11. + // TODO(crbug.com/40620614): failing on device on iOS 12.2. + // TODO(crbug.com/40189274): flaky on Mac 11. -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -803,7 +803,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -816,7 +816,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc index ce52d494cc77..b9bd311db83e 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-11-22 14:00:11 UTC +--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2024-06-25 12:08:48 UTC +++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc -@@ -34,7 +34,7 @@ +@@ -36,7 +36,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -54,7 +54,7 @@ void SetUpOnNetworkThread( +@@ -56,7 +56,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,9 +18,9 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -125,7 +125,7 @@ class CertVerifyImpl { +@@ -124,7 +124,7 @@ class CertVerifyImpl { std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( - base::StringPiece impl_name, + std::string_view impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { -#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ +#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index b6fcc6f9fe03..7fb1b9d71ef7 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,15 +1,15 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-02-04 14:46:08 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-06-25 12:08:48 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -31,7 +31,7 @@ - #include "net/url_request/url_request_context_builder.h" - #include "net/url_request/url_request_context_getter.h" +@@ -34,7 +34,7 @@ + #include "third_party/boringssl/src/pki/trust_store.h" + #include "third_party/boringssl/src/pki/trust_store_collection.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -63,7 +63,7 @@ void SetUpOnNetworkThread( +@@ -66,7 +66,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -545,7 +545,7 @@ int main(int argc, char** argv) { +@@ -571,7 +571,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc b/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc index 9ff5e566ca60..f89843b9f3f6 100644 --- a/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc +++ b/www/iridium/files/patch-net_tools_net__watcher_net__watcher.cc @@ -1,4 +1,4 @@ ---- net/tools/net_watcher/net_watcher.cc.orig 2023-03-13 07:33:08 UTC +--- net/tools/net_watcher/net_watcher.cc.orig 2024-06-25 12:08:48 UTC +++ net/tools/net_watcher/net_watcher.cc @@ -32,7 +32,7 @@ #include "net/proxy_resolution/proxy_config_service.h" @@ -11,7 +11,7 @@ @@ -44,7 +44,7 @@ namespace { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h index 483b08b6b468..04ec511f1f33 100644 --- a/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h +++ b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -1,4 +1,4 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2022-10-05 07:34:01 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2024-06-25 12:08:48 UTC +++ net/traffic_annotation/network_traffic_annotation.h @@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net @@ -10,7 +10,7 @@ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif @@ -387,7 +387,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ - !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/iridium/files/patch-net_url__request_url__request__context.cc b/www/iridium/files/patch-net_url__request_url__request__context.cc index 2237de65f8c1..6055dd0543c3 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context.cc @@ -1,7 +1,7 @@ ---- net/url_request/url_request_context.cc.orig 2023-01-17 19:19:00 UTC +--- net/url_request/url_request_context.cc.orig 2024-06-25 12:08:48 UTC +++ net/url_request/url_request_context.cc -@@ -109,7 +109,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is +@@ -121,7 +121,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge + // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ - !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/iridium/files/patch-net_url__request_url__request__context.h b/www/iridium/files/patch-net_url__request_url__request__context.h index 1a76db08d0a4..f7a7cb348117 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context.h +++ b/www/iridium/files/patch-net_url__request_url__request__context.h @@ -1,7 +1,7 @@ ---- net/url_request/url_request_context.h.orig 2023-01-17 19:19:00 UTC +--- net/url_request/url_request_context.h.orig 2024-06-25 12:08:48 UTC +++ net/url_request/url_request_context.h -@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext final { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is +@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext final { + // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ - !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc index be5a658ebf6a..343309c027a3 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2023-10-21 11:51:27 UTC +--- net/url_request/url_request_context_builder.cc.orig 2024-06-25 12:08:48 UTC +++ net/url_request/url_request_context_builder.cc -@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -439,7 +439,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc index ab2f92021835..6198da62e3cf 100644 --- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2023-08-28 20:17:35 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2024-06-25 12:08:48 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -83,7 +83,7 @@ +@@ -87,7 +87,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -525,7 +525,7 @@ void InitializeSDK(bool enable_v8, +@@ -512,7 +512,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc b/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc index 0dc67c24e063..75be1af4504d 100644 --- a/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc +++ b/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc @@ -1,6 +1,6 @@ ---- printing/backend/cups_ipp_helper.cc.orig 2023-10-21 11:51:27 UTC +--- printing/backend/cups_ipp_helper.cc.orig 2024-06-25 12:08:48 UTC +++ printing/backend/cups_ipp_helper.cc -@@ -215,7 +215,7 @@ void ExtractResolutions(const CupsOptionProvider& prin +@@ -202,7 +202,7 @@ void ExtractResolutions(const CupsOptionProvider& prin // Provide a default DPI if no valid DPI is found. #if BUILDFLAG(IS_MAC) constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi); diff --git a/www/iridium/files/patch-printing_print__settings__conversion.cc b/www/iridium/files/patch-printing_print__settings__conversion.cc index 8bee0b431b30..e650576f9000 100644 --- a/www/iridium/files/patch-printing_print__settings__conversion.cc +++ b/www/iridium/files/patch-printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- printing/print_settings_conversion.cc.orig 2023-10-21 11:51:27 UTC +--- printing/print_settings_conversion.cc.orig 2024-06-25 12:08:48 UTC +++ printing/print_settings_conversion.cc -@@ -287,7 +287,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -285,7 +285,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } diff --git a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc index cc8b0c6fb09c..e8302ed55fc6 100644 --- a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-07-24 14:27:53 UTC +--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2024-06-25 12:08:48 UTC +++ printing/sandbox/print_backend_sandbox_hook_linux.cc @@ -10,20 +10,27 @@ #include "base/path_service.h" @@ -40,8 +40,8 @@ #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS) // Create the socket connections to the CUPS server before engaging the // sandbox, since new connections cannot be made after that. -@@ -92,6 +101,7 @@ bool PrintBackendPreSandboxHook( - sandbox::policy::SandboxLinux::PreSandboxHook(), options); +@@ -91,6 +100,7 @@ bool PrintBackendPreSandboxHook( + GetPrintBackendFilePermissions(), options); instance->EngageNamespaceSandboxIfPossible(); +#endif diff --git a/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc index d3ab95944f57..cf7e5c550443 100644 --- a/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc +++ b/www/iridium/files/patch-remoting_host_base_desktop__environment__options.cc @@ -1,6 +1,6 @@ ---- remoting/host/base/desktop_environment_options.cc.orig 2023-03-13 07:33:08 UTC +--- remoting/host/base/desktop_environment_options.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/base/desktop_environment_options.cc -@@ -119,7 +119,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic +@@ -124,7 +124,7 @@ bool DesktopEnvironmentOptions::capture_video_on_dedic // TODO(joedow): Determine whether we can migrate additional platforms to // using the DesktopCaptureWrapper instead of the DesktopCaptureProxy. Then // clean up DesktopCapturerProxy::Core::CreateCapturer(). diff --git a/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc index cadcb1a4a482..459f59173b9d 100644 --- a/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/basic_desktop_environment.cc.orig 2023-08-28 20:17:35 UTC +--- remoting/host/basic_desktop_environment.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/basic_desktop_environment.cc -@@ -195,7 +195,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { +@@ -195,7 +195,7 @@ std::unique_ptr<DesktopCapturer> BasicDesktopEnvironme scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; #if BUILDFLAG(IS_CHROMEOS_ASH) capture_task_runner = ui_task_runner_; diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.cc b/www/iridium/files/patch-remoting_host_chromoting__host.cc index 82e08a18215f..3a0ec6884e58 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host.cc +++ b/www/iridium/files/patch-remoting_host_chromoting__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host.cc.orig 2023-10-21 11:51:27 UTC +--- remoting/host/chromoting_host.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/chromoting_host.cc -@@ -128,7 +128,7 @@ void ChromotingHost::Start(const std::string& host_own +@@ -129,7 +129,7 @@ void ChromotingHost::Start(const std::string& host_own &ChromotingHost::OnIncomingSession, base::Unretained(this))); } diff --git a/www/iridium/files/patch-remoting_host_desktop__capturer__proxy.cc b/www/iridium/files/patch-remoting_host_desktop__capturer__proxy.cc index d8e67982c787..b2c00ac2493a 100644 --- a/www/iridium/files/patch-remoting_host_desktop__capturer__proxy.cc +++ b/www/iridium/files/patch-remoting_host_desktop__capturer__proxy.cc @@ -1,4 +1,4 @@ ---- remoting/host/desktop_capturer_proxy.cc.orig 2023-08-28 20:17:35 UTC +--- remoting/host/desktop_capturer_proxy.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/desktop_capturer_proxy.cc @@ -26,7 +26,7 @@ #include "remoting/host/chromeos/frame_sink_desktop_capturer.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #include "remoting/host/linux/wayland_desktop_capturer.h" -@@ -89,7 +89,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( +@@ -91,7 +91,7 @@ void DesktopCapturerProxy::Core::CreateCapturer( #if BUILDFLAG(IS_CHROMEOS_ASH) capturer_ = std::make_unique<FrameSinkDesktopCapturer>(); @@ -18,7 +18,7 @@ static base::nix::SessionType session_type = base::nix::SessionType::kUnset; if (session_type == base::nix::SessionType::kUnset) { std::unique_ptr<base::Environment> env = base::Environment::Create(); -@@ -293,7 +293,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC +@@ -298,7 +298,7 @@ void DesktopCapturerProxy::OnMetadata(webrtc::DesktopC bool DesktopCapturerProxy::SupportsFrameCallbacks() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc b/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc index 6a0fb1de70ca..c12e9d51a0de 100644 --- a/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc +++ b/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc @@ -1,4 +1,4 @@ ---- remoting/host/desktop_capturer_wrapper.cc.orig 2023-07-24 14:27:53 UTC +--- remoting/host/desktop_capturer_wrapper.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/desktop_capturer_wrapper.cc @@ -13,7 +13,7 @@ #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" @@ -9,8 +9,8 @@ #include "remoting/host/linux/wayland_desktop_capturer.h" #include "remoting/host/linux/wayland_utils.h" #endif -@@ -32,7 +32,7 @@ void DesktopCapturerWrapper::CreateCapturer( - const webrtc::DesktopCaptureOptions& options) { +@@ -33,7 +33,7 @@ void DesktopCapturerWrapper::CreateCapturer( + SourceId id) { DCHECK(!capturer_); -#if BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ if (IsRunningWayland()) { capturer_ = std::make_unique<WaylandDesktopCapturer>(options); } else { -@@ -109,7 +109,7 @@ void DesktopCapturerWrapper::OnCaptureResult( +@@ -112,7 +112,7 @@ void DesktopCapturerWrapper::OnCaptureResult( bool DesktopCapturerWrapper::SupportsFrameCallbacks() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/www/iridium/files/patch-remoting_host_evaluate__capability.cc b/www/iridium/files/patch-remoting_host_evaluate__capability.cc index 19a41c080c1d..6de19755f73b 100644 --- a/www/iridium/files/patch-remoting_host_evaluate__capability.cc +++ b/www/iridium/files/patch-remoting_host_evaluate__capability.cc @@ -1,6 +1,6 @@ ---- remoting/host/evaluate_capability.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/evaluate_capability.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/evaluate_capability.cc -@@ -55,7 +55,7 @@ base::FilePath BuildHostBinaryPath() { +@@ -56,7 +56,7 @@ base::FilePath BuildHostBinaryPath() { } #endif diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc index 6806df750efa..cc434042973d 100644 --- a/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2023-10-21 11:51:27 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/it2me/it2me_host.cc -@@ -49,7 +49,7 @@ +@@ -52,7 +52,7 @@ #include "remoting/host/chromeos/features.h" #endif @@ -9,7 +9,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -121,7 +121,7 @@ void It2MeHost::Connect( +@@ -178,7 +178,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -18,7 +18,7 @@ if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -261,7 +261,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -338,7 +338,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); diff --git a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc index 27b29124a00c..d1e45325a273 100644 --- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,4 +1,4 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2024-02-04 14:46:08 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/me2me_desktop_environment.cc @@ -125,7 +125,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() capabilities += protocol::kRemoteWebAuthnCapability; @@ -9,7 +9,7 @@ if (!IsRunningWayland()) { capabilities += " "; capabilities += protocol::kMultiStreamCapability; -@@ -171,7 +171,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( +@@ -167,7 +167,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( // properly under Xvfb. mutable_desktop_capture_options()->set_use_update_notifications(true); @@ -18,7 +18,7 @@ // Setting this option to false means that the capture differ wrapper will not // be used when the X11 capturer is selected. This reduces the X11 capture // time by a few milliseconds per frame and is safe because we can rely on -@@ -180,7 +180,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( +@@ -176,7 +176,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( mutable_desktop_capture_options()->set_detect_updated_region(false); #endif @@ -27,7 +27,7 @@ if (IsRunningWayland()) { mutable_desktop_capture_options()->set_prefer_cursor_embedded(false); } -@@ -205,7 +205,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -201,7 +201,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/iridium/files/patch-remoting_host_policy__watcher.cc b/www/iridium/files/patch-remoting_host_policy__watcher.cc index 652b38d53025..8c7593699797 100644 --- a/www/iridium/files/patch-remoting_host_policy__watcher.cc +++ b/www/iridium/files/patch-remoting_host_policy__watcher.cc @@ -1,6 +1,6 @@ ---- remoting/host/policy_watcher.cc.orig 2024-02-04 14:46:08 UTC +--- remoting/host/policy_watcher.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/policy_watcher.cc -@@ -191,7 +191,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() +@@ -192,7 +192,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() true); result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); #endif diff --git a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc index f468f1820d31..2194248c24eb 100644 --- a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2024-02-04 14:46:08 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -127,7 +127,7 @@ +@@ -132,7 +132,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #endif // defined(REMOTING_USE_X11) -@@ -138,13 +138,13 @@ +@@ -143,13 +143,13 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -157,7 +157,7 @@ +@@ -162,7 +162,7 @@ #include "remoting/host/win/session_desktop_environment.h" #endif // BUILDFLAG(IS_WIN) @@ -34,7 +34,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -187,7 +187,7 @@ const char kApplicationName[] = "chromoting"; +@@ -192,7 +192,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -394,7 +394,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -401,7 +401,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -52,7 +52,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -463,7 +463,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -471,7 +471,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -61,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -772,7 +772,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -783,7 +783,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,7 +70,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -833,7 +833,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -849,7 +849,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -79,7 +79,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -952,13 +952,13 @@ void HostProcess::StartOnUiThread() { +@@ -974,13 +974,13 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -95,7 +95,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1030,7 +1030,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1052,7 +1052,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -104,7 +104,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. -@@ -1038,7 +1038,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1060,7 +1060,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,25 +113,25 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1391,7 +1391,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1418,7 +1418,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // 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 = + std::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1800,7 +1800,7 @@ void HostProcess::StartHost() { - // won't be advertised if it's missing a registry key or something. - desktop_environment_options_.set_enable_remote_open_url(true); +@@ -1882,7 +1882,7 @@ void HostProcess::StartHost() { + corp_host_status_logger_->StartObserving(*session_manager); + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1833,7 +1833,7 @@ void HostProcess::StartHost() { +@@ -1915,7 +1915,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -140,7 +140,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1865,7 +1865,7 @@ void HostProcess::StartHost() { +@@ -1947,7 +1947,7 @@ void HostProcess::StartHost() { host_->Start(host_owner_); @@ -149,7 +149,7 @@ // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -1998,7 +1998,7 @@ int HostProcessMain() { +@@ -2081,7 +2081,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -158,7 +158,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 ...) -@@ -2047,7 +2047,7 @@ int HostProcessMain() { +@@ -2130,7 +2130,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc index 0abaab168139..556178da33d9 100644 --- a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/setup/start_host_main.cc.orig 2024-02-04 14:46:08 UTC +--- remoting/host/setup/start_host_main.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/setup/start_host_main.cc -@@ -36,7 +36,7 @@ +@@ -37,7 +37,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) -@@ -242,7 +242,7 @@ bool InitializeCorpMachineParams(HostStarter::Params& +@@ -339,7 +339,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& } // 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); -@@ -274,7 +274,7 @@ int StartHostMain(int argc, char** argv) { +@@ -364,7 +364,7 @@ int StartHostMain(int argc, char** argv) { mojo::core::Init(); diff --git a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc index 504812a01bd9..184567e41535 100644 --- a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc +++ b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc @@ -1,6 +1,6 @@ ---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2022-12-01 10:35:46 UTC +--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc -@@ -9,7 +9,7 @@ +@@ -10,7 +10,7 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "base/containers/fixed_flat_set.h" #include "base/files/file_path.h" #include "base/process/process_handle.h" -@@ -37,7 +37,7 @@ namespace { +@@ -38,7 +38,7 @@ namespace { // No static variables needed for debug builds. @@ -18,7 +18,7 @@ constexpr auto kAllowedCallerPrograms = base::MakeFixedFlatSet<base::FilePath::StringPieceType>({ -@@ -81,7 +81,7 @@ bool IsLaunchedByTrustedProcess() { +@@ -82,7 +82,7 @@ bool IsLaunchedByTrustedProcess() { #if !defined(NDEBUG) // Just return true on debug builds for the convenience of development. return true; diff --git a/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc index f95b577c8a3e..ac07e0d56844 100644 --- a/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc +++ b/www/iridium/files/patch-remoting_protocol_webrtc__video__stream.cc @@ -1,7 +1,7 @@ ---- remoting/protocol/webrtc_video_stream.cc.orig 2024-02-04 14:46:08 UTC +--- remoting/protocol/webrtc_video_stream.cc.orig 2024-06-25 12:08:48 UTC +++ remoting/protocol/webrtc_video_stream.cc -@@ -263,7 +263,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string - : stream_name_(stream_name), session_options_(session_options) { +@@ -267,7 +267,7 @@ WebrtcVideoStream::WebrtcVideoStream(const SessionOpti + : session_options_(session_options) { // TODO(joedow): Dig into the threading model on other platforms to see if they // can also be updated to run on a dedicated thread. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-remoting_resources_remoting__strings.grd b/www/iridium/files/patch-remoting_resources_remoting__strings.grd deleted file mode 100644 index 096d925f8274..000000000000 --- a/www/iridium/files/patch-remoting_resources_remoting__strings.grd +++ /dev/null @@ -1,20 +0,0 @@ ---- remoting/resources/remoting_strings.grd.orig 2022-10-05 07:34:01 UTC -+++ remoting/resources/remoting_strings.grd -@@ -955,7 +955,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. - <message name="IDS_URL_FORWARDER_INCORRECTLY_CONFIGURED" desc="Message shown when the Chrome Remote Desktop URL forwarder is incorrectly configured."> - <ph name="URL_FORWARDER_NAME">%s<ex>Chrome Remote Desktop URL Forwarder</ex></ph> is not configured correctly. Please choose a different default web browser and then enable URL forwarding again. - </message> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog."> - Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.) - </message> -@@ -971,7 +971,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. - <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session."> - Launch the default XSession - </message> -- </if> <!-- is_linux --> -+ </if> <!-- is_posix --> - </messages> - </release> - </grit> diff --git a/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc index 7e496b97fa85..1aff3bf33422 100644 --- a/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2023-10-21 11:51:27 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2024-06-25 12:08:48 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -12,7 +12,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -167,7 +169,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -168,7 +170,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/iridium/files/patch-sandbox_policy_BUILD.gn b/www/iridium/files/patch-sandbox_policy_BUILD.gn index ad68394297ad..7b34d000b2d6 100644 --- a/www/iridium/files/patch-sandbox_policy_BUILD.gn +++ b/www/iridium/files/patch-sandbox_policy_BUILD.gn @@ -1,7 +1,7 @@ ---- sandbox/policy/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- sandbox/policy/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ sandbox/policy/BUILD.gn -@@ -48,7 +48,7 @@ component("policy") { - "//sandbox/linux:seccomp_bpf", +@@ -49,7 +49,7 @@ component("policy") { + "//third_party/jni_zero", ] } - if (is_linux || is_chromeos) { @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -119,6 +119,27 @@ component("policy") { +@@ -120,6 +120,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/iridium/files/patch-sandbox_policy_features.cc b/www/iridium/files/patch-sandbox_policy_features.cc index 10d761aab6f5..c29c3dfd0bc5 100644 --- a/www/iridium/files/patch-sandbox_policy_features.cc +++ b/www/iridium/files/patch-sandbox_policy_features.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/features.cc.orig 2023-11-22 14:00:11 UTC +--- sandbox/policy/features.cc.orig 2024-06-25 12:08:48 UTC +++ sandbox/policy/features.cc -@@ -19,7 +19,11 @@ namespace sandbox::policy::features { +@@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) BASE_FEATURE(kNetworkServiceSandbox, "NetworkServiceSandbox", @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. -@@ -126,7 +130,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, +@@ -131,7 +135,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-sandbox_policy_features.h b/www/iridium/files/patch-sandbox_policy_features.h index 9e86b8b95ef9..7417f06ed23d 100644 --- a/www/iridium/files/patch-sandbox_policy_features.h +++ b/www/iridium/files/patch-sandbox_policy_features.h @@ -1,4 +1,4 @@ ---- sandbox/policy/features.h.orig 2023-11-22 14:00:11 UTC +--- sandbox/policy/features.h.orig 2024-06-25 12:08:48 UTC +++ sandbox/policy/features.h @@ -44,7 +44,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE( kForceDisableSpectreVariant2MitigationInNetworkService); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 35912488c671..97edfbca0608 100644 --- a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2023-07-24 14:27:53 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2024-06-25 12:08:48 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,420 @@ +@@ -0,0 +1,424 @@ +// 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. @@ -63,7 +63,8 @@ + +#include "third_party/boringssl/src/include/openssl/crypto.h" + -+#include "ui/gfx/font_util.h" ++#include <fontconfig/fontconfig.h> ++#include "ui/gfx/linux/fontconfig_util.h" + +#define MAXTOKENS 3 + @@ -146,8 +147,11 @@ + break; + } + case sandbox::mojom::Sandbox::kRenderer: -+ gfx::InitializeFonts(); ++ { ++ FcConfig* config = gfx::GetGlobalFontConfig(); ++ DCHECK(config); + break; ++ } + default: + break; + } diff --git a/www/iridium/files/patch-sandbox_policy_sandbox.cc b/www/iridium/files/patch-sandbox_policy_sandbox.cc index 9bf0081f297a..47a589fb1847 100644 --- a/www/iridium/files/patch-sandbox_policy_sandbox.cc +++ b/www/iridium/files/patch-sandbox_policy_sandbox.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox.cc.orig 2023-07-24 14:27:53 UTC +--- sandbox/policy/sandbox.cc.orig 2024-06-25 12:08:48 UTC +++ sandbox/policy/sandbox.cc @@ -18,6 +18,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" #endif // BUILDFLAG(IS_MAC) -@@ -31,7 +35,7 @@ +@@ -32,7 +36,7 @@ namespace sandbox { namespace policy { diff --git a/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc index ab63b83cf8fd..5704d570b6e0 100644 --- a/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- services/audio/audio_sandbox_hook_linux.cc.orig 2023-10-21 11:51:27 UTC +--- services/audio/audio_sandbox_hook_linux.cc.orig 2024-06-25 12:08:48 UTC +++ services/audio/audio_sandbox_hook_linux.cc @@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions( } @@ -21,8 +21,8 @@ LoadAudioLibraries(); auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess(MakeBrokerCommandSet({ -@@ -194,6 +197,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux - // TODO(https://crbug.com/850878) enable namespace sandbox. Currently, if +@@ -192,6 +195,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux + // TODO(crbug.com/40579955) enable namespace sandbox. Currently, if // enabled, connect() on pulse native socket fails with ENOENT (called from // pa_context_connect). +#endif diff --git a/www/iridium/files/patch-services_device_BUILD.gn b/www/iridium/files/patch-services_device_BUILD.gn index ada20a9454e2..aaaa59e8f586 100644 --- a/www/iridium/files/patch-services_device_BUILD.gn +++ b/www/iridium/files/patch-services_device_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/BUILD.gn.orig 2023-11-22 14:00:11 UTC +--- services/device/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/device/BUILD.gn -@@ -13,7 +13,7 @@ if (is_android) { +@@ -14,7 +14,7 @@ if (is_android) { } is_serial_enabled_platform = diff --git a/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc b/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc deleted file mode 100644 index ef70ec0f83cc..000000000000 --- a/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- services/device/compute_pressure/cpu_probe.cc.orig 2023-07-24 14:27:53 UTC -+++ services/device/compute_pressure/cpu_probe.cc -@@ -44,6 +44,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create( - #elif BUILDFLAG(IS_MAC) - return CpuProbeMac::Create(sampling_interval, std::move(sampling_callback)); - #else -+ NOTIMPLEMENTED(); - return nullptr; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } diff --git a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc deleted file mode 100644 index e6dea76bccfe..000000000000 --- a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2024-02-04 14:46:08 UTC -+++ services/device/geolocation/location_arbitrator.cc -@@ -193,7 +193,7 @@ LocationArbitrator::NewNetworkLocationProvider( - - std::unique_ptr<LocationProvider> - LocationArbitrator::NewSystemLocationProvider() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - return nullptr; - #else - return device::NewSystemLocationProvider(main_task_runner_, diff --git a/www/iridium/files/patch-services_device_hid_BUILD.gn b/www/iridium/files/patch-services_device_hid_BUILD.gn index 783069789850..65ced4bf3fc2 100644 --- a/www/iridium/files/patch-services_device_hid_BUILD.gn +++ b/www/iridium/files/patch-services_device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/hid/BUILD.gn.orig 2023-07-24 14:27:53 UTC +--- services/device/hid/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/device/hid/BUILD.gn -@@ -34,7 +34,26 @@ source_set("hid") { +@@ -36,7 +36,26 @@ source_set("hid") { "//services/device/public/mojom", ] diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc index e85a5b864985..db2fcb8158f2 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc +++ b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc @@ -1,4 +1,4 @@ ---- services/device/hid/hid_connection_fido.cc.orig 2023-03-13 07:33:08 UTC +--- services/device/hid/hid_connection_fido.cc.orig 2024-06-25 12:08:48 UTC +++ services/device/hid/hid_connection_fido.cc @@ -0,0 +1,216 @@ +// Copyright 2014 The Chromium Authors @@ -61,7 +61,7 @@ + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + -+ auto data = buffer->front(); ++ auto data = buffer->data(); + size_t size = buffer->size(); + // if report id is 0, it shouldn't be included + if (data[0] == 0) { @@ -112,7 +112,7 @@ + + auto buffer = + base::MakeRefCounted<base::RefCountedBytes>(report_buffer_size_); -+ uint8_t* data = buffer->front(); ++ uint8_t* data = buffer->as_vector().data(); + size_t length = report_buffer_size_; + if (!has_report_id_) { + // Fido will not prefix the buffer with a report ID if report IDs are not @@ -197,7 +197,7 @@ + DCHECK_GT(device_info()->max_feature_report_size(), 0u); + auto buffer = base::MakeRefCounted<base::RefCountedBytes>( + device_info()->max_feature_report_size() + 1); -+ buffer->data()[0] = report_id; ++ buffer->as_vector().data()[0] = report_id; + + blocking_task_runner_->PostTask( + FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport, diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc index 0f7500c019d0..44bf222c5da0 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc +++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc @@ -1,4 +1,4 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2023-04-22 17:45:15 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2024-06-25 12:08:48 UTC +++ services/device/hid/hid_connection_freebsd.cc @@ -0,0 +1,240 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. @@ -59,7 +59,7 @@ + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + -+ auto data = buffer->front(); ++ auto data = buffer->as_vector().data(); + size_t size = buffer->size(); + // if report id is 0, it shouldn't be included + if (data[0] == 0) { @@ -86,7 +86,7 @@ + FROM_HERE, base::BlockingType::MAY_BLOCK); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; -+ ugd.ugd_data = buffer->front(); ++ ugd.ugd_data = buffer->as_vector().data(); + ugd.ugd_maxlen = buffer->size(); + int result = HANDLE_EINTR( + ioctl(fd_.get(), USB_GET_REPORT, &ugd)); @@ -109,14 +109,14 @@ + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; -+ ugd.ugd_data = buffer->front(); ++ ugd.ugd_data = buffer->as_vector().data(); + ugd.ugd_maxlen = buffer->size(); + // FreeBSD does not require report id if it's not used -+ if (buffer->front()[0] == 0) { -+ ugd.ugd_data = buffer->front() + 1; ++ if (buffer->data()[0] == 0) { ++ ugd.ugd_data = buffer->as_vector().data() + 1; + ugd.ugd_maxlen = buffer->size() - 1; + } else { -+ ugd.ugd_data = buffer->front(); ++ ugd.ugd_data = buffer->as_vector().data(); + ugd.ugd_maxlen = buffer->size(); + } + int result = HANDLE_EINTR( @@ -136,7 +136,7 @@ + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + scoped_refptr<base::RefCountedBytes> buffer(new base::RefCountedBytes(report_buffer_size_)); -+ unsigned char* data = buffer->front(); ++ unsigned char* data = buffer->as_vector().data(); + size_t length = report_buffer_size_; + if (!has_report_id_) { + // FreeBSD will not prefix the buffer with a report ID if report IDs are not @@ -220,7 +220,7 @@ + scoped_refptr<base::RefCountedBytes> buffer( + new base::RefCountedBytes(device_info()->max_feature_report_size() + 1)); + if (report_id != 0) -+ buffer->data()[0] = report_id; ++ buffer->as_vector().data()[0] = report_id; + + blocking_task_runner_->PostTask( + FROM_HERE, diff --git a/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h b/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h index c23506ea8633..87f0fc5ece45 100644 --- a/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h +++ b/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h @@ -1,4 +1,4 @@ ---- services/device/public/cpp/generic_sensor/sensor_reading.h.orig 2023-11-22 14:00:11 UTC +--- services/device/public/cpp/generic_sensor/sensor_reading.h.orig 2024-06-25 12:08:48 UTC +++ services/device/public/cpp/generic_sensor/sensor_reading.h @@ -8,6 +8,8 @@ #include <stddef.h> @@ -7,5 +7,5 @@ +#include <cstdint> + #include <type_traits> - #include <stdint.h> - #include <cstddef> + + namespace device { diff --git a/www/iridium/files/patch-services_device_public_mojom_BUILD.gn b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn index 66f3f297e63c..657eeb96d47d 100644 --- a/www/iridium/files/patch-services_device_public_mojom_BUILD.gn +++ b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- services/device/public/mojom/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/device/public/mojom/BUILD.gn -@@ -97,7 +97,7 @@ mojom("device_service") { +@@ -96,7 +96,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/iridium/files/patch-services_device_usb_BUILD.gn b/www/iridium/files/patch-services_device_usb_BUILD.gn index 139cff475b98..6d647c4d9198 100644 --- a/www/iridium/files/patch-services_device_usb_BUILD.gn +++ b/www/iridium/files/patch-services_device_usb_BUILD.gn @@ -1,33 +1,15 @@ ---- services/device/usb/BUILD.gn.orig 2023-11-22 14:00:11 UTC +--- services/device/usb/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/device/usb/BUILD.gn -@@ -90,15 +90,17 @@ static_library("usb") { +@@ -91,7 +91,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] } - if (is_mac) { -- sources += [ -- "usb_device_handle_mac.cc", -- "usb_device_handle_mac.h", -- "usb_device_mac.cc", -- "usb_device_mac.h", -- "usb_service_mac.cc", -- "usb_service_mac.h", -- ] + if (is_mac || is_openbsd) { -+ if (is_mac) { -+ sources += [ -+ "usb_device_handle_mac.cc", -+ "usb_device_handle_mac.h", -+ "usb_device_mac.cc", -+ "usb_device_mac.h", -+ "usb_service_mac.cc", -+ "usb_service_mac.h", -+ ] -+ } - # These sources and deps are required for libusb. - # TODO(https://crbug.com/1096743) Remove these sources. -@@ -122,6 +124,13 @@ static_library("usb") { + # TODO(crbug.com/40136337) Remove these sources. + sources += [ +@@ -114,6 +114,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -41,7 +23,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -139,7 +148,7 @@ static_library("usb") { +@@ -131,7 +138,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/iridium/files/patch-services_device_usb_usb__service.cc b/www/iridium/files/patch-services_device_usb_usb__service.cc index 5977ba3681d3..fb594c55debf 100644 --- a/www/iridium/files/patch-services_device_usb_usb__service.cc +++ b/www/iridium/files/patch-services_device_usb_usb__service.cc @@ -1,6 +1,6 @@ ---- services/device/usb/usb_service.cc.orig 2022-12-01 10:35:46 UTC +--- services/device/usb/usb_service.cc.orig 2024-06-25 12:08:48 UTC +++ services/device/usb/usb_service.cc -@@ -22,13 +22,17 @@ +@@ -20,12 +20,16 @@ #if BUILDFLAG(IS_ANDROID) #include "services/device/usb/usb_service_android.h" @@ -9,7 +9,6 @@ #include "services/device/usb/usb_service_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/usb/usb_service_impl.h" - #include "services/device/usb/usb_service_mac.h" #elif BUILDFLAG(IS_WIN) #include "services/device/usb/usb_service_win.h" +#elif BUILDFLAG(IS_OPENBSD) @@ -19,7 +18,7 @@ #endif namespace device { -@@ -51,7 +55,7 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr +@@ -48,11 +52,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr std::unique_ptr<UsbService> UsbService::Create() { #if BUILDFLAG(IS_ANDROID) return base::WrapUnique(new UsbServiceAndroid()); @@ -28,12 +27,9 @@ return base::WrapUnique(new UsbServiceLinux()); #elif BUILDFLAG(IS_WIN) return base::WrapUnique(new UsbServiceWin()); -@@ -60,6 +64,8 @@ std::unique_ptr<UsbService> UsbService::Create() { - return base::WrapUnique(new UsbServiceMac()); - else - return base::WrapUnique(new UsbServiceImpl()); -+#elif BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_MAC) + return base::WrapUnique(new UsbServiceImpl()); ++#elif BUILDFLAG(IS_BSD) + return base::WrapUnique(new UsbServiceImpl()); #else return nullptr; - #endif diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index 1043c3dadb9e..75ad6741bf2e 100644 --- a/www/iridium/files/patch-services_network_BUILD.gn +++ b/www/iridium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- services/network/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/network/BUILD.gn -@@ -394,7 +394,6 @@ if (is_linux || is_chromeos) { +@@ -412,7 +412,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/iridium/files/patch-services_network_network__context.cc b/www/iridium/files/patch-services_network_network__context.cc index af3ba296659f..28be12ac03da 100644 --- a/www/iridium/files/patch-services_network_network__context.cc +++ b/www/iridium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2024-02-04 14:46:08 UTC +--- services/network/network_context.cc.orig 2024-06-25 12:08:48 UTC +++ services/network/network_context.cc -@@ -470,7 +470,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -527,7 +527,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2385,7 +2385,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2294,7 +2294,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc index a3f549ad274b..2b5817d4d448 100644 --- a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,8 +1,8 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2023-07-24 14:27:53 UTC +--- services/network/network_sandbox_hook_linux.cc.orig 2024-06-25 12:08:48 UTC +++ services/network/network_sandbox_hook_linux.cc -@@ -14,11 +14,14 @@ +@@ -15,11 +15,14 @@ + #include "sandbox/linux/syscall_broker/broker_file_permission.h" #include "sandbox/policy/features.h" - #include "third_party/abseil-cpp/absl/types/optional.h" +#if !BUILDFLAG(IS_BSD) using sandbox::syscall_broker::BrokerFilePermission; @@ -15,7 +15,7 @@ sandbox::syscall_broker::BrokerCommandSet GetNetworkBrokerCommandSet() { return MakeBrokerCommandSet({ sandbox::syscall_broker::COMMAND_ACCESS, -@@ -102,9 +105,11 @@ void LoadNetworkLibraries() { +@@ -103,9 +106,11 @@ void LoadNetworkLibraries() { } } #endif // BUILDFLAG(IS_CHROMEOS) @@ -27,10 +27,10 @@ #if BUILDFLAG(IS_CHROMEOS) LoadNetworkLibraries(); #endif -@@ -117,6 +122,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne +@@ -118,6 +123,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne GetNetworkBrokerCommandSet(), GetNetworkFilePermissions(std::move(network_context_parent_dirs)), - sandbox::policy::SandboxLinux::PreSandboxHook(), options); + options); +#endif return true; diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc index 74699a42641a..d7a19a50941a 100644 --- a/www/iridium/files/patch-services_network_network__service.cc +++ b/www/iridium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2024-02-04 14:46:08 UTC +--- services/network/network_service.cc.orig 2024-06-25 12:08:48 UTC +++ services/network/network_service.cc -@@ -96,7 +96,7 @@ +@@ -99,7 +99,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -998,7 +998,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -983,7 +983,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1080,7 +1080,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1065,7 +1065,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/iridium/files/patch-services_network_network__service.h b/www/iridium/files/patch-services_network_network__service.h index d521f82c7123..4e916540ec6d 100644 --- a/www/iridium/files/patch-services_network_network__service.h +++ b/www/iridium/files/patch-services_network_network__service.h @@ -1,15 +1,15 @@ ---- services/network/network_service.h.orig 2024-02-04 14:46:08 UTC +--- services/network/network_service.h.orig 2024-06-25 12:08:48 UTC +++ services/network/network_service.h -@@ -225,7 +225,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override; - void SetFirstPartySets(net::GlobalFirstPartySets sets) override; +@@ -238,7 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + const std::vector<ContentSettingPatternSource>& settings) override; + void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) override; -@@ -252,7 +252,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -264,7 +264,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory( NetworkContext* network_context); diff --git a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn index b8d82ca3e7b1..a22c2038d124 100644 --- a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- services/network/public/cpp/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/network/public/cpp/BUILD.gn -@@ -485,7 +485,7 @@ component("cpp_base") { +@@ -515,7 +515,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn index fc4205ac2092..dc35564dbb6f 100644 --- a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/mojom/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- services/network/public/mojom/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/network/public/mojom/BUILD.gn -@@ -521,11 +521,11 @@ mojom("url_loader_base") { +@@ -524,11 +524,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -11,15 +11,15 @@ - if (is_linux) { + if (is_linux && !is_bsd) { - # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does + # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1442,7 +1442,7 @@ mojom("mojom") { +@@ -1489,7 +1489,7 @@ mojom("mojom") { } } - if (is_linux) { + if (is_linux && !is_bsd) { - # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does + # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] diff --git a/www/iridium/files/patch-services_on__device__model_on__device__model__service.h b/www/iridium/files/patch-services_on__device__model_on__device__model__service.h new file mode 100644 index 000000000000..27d1cb7df05c --- /dev/null +++ b/www/iridium/files/patch-services_on__device__model_on__device__model__service.h @@ -0,0 +1,22 @@ +--- services/on_device_model/on_device_model_service.h.orig 2024-06-25 12:08:48 UTC ++++ services/on_device_model/on_device_model_service.h +@@ -22,6 +22,10 @@ + #include "sandbox/policy/linux/sandbox_linux.h" + #endif + ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#endif ++ + namespace on_device_model { + + class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService +@@ -35,7 +39,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS + // Must be called in the service's process after the run loop finished. + [[nodiscard]] static bool Shutdown(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + static void AddSandboxLinuxOptions( + sandbox::policy::SandboxLinux::Options& options); + #endif diff --git a/www/iridium/files/patch-services_on__device__model_pre__sandbox__init.cc b/www/iridium/files/patch-services_on__device__model_pre__sandbox__init.cc new file mode 100644 index 000000000000..7cfdb54abd3a --- /dev/null +++ b/www/iridium/files/patch-services_on__device__model_pre__sandbox__init.cc @@ -0,0 +1,38 @@ +--- services/on_device_model/pre_sandbox_init.cc.orig 2024-06-25 12:08:48 UTC ++++ services/on_device_model/pre_sandbox_init.cc +@@ -14,7 +14,7 @@ + #include "services/on_device_model/ml/chrome_ml.h" // nogncheck + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "gpu/config/gpu_info_collector.h" // nogncheck + #include "third_party/dawn/include/dawn/dawn_proc.h" // nogncheck + #include "third_party/dawn/include/dawn/native/DawnNative.h" // nogncheck +@@ -31,7 +31,7 @@ namespace on_device_model { + + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr uint32_t kVendorIdAMD = 0x1002; + constexpr uint32_t kVendorIdIntel = 0x8086; + constexpr uint32_t kVendorIdNVIDIA = 0x10DE; +@@ -80,7 +80,7 @@ bool OnDeviceModelService::PreSandboxInit() { + } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Warm any relevant drivers before attempting to bring up the sandbox. For + // good measure we initialize a device instance for any adapter with an + // appropriate backend on top of any integrated or discrete GPU. +@@ -116,7 +116,7 @@ bool OnDeviceModelService::PreSandboxInit() { + return true; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // static + void OnDeviceModelService::AddSandboxLinuxOptions( + sandbox::policy::SandboxLinux::Options& options) { diff --git a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index b7df3e443725..21365676140d 100644 --- a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-10-21 11:51:27 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2024-06-25 12:08:48 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO +@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -81,7 +81,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -83,7 +83,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -217,7 +217,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -219,7 +219,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -232,7 +232,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -234,7 +234,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -278,7 +278,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -280,7 +280,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -328,7 +328,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -330,7 +330,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -389,7 +389,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -391,7 +391,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/iridium/files/patch-services_screen__ai_public_cpp_utilities.cc b/www/iridium/files/patch-services_screen__ai_public_cpp_utilities.cc new file mode 100644 index 000000000000..0bb9b52fa880 --- /dev/null +++ b/www/iridium/files/patch-services_screen__ai_public_cpp_utilities.cc @@ -0,0 +1,29 @@ +--- services/screen_ai/public/cpp/utilities.cc.orig 2024-06-25 12:08:48 UTC ++++ services/screen_ai/public/cpp/utilities.cc +@@ -19,7 +19,7 @@ namespace screen_ai { + + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr char kBinaryPathSwitch[] = "screen-ai-binary"; + #endif + +@@ -40,7 +40,7 @@ constexpr char kScreenAIDlcRootPath[] = + #endif + + #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] = + FILE_PATH_LITERAL("third_party/screen-ai/linux/resources"); + #elif BUILDFLAG(IS_MAC) +@@ -127,7 +127,7 @@ base::FilePath GetComponentBinaryPathForTests() { + + const char* GetBinaryPathSwitch() { + // This is only used on Linux and ChromeOS. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return kBinaryPathSwitch; + #else + return nullptr; diff --git a/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc new file mode 100644 index 000000000000..425826762f3b --- /dev/null +++ b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -0,0 +1,18 @@ +--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2024-06-25 12:08:48 UTC ++++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc +@@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path + } + } + ++#if !BUILDFLAG(IS_BSD) + auto* instance = sandbox::policy::SandboxLinux::GetInstance(); + + std::vector<BrokerFilePermission> permissions{ +@@ -75,6 +76,7 @@ bool ScreenAIPreSandboxHook(base::FilePath binary_path + sandbox::syscall_broker::COMMAND_OPEN}), + permissions, options); + instance->EngageNamespaceSandboxIfPossible(); ++#endif + + return true; + } diff --git a/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h new file mode 100644 index 000000000000..8859ba1b82a9 --- /dev/null +++ b/www/iridium/files/patch-services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2024-06-25 12:08:48 UTC ++++ services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h +@@ -6,7 +6,13 @@ + #define SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ + + #include "base/files/file_path.h" ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace screen_ai { + diff --git a/www/iridium/files/patch-services_service__manager_BUILD.gn b/www/iridium/files/patch-services_service__manager_BUILD.gn index 05e34174b8ff..fc373a9fb7b9 100644 --- a/www/iridium/files/patch-services_service__manager_BUILD.gn +++ b/www/iridium/files/patch-services_service__manager_BUILD.gn @@ -1,6 +1,6 @@ ---- services/service_manager/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- services/service_manager/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ services/service_manager/BUILD.gn -@@ -67,7 +67,7 @@ source_set("service_manager") { +@@ -66,7 +66,7 @@ source_set("service_manager") { ] } diff --git a/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc index b92e085ac1e3..f52f344129da 100644 --- a/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc +++ b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -1,6 +1,6 @@ ---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2023-03-13 07:33:08 UTC +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2024-06-25 12:08:48 UTC +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h" #include "third_party/perfetto/protos/perfetto/trace/track_event/thread_descriptor.pbzero.h" diff --git a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc index 071eacbb5910..931524037c67 100644 --- a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,38 +1,38 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2023-10-21 11:51:27 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2024-06-25 12:08:48 UTC +++ services/video_capture/video_capture_service_impl.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" #include "media/capture/video/video_capture_gpu_channel_host.h" #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h" -@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext +@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -288,7 +288,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende - if (!gpu_dependencies_context_) +@@ -311,7 +311,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + { + #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { - if (!viz_gpu_context_provider_) { - viz_gpu_context_provider_ = -@@ -384,7 +384,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -433,7 +433,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) { viz_gpu_ = std::move(viz_gpu); } diff --git a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h index dc4d57795156..8bb7c195d920 100644 --- a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h +++ b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h @@ -1,29 +1,29 @@ ---- services/video_capture/video_capture_service_impl.h.orig 2023-10-21 11:51:27 UTC +--- services/video_capture/video_capture_service_impl.h.orig 2024-06-25 12:08:48 UTC +++ services/video_capture/video_capture_service_impl.h -@@ -24,7 +24,7 @@ +@@ -27,7 +27,7 @@ #include "services/video_capture/ash/video_capture_device_factory_ash.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - -@@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -71,7 +71,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #if BUILDFLAG(IS_WIN) void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) - private: -@@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || + // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -112,7 +112,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap factory_receivers_ash_; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) class VizGpuContextProvider; std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_; std::unique_ptr<viz::Gpu> viz_gpu_; diff --git a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp index ce69b85cbf53..39ecce33a68a 100644 --- a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,6 +1,15 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2023-07-24 14:27:53 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2024-06-25 12:08:48 UTC +++ skia/ext/SkMemory_new_handler.cpp -@@ -86,7 +86,7 @@ static void* malloc_nothrow(size_t size) { +@@ -19,7 +19,7 @@ + #include <windows.h> + #elif BUILDFLAG(IS_APPLE) + #include <malloc/malloc.h> +-#else ++#elif !BUILDFLAG(IS_BSD) + #include <malloc.h> + #endif + +@@ -105,7 +105,7 @@ static void* malloc_nothrow(size_t size, int debug_sen // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; diff --git a/www/iridium/files/patch-skia_ext_font__utils.cc b/www/iridium/files/patch-skia_ext_font__utils.cc new file mode 100644 index 000000000000..4131cf54372f --- /dev/null +++ b/www/iridium/files/patch-skia_ext_font__utils.cc @@ -0,0 +1,20 @@ +--- skia/ext/font_utils.cc.orig 2024-06-25 12:08:48 UTC ++++ skia/ext/font_utils.cc +@@ -19,7 +19,7 @@ + #include "third_party/skia/include/ports/SkFontMgr_mac_ct.h" + #endif + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "third_party/skia/include/ports/SkFontConfigInterface.h" + #include "third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h" + #endif +@@ -60,7 +60,7 @@ static sk_sp<SkFontMgr> fontmgr_factory() { + return SkFontMgr_New_Android(nullptr); + #elif BUILDFLAG(IS_APPLE) + return SkFontMgr_New_CoreText(nullptr); +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal()); + return fci ? SkFontMgr_New_FCI(std::move(fci)) : nullptr; + #elif BUILDFLAG(IS_FUCHSIA) diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h index adf2940e9f86..f305263ab77c 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2023-10-21 11:51:27 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2024-06-25 12:08:48 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -450,7 +450,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -448,7 +448,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \ @@ -9,7 +9,7 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -465,7 +465,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -463,7 +463,8 @@ 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/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc deleted file mode 100644 index 467e9e428e55..000000000000 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_raw__logging.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig 2023-08-28 20:17:35 UTC -+++ third_party/abseil-cpp/absl/base/internal/raw_logging.cc -@@ -56,10 +56,12 @@ - // ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall - // syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len); - // for low level operations that want to avoid libc. --#if (defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && \ -+#if (defined(__linux__) || defined(__FreeBSD__)) && \ - !defined(__ANDROID__) - #include <sys/syscall.h> - #define ABSL_HAVE_SYSCALL_WRITE 1 -+#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 -+#elif defined(__OpenBSD__) - #define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1 - #else - #undef ABSL_HAVE_SYSCALL_WRITE diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn index 43534c9507ed..0ed2a76cd58c 100644 --- a/www/iridium/files/patch-third__party_angle_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- third_party/angle/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/angle/BUILD.gn -@@ -325,7 +325,6 @@ config("extra_warnings") { +@@ -339,7 +339,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -496,7 +495,7 @@ template("angle_common_lib") { +@@ -516,7 +515,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -651,6 +650,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -671,6 +670,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] diff --git a/www/iridium/files/patch-third__party_angle_src_common_system__utils.cpp b/www/iridium/files/patch-third__party_angle_src_common_system__utils.cpp new file mode 100644 index 000000000000..4e5d30eca3b4 --- /dev/null +++ b/www/iridium/files/patch-third__party_angle_src_common_system__utils.cpp @@ -0,0 +1,11 @@ +--- third_party/angle/src/common/system_utils.cpp.orig 2024-06-25 12:08:48 UTC ++++ third_party/angle/src/common/system_utils.cpp +@@ -25,7 +25,7 @@ namespace angle + { + std::string GetExecutableName() + { +-#if defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21 ++#if (defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 21) || defined(ANGLE_PLATFORM_BSD) + // Support for "getprogname" function in bionic was introduced in L (API level 21) + const char *executableName = getprogname(); + return (executableName) ? std::string(executableName) : "ANGLE"; diff --git a/www/iridium/files/patch-third__party_angle_src_common_system__utils__linux.cpp b/www/iridium/files/patch-third__party_angle_src_common_system__utils__linux.cpp new file mode 100644 index 000000000000..63e7ab213794 --- /dev/null +++ b/www/iridium/files/patch-third__party_angle_src_common_system__utils__linux.cpp @@ -0,0 +1,35 @@ +--- third_party/angle/src/common/system_utils_linux.cpp.orig 2024-06-25 12:08:48 UTC ++++ third_party/angle/src/common/system_utils_linux.cpp +@@ -15,8 +15,13 @@ + + #include <array> + ++#if ANGLE_PLATFORM_OPENBSD ++#include <pthread_np.h> ++#endif ++ + namespace angle + { ++#if ANGLE_PLATFORM_LINUX + std::string GetExecutablePath() + { + // We cannot use lstat to get the size of /proc/self/exe as it always returns 0 +@@ -32,6 +37,7 @@ std::string GetExecutablePath() + path[result] = '\0'; + return path; + } ++#endif + + std::string GetExecutableDirectory() + { +@@ -56,6 +62,10 @@ void SetCurrentThreadName(const char *name) + { + // There's a 15-character (16 including '\0') limit. If the name is too big (and ERANGE is + // returned), just ignore the name. ++#if ANGLE_PLATFORM_OPENBSD ++ pthread_set_name_np(pthread_self(), name); ++#else + pthread_setname_np(pthread_self(), name); ++#endif + } + } // namespace angle diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp index fda25adb8649..2d1880127f69 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-11-22 14:00:11 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2024-06-25 12:08:48 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -8,8 +8,8 @@ +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) - # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -408,7 +408,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # include "libANGLE/renderer/gl/glx/DisplayGLX_api.h" +@@ -419,7 +419,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -454,7 +454,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -465,7 +465,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -505,7 +505,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -516,7 +516,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2106,7 +2106,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc index 3f0e82ea075c..80df8fbb81b4 100644 --- a/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc +++ b/www/iridium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -1,6 +1,6 @@ ---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2023-08-28 20:17:35 UTC +--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc -@@ -66,7 +66,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat +@@ -68,7 +68,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat out->send_subresource_notification = data.send_subresource_notification(); diff --git a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index 7f6521688073..7dd93b0fc3bc 100644 --- a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2023-08-28 20:17:35 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -64,7 +64,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -65,7 +65,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { UserAgentOverride user_agent_override; std::string accept_languages; bool send_subresource_notification{false}; diff --git a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index 33e6a8ab7394..bd298c5cef06 100644 --- a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2023-08-28 20:17:35 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -162,7 +162,7 @@ struct BLINK_COMMON_EXPORT +@@ -166,7 +166,7 @@ struct BLINK_COMMON_EXPORT return data.send_subresource_notification; } diff --git a/www/iridium/files/patch-third__party_blink_public_platform_platform.h b/www/iridium/files/patch-third__party_blink_public_platform_platform.h index 5f4bb302da69..3583138f912b 100644 --- a/www/iridium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/iridium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2023-11-22 14:00:11 UTC +--- third_party/blink/public/platform/platform.h.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/public/platform/platform.h -@@ -344,7 +344,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -347,7 +347,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/iridium/files/patch-third__party_blink_public_platform_web__vector.h b/www/iridium/files/patch-third__party_blink_public_platform_web__vector.h index bce21d9d0c1a..446a870c6777 100644 --- a/www/iridium/files/patch-third__party_blink_public_platform_web__vector.h +++ b/www/iridium/files/patch-third__party_blink_public_platform_web__vector.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/web_vector.h.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/public/platform/web_vector.h.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/public/platform/web_vector.h -@@ -81,7 +81,7 @@ class WebVector { +@@ -86,7 +86,7 @@ class WebVector { // The vector can be populated using reserve() and emplace_back(). WebVector() = default; diff --git a/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py index 1c64fc1009bb..3b26e7c12aaa 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py +++ b/www/iridium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py @@ -1,9 +1,9 @@ ---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -@@ -28,7 +28,7 @@ def init(root_src_dir, enable_style_format=True): - root_src_dir = os.path.abspath(root_src_dir) +@@ -30,7 +30,7 @@ def init(root_src_dir, enable_style_format=True): # Determine //buildtools/<platform>/ directory + new_path_platform_suffix = "" - if sys.platform.startswith("linux"): + if sys.platform.startswith(("linux","openbsd","freebsd")): platform = "linux64" diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 558ea6287e54..16e413837ff2 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -78,12 +78,12 @@ +@@ -81,12 +81,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.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 -@@ -232,7 +232,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -271,7 +271,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform +@@ -303,7 +303,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 3660f70e8967..2be0420ed966 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -424,7 +424,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -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' -@@ -3351,7 +3351,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3388,7 +3388,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/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 23b5c27c9c68..617cb88d7970 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6468,7 +6468,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6472,7 +6472,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. // TODO(crbug.com/1317375): Build these tests on all platforms. #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ -@@ -6877,7 +6877,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6881,7 +6881,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 2e96f6ccfbad..86fd131360ff 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -48,7 +48,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index fecbab32a951..ec248e3648b3 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-11-22 14:00:11 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -192,7 +192,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( const WebVector<const void*>& addresses) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 29da315edf33..946d8acef52a 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,16 +1,16 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -73,7 +73,7 @@ +@@ -72,7 +72,7 @@ + #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" - #include "ui/gfx/geometry/size_conversions.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -808,7 +808,7 @@ void LayoutView::UpdateLayout() { - fragmentation_context_.Clear(); +@@ -799,7 +799,7 @@ void LayoutView::LayoutRoot() { + intrinsic_logical_widths_ = LogicalWidth(); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_ng_physical__fragment__rare__data.h b/www/iridium/files/patch-third__party_blink_renderer_core_layout_ng_physical__fragment__rare__data.h deleted file mode 100644 index 634b44d42b96..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_ng_physical__fragment__rare__data.h +++ /dev/null @@ -1,10 +0,0 @@ ---- third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h.orig 2023-10-21 11:51:27 UTC -+++ third_party/blink/renderer/core/layout/ng/physical_fragment_rare_data.h -@@ -5,6 +5,7 @@ - #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_ - #define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_NG_PHYSICAL_FRAGMENT_RARE_DATA_H_ - -+#include <bit> - #include <climits> - - #include "third_party/blink/renderer/core/layout/geometry/logical_rect.h" diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index b183cdb58bf4..beff6859a829 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-11-22 14:00:11 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -120,7 +120,7 @@ namespace blink { +@@ -122,7 +122,7 @@ namespace blink { namespace { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 3cec23a2be47..d38bd67b36f3 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -157,7 +157,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ return false; #else return true; -@@ -360,7 +360,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -370,7 +370,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h index a1a326e2f41e..5a3129ba1275 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h +++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h @@ -1,13 +1,13 @@ ---- third_party/blink/renderer/core/xml/xslt_processor.h.orig 2024-02-04 20:50:17 UTC +--- third_party/blink/renderer/core/xml/xslt_processor.h.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/xml/xslt_processor.h @@ -77,7 +77,11 @@ class XSLTProcessor final : public ScriptWrappable { void reset(); +#if (LIBXML_VERSION >= 21200) -+ static void ParseErrorFunc(void* user_data, const xmlError*); + static void ParseErrorFunc(void* user_data, const xmlError*); +#else - static void ParseErrorFunc(void* user_data, xmlError*); ++ static void ParseErrorFunc(void* user_data, xmlError*); +#endif static void GenericErrorFunc(void* user_data, const char* msg, ...); diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc index d9539fd1c05c..9f7fe383cdca 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc @@ -1,13 +1,13 @@ ---- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2024-02-04 20:50:17 UTC +--- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc @@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char // It would be nice to do something with this error message. } +#if (LIBXML_VERSION >= 21200) -+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { + void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { +#else - void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { ++void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { +#endif FrameConsole* console = static_cast<FrameConsole*>(user_data); if (!console) diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index 5c8ac19f2c5c..5a9bd32ed026 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -724,7 +724,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -813,7 +813,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni index b202a1683f45..1f0fdcf6e1bb 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni @@ -1,11 +1,10 @@ ---- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-07-24 14:27:53 UTC +--- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/modules/ml/webnn/features.gni -@@ -7,7 +7,7 @@ declare_args() { +@@ -7,6 +7,6 @@ declare_args() { # This enables building WebNN with XNNPACK. Currently only available for - # Windows and Linux on x64 or x86. + # Windows and macOS on x64, x86 and arm64. build_webnn_with_xnnpack = -- (is_linux || is_win) && (current_cpu == "x64" || current_cpu == "x86") -+ !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86")) - - # This build flag enables WebNN on ChromeOS platform to access hardware - # acceleration by using ModelLoader mojo interface. +- (is_win || is_mac) && ++ !is_bsd && (is_win || is_mac) && + (current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm64") + } diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc index 15628f465afe..16c17e8560df 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -196,7 +196,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -204,7 +204,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 45d604a9c9f6..5c0763de25c0 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/iridium/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 2023-11-22 14:00:11 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -298,7 +298,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -300,7 +300,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 48b80dc020a7..c32dd8f3307e 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -380,7 +380,7 @@ class AudioWorkletThreadPriorityTest +@@ -463,7 +463,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. diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 2bf7c1a73d5a..9003cdcde4a6 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6314,7 +6314,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6353,7 +6353,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index 95766ad2f8b2..8ff5dc8a0e71 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -746,7 +746,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -807,7 +807,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn index cf583b7881e7..1b7d80d3a4b4 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1925,7 +1925,7 @@ static_library("test_support") { +@@ -1988,7 +1988,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index bf06f1d7a4e7..1d3d8c038681 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2023-08-28 20:17:35 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -73,7 +73,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -118,7 +118,7 @@ FontPlatformData* FontCache::SystemFontPlatformData( +@@ -124,7 +124,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index faddd39c5ae2..a1819b7a9bd3 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -56,7 +56,7 @@ +@@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -163,7 +163,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -250,7 +250,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -239,7 +239,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -312,7 +312,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -368,7 +368,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -349,7 +349,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index a5331691702a..22d7cfb92f48 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/iridium/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 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-06-25 12:08:48 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 -@@ -277,7 +277,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -276,7 +276,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/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc index 3b92769774a8..caafbddf3ebf 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/fonts/font_metrics.cc @@ -39,7 +39,7 @@ namespace blink { @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -69,7 +69,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -67,7 +67,7 @@ void FontMetrics::AscentDescentWithHacks( bool is_vdmx_valid = false; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -18,12 +18,12 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -117,7 +117,7 @@ void FontMetrics::AscentDescentWithHacks( - if (descent < metrics.fDescent) { - visual_overflow_inflation_for_descent = 1; +@@ -111,7 +111,7 @@ void FontMetrics::AscentDescentWithHacks( + descent = SkScalarRoundToScalar(metrics.fDescent); + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // When subpixel positioning is enabled, if the descent is rounded down, - // the descent part of the glyph may be truncated when displayed in a - // 'overflow: hidden' container. To avoid that, borrow 1 unit from the + // When subpixel positioning is enabled, if the descent is rounded down, + // the descent part of the glyph may be truncated when displayed in a + // 'overflow: hidden' container. To avoid that, borrow 1 unit from the diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc index a17603cfe4f7..01d9988e2fc2 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/iridium/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 2023-03-13 07:33:08 UTC +--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/fonts/font_platform_data.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,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 -@@ -127,7 +127,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t +@@ -128,7 +128,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index f1460938ecd2..2a5f997cb615 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2023-07-24 14:27:53 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc -@@ -64,7 +64,7 @@ AtomicString ToAtomicString(const SkString& str) { +@@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -246,7 +246,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -246,7 +246,7 @@ const FontPlatformData* FontCache::CreateFontPlatformD std::string name; sk_sp<SkTypeface> typeface; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 08e446692368..ce2c6f26cbb3 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-11-22 14:00:11 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -358,7 +358,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -407,7 +407,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc index 79b8a8ccef49..293d7dff9243 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_instrumentation_partition__alloc__memory__dump__provider.cc @@ -1,6 +1,16 @@ ---- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2023-01-17 19:19:00 UTC +--- third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/instrumentation/partition_alloc_memory_dump_provider.cc -@@ -24,6 +24,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory +@@ -14,7 +14,9 @@ + + namespace blink { + ++#if !BUILDFLAG(IS_BSD) + const char kPartitionAllocDumpName[] = "partition_alloc"; ++#endif + + PartitionAllocMemoryDumpProvider* PartitionAllocMemoryDumpProvider::Instance() { + DEFINE_STATIC_LOCAL(PartitionAllocMemoryDumpProvider, instance, ()); +@@ -24,6 +26,7 @@ PartitionAllocMemoryDumpProvider* PartitionAllocMemory bool PartitionAllocMemoryDumpProvider::OnMemoryDump( const base::trace_event::MemoryDumpArgs& args, base::trace_event::ProcessMemoryDump* memory_dump) { @@ -8,7 +18,7 @@ using base::trace_event::MemoryDumpLevelOfDetail; MemoryDumpLevelOfDetail level_of_detail = args.level_of_detail; -@@ -49,6 +50,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( +@@ -49,6 +52,7 @@ bool PartitionAllocMemoryDumpProvider::OnMemoryDump( "size", "bytes", partition_stats_dumper.total_active_bytes()); memory_dump->AddOwnershipEdge(allocated_objects_dump->guid(), partitions_dump->guid()); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index 3fcd7c3fbf58..dbb4e94f8866 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -198,12 +198,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -285,12 +285,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index a88b5c3efae5..e216cacdd477 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,42 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1997,7 +1997,7 @@ +@@ -325,7 +325,7 @@ + name: "AppTitle", + status: "experimental", + origin_trial_feature_name: "AppTitle", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + base_feature: "WebAppEnableAppTitle", + }, + { +@@ -1517,7 +1517,7 @@ + status: "test", + base_feature: "none", + origin_trial_feature_name: "FedCmContinueOnBundle", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + }, + { +@@ -1534,7 +1534,7 @@ + status: "test", + base_feature: "none", + origin_trial_feature_name: "FedCmButtonMode", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + }, + { +@@ -1579,7 +1579,7 @@ + base_feature: "none", + public: true, + origin_trial_feature_name: "FedCmMultipleIdentityProviders", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + origin_trial_allows_third_party: true, + }, + { +@@ -1919,7 +1919,7 @@ base_feature_status: "enabled", copied_from_base_feature_if: "overridden", origin_trial_feature_name: "FullscreenPopupWindows", @@ -9,25 +45,43 @@ }, { name: "GamepadButtonAxisEvents", -@@ -2920,7 +2920,7 @@ - name: "PaymentHandlerMinimalHeaderUX", - origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", - origin_trial_allows_third_party: true, +@@ -2983,7 +2983,7 @@ + // Tracking bug for the implementation: https://crbug.com/1462930 + name: "PermissionElement", + origin_trial_feature_name: "PermissionElement", - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], - status: "stable", - }, + status: "experimental", + public: true, + base_feature_status: "enabled", +@@ -3118,7 +3118,7 @@ { -@@ -3967,7 +3967,7 @@ + name: "PrivateNetworkAccessPermissionPrompt", + origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", +- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + status: "stable", + public: true, + base_feature: "none", +@@ -4068,7 +4068,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], }, + // Enables using policy-controlled feature "usb-unrestricted" to allow + // isolated context to access protected USB interface classes and to +@@ -4237,7 +4237,7 @@ { - // This flag makes IDL reflected attributes with the "URL" IDL attribute -@@ -4185,12 +4185,12 @@ + name: "WebAppScopeExtensions", + origin_trial_feature_name: "WebAppScopeExtensions", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + status: "experimental", + base_feature: "none", + }, +@@ -4280,7 +4280,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", @@ -35,10 +89,4 @@ + 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: "stable", - base_feature: "none", - }, + // WebAssembly JS Promise Integration, diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc deleted file mode 100644 index f8f6e3ea2742..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_text_text__break__iterator.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/blink/renderer/platform/text/text_break_iterator.cc.orig 2023-11-04 06:12:25 UTC -+++ third_party/blink/renderer/platform/text/text_break_iterator.cc -@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAs - }; - // clang-format on - --#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#if U_ICU_VERSION_MAJOR_NUM >= 74 -+#define BA_LB_COUNT (U_LB_COUNT - 8) -+#elif U_ICU_VERSION_MAJOR_NUM >= 58 - #define BA_LB_COUNT (U_LB_COUNT - 3) - #else - #define BA_LB_COUNT U_LB_COUNT diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc index ac29714a228b..04f44125b038 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -634,7 +634,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV +@@ -696,7 +696,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner } const unsigned texture_target = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Explicitly set GL_TEXTURE_EXTERNAL_OES as the + // Explicitly set GL_TEXTURE_EXTERNAL_OES if necessary: // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12 - // format, while the `ImageTextureTarget()` will return GL_TEXTURE_2D. + // format, while `ClientSharedImage::GetTextureTarget(BufferUsage, diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index be04ad37d747..61cdef04b7a7 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2023-03-13 07:33:08 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -18,6 +18,11 @@ +@@ -19,6 +19,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif @@ -12,7 +12,7 @@ namespace WTF { size_t GetUnderestimatedStackSize() { -@@ -62,6 +67,8 @@ size_t GetUnderestimatedStackSize() { +@@ -63,6 +68,8 @@ size_t GetUnderestimatedStackSize() { // low as 512k. // return 512 * 1024; @@ -21,7 +21,7 @@ #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -148,6 +155,13 @@ void* GetStackStart() { +@@ -149,6 +156,13 @@ void* GetStackStart() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast<void*>(highLimit); #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc new file mode 100644 index 000000000000..56f255868e5b --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc @@ -0,0 +1,18 @@ +--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-06-25 12:08:48 UTC ++++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +@@ -610,6 +610,7 @@ static void GbkUrlEscapedEntityCallack( + code_point, reason, err); + } + ++#if !BUILDFLAG(IS_BSD) + static void GbkCallbackSubstitute(const void* context, + UConverterFromUnicodeArgs* from_unicode_args, + const UChar* code_units, +@@ -627,6 +628,7 @@ static void GbkCallbackSubstitute(const void* context, + UCNV_FROM_U_CALLBACK_SUBSTITUTE(context, from_unicode_args, code_units, + length, code_point, reason, err); + } ++#endif + #endif // USING_SYSTEM_ICU + + static void NotReachedEntityCallback(const void* context, diff --git a/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py deleted file mode 100644 index 6c7c143a1f2e..000000000000 --- a/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py +++ /dev/null @@ -1,34 +0,0 @@ ---- third_party/boringssl/src/util/generate_build_files.py.orig 2024-02-04 14:46:08 UTC -+++ third_party/boringssl/src/util/generate_build_files.py -@@ -772,10 +772,10 @@ def main(platforms): - ] - - # Generate err_data.c -- with open('err_data.c', 'w+') as err_data: -- subprocess.check_call(['go', 'run', 'err_data_generate.go'], -- cwd=os.path.join('src', 'crypto', 'err'), -- stdout=err_data) -+# with open('err_data.c', 'w+') as err_data: -+# subprocess.check_call(['go', 'run', 'err_data_generate.go'], -+# cwd=os.path.join('src', 'crypto', 'err'), -+# stdout=err_data) - crypto_c_files.append('err_data.c') - crypto_c_files.sort() - -@@ -786,11 +786,11 @@ def main(platforms): - crypto_test_files = [] - if EMBED_TEST_DATA: - # Generate crypto_test_data.cc -- with open('crypto_test_data.cc', 'w+') as out: -- subprocess.check_call( -- ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], -- cwd='src', -- stdout=out) -+# with open('crypto_test_data.cc', 'w+') as out: -+# subprocess.check_call( -+# ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'], -+# cwd='src', -+# stdout=out) - crypto_test_files.append('crypto_test_data.cc') - - crypto_test_files += PrefixWithSrc(cmake['CRYPTO_TEST_SOURCES']) diff --git a/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni b/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni index 9b8229d8b2f8..43cce26433e5 100644 --- a/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni +++ b/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni @@ -1,8 +1,8 @@ ---- third_party/cpuinfo/cpuinfo.gni.orig 2023-10-21 11:51:27 UTC +--- third_party/cpuinfo/cpuinfo.gni.orig 2024-06-25 12:08:48 UTC +++ third_party/cpuinfo/cpuinfo.gni -@@ -7,7 +7,7 @@ use_cpuinfo = - current_cpu != "ppc64" && current_cpu != "ppc64le" && +@@ -8,7 +8,7 @@ use_cpuinfo = current_cpu != "s390" && current_cpu != "s390x" && + current_cpu != "riscv64" && # cpuinfo is not supported on fuchsia. - !is_fuchsia && + !is_fuchsia && !is_bsd && diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc index 489aeb3848d3..89b9245555c0 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/crashpad/crashpad/util/misc/uuid.cc -@@ -101,7 +101,7 @@ bool UUID::InitializeWithNew() { +@@ -110,7 +110,7 @@ bool UUID::InitializeWithNew() { InitializeFromBytes(uuid); return true; #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h index fc2e24ddf11e..de356b22a2b1 100644 --- a/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h +++ b/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h @@ -1,11 +1,11 @@ ---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2024-02-04 14:46:08 UTC +--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2024-06-25 12:08:48 UTC +++ third_party/dawn/include/dawn/native/VulkanBackend.h @@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport }; // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome --#ifdef __linux__ -+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) +-#if defined(__linux__) || defined(__Fuchsia__) ++#if defined(__linux__) || defined(__Fuchsia__) || defined(__OpenBSD__) || defined(__FreeBSD__) // Common properties of external images represented by FDs. On successful import the file // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp index 8b8c69a70eab..8ec444b9ead9 100644 --- a/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp +++ b/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp @@ -1,6 +1,6 @@ ---- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2024-02-04 14:46:08 UTC +--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2024-06-25 12:08:48 UTC +++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp -@@ -55,7 +55,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha +@@ -56,7 +56,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif #if DAWN_PLATFORM_IS(LINUX) diff --git a/www/iridium/files/patch-third__party_distributed__point__functions_BUILD.gn b/www/iridium/files/patch-third__party_distributed__point__functions_BUILD.gn deleted file mode 100644 index 274fa5445432..000000000000 --- a/www/iridium/files/patch-third__party_distributed__point__functions_BUILD.gn +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/distributed_point_functions/BUILD.gn.orig 2023-03-13 07:33:08 UTC -+++ third_party/distributed_point_functions/BUILD.gn -@@ -61,6 +61,9 @@ source_set("distributed_point_functions") { - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - -+ # XXX clang13 crashes with optimizations -+ configs += [ "//build/config/compiler:no_optimize" ] -+ - public_configs = [ ":distributed_point_functions_includes" ] - } - diff --git a/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn b/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn index cbcdffdc7741..0064be5aa4b9 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn +++ b/www/iridium/files/patch-third__party_ffmpeg_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/ffmpeg/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/ffmpeg/BUILD.gn -@@ -349,7 +349,6 @@ target(link_target_type, "ffmpeg_internal") { +@@ -343,7 +343,6 @@ target(link_target_type, "ffmpeg_internal") { libs += [ "m", "z", diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py deleted file mode 100644 index b1a9ea686e2c..000000000000 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py +++ /dev/null @@ -1,121 +0,0 @@ ---- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2024-02-04 14:46:08 UTC -+++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath( - SUCCESS_TOKEN = 'THIS_BUILD_WORKED' - - sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build')) --import gn_helpers -+#import gn_helpers - - BRANDINGS = [ - 'Chrome', -@@ -45,6 +45,8 @@ ARCH_MAP = { - 'linux': [ - 'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64' - ], -+ 'openbsd': ['x64', 'arm64', 'ia32'], -+ 'freebsd': ['x64', 'arm64', 'ia32'], - 'mac': ['x64', 'arm64'], - 'win': ['ia32', 'x64', 'arm64'], - } -@@ -54,6 +56,8 @@ USAGE_END = """ - Valid combinations are android [%(android)s] - linux [%(linux)s] - mac [%(mac)s] -+ openbsd [%(openbsd)s] -+ freebsd [%(freebsd)s] - win [%(win)s] - - If no target architecture is specified all will be built. -@@ -126,6 +130,10 @@ def PrintAndCheckCall(argv, *args, **kwargs): - def DetermineHostOsAndArch(): - if platform.system() == 'Linux': - host_os = 'linux' -+ if platform.system() == 'OpenBSD': -+ host_os = 'openbsd' -+ elif platform.system() == 'FreeBSD': -+ host_os = 'freebsd' - elif platform.system() == 'Darwin': - host_os = 'mac' - elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system(): -@@ -135,7 +143,7 @@ def DetermineHostOsAndArch(): - - if re.match(r'i.86', platform.machine()): - host_arch = 'ia32' -- elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64': -+ elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64' or platform.machine() == 'amd64': - host_arch = 'x64' - elif platform.machine() == 'aarch64': - host_arch = 'arm64' -@@ -152,7 +160,7 @@ def DetermineHostOsAndArch(): - - - def GetDsoName(target_os, dso_name, dso_version): -- if target_os in ('linux', 'linux-noasm', 'android'): -+ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): - return 'lib%s.so.%s' % (dso_name, dso_version) - elif target_os == 'mac': - return 'lib%s.%s.dylib' % (dso_name, dso_version) -@@ -495,7 +503,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_ - # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation - # #warning which will be converted to an error via -Werror. - # There is also no prctl.h -- if target_os in ['linux', 'linux-noasm']: -+ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: - pre_make_rewrites += [ - (r'(#define HAVE_SYSCTL [01])', - r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'), -@@ -622,7 +630,7 @@ def main(argv): - configure_args = args[2:] - - -- if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all'): -+ if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all', 'openbsd', 'freebsd'): - parser.print_help() - return 1 - -@@ -742,7 +750,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - '--enable-parser=vp3,vp8', - ]) - -- if target_os in ('linux', 'linux-noasm', 'android'): -+ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'): - if target_arch == 'x64': - if target_os == 'android': - configure_flags['Common'].extend([ -@@ -752,7 +760,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - configure_flags['Common'].extend([ - '--enable-lto', - '--arch=x86_64', -- '--target-os=linux', -+ '--target-os=' + target_os, - ]) - - if host_arch != 'x64': -@@ -843,7 +851,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - '--extra-cflags=-mfpu=vfpv3-d16', - ]) - elif target_arch == 'arm64': -- if target_os != 'android': -+ if target_os != 'android' and target_os != 'openbsd' and target_os != 'freebsd': - if host_arch != 'arm64': - configure_flags['Common'].extend([ - '--enable-cross-compile', -@@ -908,7 +916,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - '--disable-mips64r2', - '--enable-msa', - ]) -- if target_os == 'linux': -+ if target_os == 'Linux': - configure_flags['Common'].extend([ - '--enable-cross-compile', - '--target-os=linux', -@@ -1059,7 +1067,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os, - 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] + - configure_args) - -- if target_os in ['linux', 'linux-noasm']: -+ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']: - # ChromeOS enables MPEG4 which requires error resilience :( - chrome_os_flags = ( - configure_flags['Common'] + configure_flags['Chrome'] + diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py b/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py deleted file mode 100644 index f9745b8ab100..000000000000 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py +++ /dev/null @@ -1,53 +0,0 @@ ---- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig 2023-10-21 11:51:27 UTC -+++ third_party/ffmpeg/chromium/scripts/robo_lib/config.py -@@ -35,7 +35,7 @@ class RoboConfiguration: - self._patches_commit_title = "Chromium patches file" - # Title of the commit with README.chromium - self._readme_chromium_commit_title = "README.chromium file" -- self.EnsureHostInfo() -+ #self.EnsureHostInfo() - self.EnsureChromeSrc() - self.EnsureScriptDirectory() - -@@ -47,18 +47,15 @@ class RoboConfiguration: - self._llvm_path = os.path.join(self.chrome_src(), "third_party", - "llvm-build", "Release+Asserts", "bin") - -- self.EnsurePathContainsLLVM() -- self.EnsureNoMakeInfo() -+ #self.EnsurePathContainsLLVM() -+ #self.EnsureNoMakeInfo() - self.EnsureFFmpegHome() - self.EnsureASANConfig() -- self.ComputeBranchName() -+ #self.ComputeBranchName() - if not quiet: - shell.log(f"Using chrome src: {self.chrome_src()}") - shell.log(f"Using script dir: {self._script_directory}") - shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}") -- shell.log(f"On branch: {self.branch_name()}") -- if self.sushi_branch_name(): -- shell.log(f"On sushi branch: {self.sushi_branch_name()}") - - # Filename that we'll ask generate_gn.py to write git commands to. - # TODO: Should this use script_directory, or stay with ffmpeg? As long as -@@ -149,7 +146,7 @@ class RoboConfiguration: - """Ensure that the host architecture and platform are set.""" - kernel, host, os, *rest = shell.output_or_error(["uname", "-a"]).split() - assert kernel in ("Linux", "linux") -- assert "x86_64" in rest -+ assert ("x86_64", "amd64") in rest - self._host_operating_system = "linux" - self._host_architecture = "x64" - -@@ -165,8 +162,8 @@ class RoboConfiguration: - wd = os.getcwd() - # Walk up the tree until we find src/AUTHORS - while wd != "/": -- if os.path.isfile(os.path.join(wd, "src", "AUTHORS")): -- self._chrome_src = os.path.join(wd, "src") -+ if os.path.isfile(os.path.join(wd, "third_party", "DEPS")): -+ self._chrome_src = wd - return - wd = os.path.dirname(wd) - raise Exception("could not find src/AUTHORS in any parent of the wd") diff --git a/www/iridium/files/patch-third__party_ffmpeg_configure b/www/iridium/files/patch-third__party_ffmpeg_configure index c642c18045a3..6be2ad4d5e9f 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_configure +++ b/www/iridium/files/patch-third__party_ffmpeg_configure @@ -1,10 +1,13 @@ ---- third_party/ffmpeg/configure.orig 2024-02-04 14:46:08 UTC +--- third_party/ffmpeg/configure.orig 2024-06-25 12:08:48 UTC +++ third_party/ffmpeg/configure -@@ -5604,6 +5604,7 @@ case $target_os in - disable symver - ;; - freebsd) -+ enable section_data_rel_ro - ;; - bsd/os) - add_extralibs -lpoll -lgnugetopt +@@ -6790,8 +6790,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en + if enabled pthread_np_h; then + hdrs="$hdrs pthread_np.h" + fi +- check_lib pthread_set_name_np "$hdrs" pthread_set_name_np -lpthread +- check_lib pthread_setname_np "$hdrs" pthread_setname_np -lpthread ++ check_lib pthread_set_name_np pthread_np.h pthread_set_name_np -lpthread ++ check_lib pthread_setname_np pthread_np.h pthread_setname_np -lpthread + fi + fi + diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm index 60e8ddfa6dc6..8a495e59d0a1 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm +++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2023-07-24 14:27:53 UTC +--- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2024-06-25 12:08:48 UTC +++ third_party/ffmpeg/libavutil/x86/x86inc.asm -@@ -53,6 +53,12 @@ +@@ -46,6 +46,12 @@ %endif %endif @@ -13,7 +13,7 @@ %define WIN64 0 %define UNIX64 0 %if ARCH_X86_64 -@@ -768,6 +774,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, +@@ -861,6 +867,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, %endif align function_align %2: diff --git a/www/iridium/files/patch-third__party_fontconfig_include_config.h b/www/iridium/files/patch-third__party_fontconfig_include_config.h index 352aac8f64e6..54dfbea127b0 100644 --- a/www/iridium/files/patch-third__party_fontconfig_include_config.h +++ b/www/iridium/files/patch-third__party_fontconfig_include_config.h @@ -1,89 +1,49 @@ ---- third_party/fontconfig/include/config.h.orig 2023-04-22 17:45:15 UTC +--- third_party/fontconfig/include/config.h.orig 2024-06-25 12:08:48 UTC +++ third_party/fontconfig/include/config.h -@@ -18,13 +18,13 @@ - #define ENABLE_NLS 1 +@@ -13,7 +13,7 @@ - /* Additional font directories */ --#define FC_ADD_FONTS "yes" -+#define FC_ADD_FONTS "/usr/local/share/fonts" + #define FC_CACHEDIR "/var/cache/fontconfig" - /* Architecture prefix to use for cache file names */ - /* #undef FC_ARCHITECTURE */ +-#define FC_DEFAULT_FONTS "\t<dir>/usr/share/fonts</dir>\n\t<dir>/usr/local/share/fonts</dir>\n" ++#define FC_DEFAULT_FONTS "\t<dir>/usr/X11R6/lib/X11/fonts</dir>" - /* System font directory */ --#define FC_DEFAULT_FONTS "<dir>/usr/share/fonts</dir>" -+#define FC_DEFAULT_FONTS "<dir>/usr/X11R6/lib/X11/fonts</dir>" + #define FC_FONTPATH "" - /* The type of len parameter of the gperf hash/lookup function */ - #define FC_GPERF_SIZE_T size_t -@@ -99,7 +99,7 @@ - #define HAVE_GETPAGESIZE 1 +@@ -66,7 +66,7 @@ - /* Define to 1 if you have the `getprogname' function. */ --/* #undef HAVE_GETPROGNAME */ -+#define HAVE_GETPROGNAME 1 + #define HAVE_MMAP 1 - /* Define if the GNU gettext() function is already present or preinstalled. */ - #define HAVE_GETTEXT 1 -@@ -141,7 +141,7 @@ - /* #undef HAVE_NDIR_H */ - - /* Define to 1 if you have the 'posix_fadvise' function. */ -#define HAVE_POSIX_FADVISE 1 +#define HAVE_POSIX_FADVISE 0 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 -@@ -156,11 +156,14 @@ + +@@ -74,10 +74,13 @@ + #define HAVE_RANDOM 1 - /* Define to 1 if you have the `random_r' function. */ -#define HAVE_RANDOM_R 1 +/* #undef HAVE_RANDOM_R */ - /* Define to 1 if you have the `rand_r' function. */ #define HAVE_RAND_R 1 +/* Define to 1 if you have the `arc4_random' function. */ +#define HAVE_ARC4RANDOM 1 + - /* Define to 1 if you have the `readlink' function. */ #define HAVE_READLINK 1 -@@ -204,7 +207,7 @@ - #define HAVE_STRUCT_STATFS_F_FLAGS 1 + #define HAVE_STDATOMIC_PRIMITIVES 1 +@@ -92,11 +95,11 @@ - /* Define to 1 if `f_fstypename' is a member of `struct statfs'. */ --/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ -+#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1 - - /* Define to 1 if `f_basetype' is a member of `struct statvfs'. */ - /* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ -@@ -230,7 +233,7 @@ #define HAVE_SYS_PARAM_H 1 - /* Define to 1 if you have the <sys/statfs.h> header file. */ -#define HAVE_SYS_STATFS_H 1 +/* #undef HAVE_SYS_STATFS_H */ - /* Define to 1 if you have the <sys/statvfs.h> header file. */ #define HAVE_SYS_STATVFS_H 1 -@@ -242,7 +245,7 @@ - #define HAVE_SYS_TYPES_H 1 - /* Define to 1 if you have the <sys/vfs.h> header file. */ -#define HAVE_SYS_VFS_H 1 +/* #undef HAVE_SYS_VFS_H */ - /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 -@@ -265,7 +268,8 @@ - /* Define to 1 if you have the `_mktemp_s' function. */ - /* #undef HAVE__MKTEMP_S */ - --/* Define to the sub-directory where libtool stores uninstalled libraries. */ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ - #define LT_OBJDIR ".libs/" - /* Name of package */ diff --git a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc index 5431d1dd6ee6..d4c1aec7e90c 100644 --- a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -320,7 +320,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -326,7 +326,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c index e55d92519071..3980be512c68 100644 --- a/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c +++ b/www/iridium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c @@ -1,25 +1,15 @@ ---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2023-10-21 11:51:27 UTC +--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2024-06-25 12:08:48 UTC +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c -@@ -85,13 +85,35 @@ static int arm_get_cpu_caps(void) { +@@ -99,9 +99,45 @@ static int arm_get_cpu_caps(void) { return flags; } --#elif defined(ANDROID_USE_CPU_FEATURES_LIB) -+#elif defined(ANDROID_USE_CPU_FEATURES_LIB) || defined(__FreeBSD__) - - static int arm_get_cpu_caps(void) { - int flags = 0; - #if HAVE_NEON - flags |= HAS_NEON; // Neon is mandatory in Armv8.0-A. - #endif // HAVE_NEON -+ return flags; -+} -+ +-#elif defined(__linux__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) +#elif defined(__OpenBSD__) +#include <sys/sysctl.h> +#include <machine/cpu.h> +#include <machine/armreg.h> -+ + +static int arm_get_cpu_caps(void) { + int flags = 0; + int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; @@ -31,9 +21,29 @@ + if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) + return flags; + -+ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) + flags |= HAS_ARM_CRC32; + - return flags; - } ++ return flags; ++} ++ ++#elif defined(__linux__) || defined(__FreeBSD__) // end defined(AOM_USE_ANDROID_CPU_FEATURES) ++ + #include <sys/auxv.h> ++ ++#if defined(__FreeBSD__) ++static unsigned long getauxval(unsigned long type) ++{ ++ /* Only AT_HWCAP* return unsigned long */ ++ if (type != AT_HWCAP && type != AT_HWCAP2) { ++ return 0; ++ } ++ ++ unsigned long ret = 0; ++ elf_aux_info(type, &ret, sizeof(ret)); ++ return ret; ++} ++#endif + // Define hwcap values ourselves: building with an old auxv header where these + // hwcap values are not defined should not prevent features from being enabled. diff --git a/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp b/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp new file mode 100644 index 000000000000..a32ed7d8c7c4 --- /dev/null +++ b/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp @@ -0,0 +1,11 @@ +--- third_party/libc++/src/src/chrono.cpp.orig 2024-06-25 12:08:48 UTC ++++ third_party/libc++/src/src/chrono.cpp +@@ -31,7 +31,7 @@ + # include <sys/time.h> // for gettimeofday and timeval + #endif + +-#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) ++#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__) + # define _LIBCPP_HAS_CLOCK_GETTIME + #endif + diff --git a/www/iridium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp b/www/iridium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp new file mode 100644 index 000000000000..beb5d2e82aca --- /dev/null +++ b/www/iridium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp @@ -0,0 +1,11 @@ +--- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig 2024-06-25 12:08:48 UTC ++++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp +@@ -29,7 +29,7 @@ + # include <sys/time.h> // for gettimeofday and timeval + #endif + +-#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) ++#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__) + # define _LIBCPP_HAS_CLOCK_GETTIME + #endif + diff --git a/www/iridium/files/patch-third__party_libc++abi_src_src_cxa__guard__impl.h b/www/iridium/files/patch-third__party_libc++abi_src_src_cxa__guard__impl.h new file mode 100644 index 000000000000..8295fb5d43a3 --- /dev/null +++ b/www/iridium/files/patch-third__party_libc++abi_src_src_cxa__guard__impl.h @@ -0,0 +1,24 @@ +--- third_party/libc++abi/src/src/cxa_guard_impl.h.orig 2024-06-25 12:08:48 UTC ++++ third_party/libc++abi/src/src/cxa_guard_impl.h +@@ -411,7 +411,20 @@ struct InitByteGlobalMutex { (private) + // Futex Implementation + //===----------------------------------------------------------------------===// + +-#if defined(SYS_futex) ++#ifdef __OpenBSD__ ++#include <sys/futex.h> ++ ++void PlatformFutexWait(int* addr, int expect) { ++ constexpr int WAIT = 0; ++ futex((volatile uint32_t *)addr, WAIT, expect, NULL, NULL); ++ __tsan_acquire(addr); ++} ++void PlatformFutexWake(int* addr) { ++ constexpr int WAKE = 1; ++ __tsan_release(addr); ++ futex((volatile uint32_t *)addr, WAKE, INT_MAX, NULL, NULL); ++} ++#elif defined(SYS_futex) + void PlatformFutexWait(int* addr, int expect) { + constexpr int WAIT = 0; + syscall(SYS_futex, addr, WAIT, expect, 0); diff --git a/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c b/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c index c9b0f736aa9a..2b97da645b1a 100644 --- a/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c +++ b/www/iridium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c @@ -1,6 +1,6 @@ ---- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig 2024-02-04 14:57:47 UTC +--- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig 2024-06-25 12:08:48 UTC +++ third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c -@@ -91,9 +91,23 @@ static int arm_get_cpu_caps(void) { +@@ -92,9 +92,23 @@ static int arm_get_cpu_caps(void) { return flags; } diff --git a/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc b/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc index 17b89ac52aa5..5b759b63f3c4 100644 --- a/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc +++ b/www/iridium/files/patch-third__party_material__color__utilities_src_cpp_palettes_tones.cc @@ -1,4 +1,4 @@ ---- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/material_color_utilities/src/cpp/palettes/tones.cc @@ -14,6 +14,8 @@ * limitations under the License. @@ -8,4 +8,4 @@ + #include "cpp/palettes/tones.h" - #include "cpp/cam/cam.h" + #include <cmath> diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp index d6d2fda950fb..1fb23fdef4fb 100644 --- a/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-10-21 11:51:27 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2024-06-25 12:08:48 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -162,7 +162,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index a67ad8698d9d..2c31725b14b2 100644 --- a/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,15 +1,15 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-10-05 07:34:01 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-06-25 12:08:48 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp -@@ -18,7 +18,7 @@ - #include "third_party/base/check.h" +@@ -22,7 +22,7 @@ + #include "core/fxge/fx_font.h" + #include "core/fxge/systemfontinfo_iface.h" - #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \ -- !defined(OS_ASMJS) -+ !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD) #error "Included on the wrong platform" #endif -@@ -166,9 +166,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -170,9 +170,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index af90f679109c..a9925042ae94 100644 --- a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2022-10-05 07:34:01 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2024-06-25 12:08:48 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -37,6 +37,11 @@ double GetLocalTZA() { +@@ -39,6 +39,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if BUILDFLAG(IS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -45,6 +50,7 @@ double GetLocalTZA() { +@@ -47,6 +52,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif return (double)(-(timezone * 1000)); diff --git a/www/iridium/files/patch-third__party_pdfium_pdfium.gni b/www/iridium/files/patch-third__party_pdfium_pdfium.gni index 21c0387621be..91e02b17eb56 100644 --- a/www/iridium/files/patch-third__party_pdfium_pdfium.gni +++ b/www/iridium/files/patch-third__party_pdfium_pdfium.gni @@ -1,6 +1,6 @@ ---- third_party/pdfium/pdfium.gni.orig 2024-02-04 14:46:08 UTC +--- third_party/pdfium/pdfium.gni.orig 2024-06-25 12:08:48 UTC +++ third_party/pdfium/pdfium.gni -@@ -41,7 +41,7 @@ declare_args() { +@@ -42,7 +42,7 @@ declare_args() { # PDFium will use PartitionAlloc partitions to separate strings, scalars, # etc. from other allocations. However, the use of PartitionAlloc for new or # malloc is controlled by args in build_overrides/partition_alloc.gni. diff --git a/www/iridium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h b/www/iridium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h deleted file mode 100644 index a14688d02e11..000000000000 --- a/www/iridium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/pdfium/third_party/base/compiler_specific.h.orig 2023-07-24 14:27:53 UTC -+++ third_party/pdfium/third_party/base/compiler_specific.h -@@ -17,7 +17,7 @@ - // Annotate a function indicating it should not be inlined. - // Use like: - // NOINLINE void DoStuff() { ... } --#if defined(__clang__) && HAS_ATTRIBUTE(noinline) -+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline) - #define NOINLINE [[clang::noinline]] - #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline) - #define NOINLINE __attribute__((noinline)) diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h index 964cf02733d5..5ddac84d4a3e 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/time.h.orig 2024-02-04 14:46:08 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2024-06-25 12:08:48 UTC +++ third_party/perfetto/include/perfetto/base/time.h -@@ -167,6 +167,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -201,6 +201,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -174,6 +177,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -208,6 +211,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,7 +18,7 @@ } inline TimeNanos GetWallTimeNs() { -@@ -181,7 +185,13 @@ inline TimeNanos GetWallTimeNs() { +@@ -215,7 +219,13 @@ inline TimeNanos GetWallTimeNs() { } inline TimeNanos GetWallTimeRawNs() { diff --git a/www/iridium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/iridium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc deleted file mode 100644 index 8c8f47c9cbab..000000000000 --- a/www/iridium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig 2024-02-04 14:46:08 UTC -+++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc -@@ -251,8 +251,13 @@ BitVector NumericStorage::LinearSearchInternal(FilterO - } else if (const auto* i32 = std::get_if<int32_t>(&*val)) { - auto* start = static_cast<const int32_t*>(data_) + range.start; - TypedLinearSearch(*i32, start, op, builder); -+#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) -+ } else if (const auto* db = std::get_if<long double>(&*val)) { -+ auto* start = static_cast<const long double*>(data_) + range.start; -+#else - } else if (const auto* db = std::get_if<double>(&*val)) { - auto* start = static_cast<const double*>(data_) + range.start; -+#endif - TypedLinearSearch(*db, start, op, builder); - } else { - PERFETTO_DFATAL("Invalid"); diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_clock__snapshots.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_clock__snapshots.cc new file mode 100644 index 000000000000..cc78a64038cd --- /dev/null +++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_clock__snapshots.cc @@ -0,0 +1,12 @@ +--- third_party/perfetto/src/tracing/core/clock_snapshots.cc.orig 2024-06-25 12:08:48 UTC ++++ third_party/perfetto/src/tracing/core/clock_snapshots.cc +@@ -26,7 +26,8 @@ ClockSnapshotVector CaptureClockSnapshots() { + ClockSnapshotVector snapshot_data; + #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ +- !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + struct { + clockid_t id; + protos::pbzero::BuiltinClock type; diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc deleted file mode 100644 index fe1219b964fe..000000000000 --- a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-10-21 11:51:27 UTC -+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3213,7 +3213,8 @@ bool TracingServiceImpl::SnapshotClocks( - - #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ - !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ -- !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) - struct { - clockid_t id; - protos::pbzero::BuiltinClock type; diff --git a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc deleted file mode 100644 index 9bd908838775..000000000000 --- a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/protobuf/src/google/protobuf/arenastring.cc.orig 2022-10-05 07:34:01 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/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index d8fe63cb0499..a8dffb5a8e19 100644 --- a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,11 +1,11 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2022-10-05 07:34:01 UTC +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2024-06-25 12:08:48 UTC +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h @@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR --#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__) -+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) +-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) ++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__) // Android ndk does not support the __thread keyword very well yet. Here // we use pthread_key_create()/pthread_getspecific()/... methods for // TLS support on android. diff --git a/www/iridium/files/patch-third__party_skia_src_base_SkContainers.cpp b/www/iridium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp index e8aa8c32888c..928249397d42 100644 --- a/www/iridium/files/patch-third__party_skia_src_base_SkContainers.cpp +++ b/www/iridium/files/patch-third__party_skia_src_ports_SkMemory__malloc.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/base/SkContainers.cpp.orig 2023-03-13 07:33:08 UTC -+++ third_party/skia/src/base/SkContainers.cpp -@@ -14,7 +14,7 @@ +--- third_party/skia/src/ports/SkMemory_malloc.cpp.orig 2024-06-25 12:08:48 UTC ++++ third_party/skia/src/ports/SkMemory_malloc.cpp +@@ -15,7 +15,7 @@ #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) #include <malloc/malloc.h> @@ -9,12 +9,12 @@ #include <malloc.h> #elif defined(SK_BUILD_FOR_WIN) #include <malloc.h> -@@ -38,7 +38,7 @@ SkSpan<std::byte> complete_size(void* ptr, size_t size +@@ -126,7 +126,7 @@ size_t sk_malloc_size(void* addr, size_t size) { #elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17 - completeSize = malloc_usable_size(ptr); + completeSize = malloc_usable_size(addr); SkASSERT(completeSize >= size); - #elif defined(SK_BUILD_FOR_UNIX) + #elif defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) - completeSize = malloc_usable_size(ptr); + completeSize = malloc_usable_size(addr); SkASSERT(completeSize >= size); #elif defined(SK_BUILD_FOR_WIN) diff --git a/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h index 3b4179df6233..acc9f028b8a3 100644 --- a/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h +++ b/www/iridium/files/patch-third__party_speech-dispatcher_libspeechd__version.h @@ -1,4 +1,4 @@ ---- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-02-04 14:46:08 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-06-25 12:08:48 UTC +++ third_party/speech-dispatcher/libspeechd_version.h @@ -0,0 +1,29 @@ +/* @@ -19,7 +19,7 @@ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * -+ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.1 2024/02/04 14:12:14 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.2 2024/06/22 06:03:34 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index b32106326df0..afb782e209c1 100644 --- a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,15 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-02-04 14:46:08 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-06-25 12:08:48 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -44313,7 +44313,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -14119,7 +14119,7 @@ struct fts5_api { + ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit + ** it. + */ +-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) ++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__) + # define _XOPEN_SOURCE 600 + #endif + +@@ -44777,7 +44777,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 +22,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -44328,6 +44333,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -44792,6 +44797,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc index 1b378344a90f..90d679f6a85d 100644 --- a/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc +++ b/www/iridium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc @@ -1,4 +1,4 @@ ---- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/test_fonts/fontconfig/fontconfig_util_linux.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be @@ -9,7 +9,7 @@ #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" #include <fontconfig/fontconfig.h> -@@ -15,11 +17,15 @@ +@@ -16,11 +18,15 @@ namespace test_fonts { std::string GetSysrootDir() { diff --git a/www/iridium/files/patch-third__party_tflite_features.gni b/www/iridium/files/patch-third__party_tflite_features.gni index 365853e0a3ae..ea03677bdff4 100644 --- a/www/iridium/files/patch-third__party_tflite_features.gni +++ b/www/iridium/files/patch-third__party_tflite_features.gni @@ -1,14 +1,13 @@ ---- third_party/tflite/features.gni.orig 2024-02-04 14:46:08 UTC +--- third_party/tflite/features.gni.orig 2024-06-25 12:08:48 UTC +++ third_party/tflite/features.gni -@@ -8,9 +8,9 @@ declare_args() { +@@ -8,8 +8,8 @@ declare_args() { # This enables building TFLite with XNNPACK. Currently only available for - # Linux or macOS arm64/x64 and Windows x64 targets. + # Linux, macOS and Windows arm64/x64/x86 targets. build_tflite_with_xnnpack = -- ((is_linux || is_mac) && -+ (((is_linux || is_mac) && - (current_cpu == "arm64" || current_cpu == "x64")) || -- (is_win && current_cpu == "x64") -+ (is_win && current_cpu == "x64")) && !is_bsd +- (is_linux || is_mac || is_win) && +- (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86") ++ ((is_linux || is_mac || is_win) && ++ (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")) && !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/iridium/files/patch-third__party_unrar_src_crypt.cpp b/www/iridium/files/patch-third__party_unrar_src_crypt.cpp index 594034ff818c..3214d75c77a8 100644 --- a/www/iridium/files/patch-third__party_unrar_src_crypt.cpp +++ b/www/iridium/files/patch-third__party_unrar_src_crypt.cpp @@ -1,6 +1,6 @@ ---- third_party/unrar/src/crypt.cpp.orig 2022-03-28 18:11:04 UTC +--- third_party/unrar/src/crypt.cpp.orig 2024-06-25 12:08:48 UTC +++ third_party/unrar/src/crypt.cpp -@@ -120,6 +120,8 @@ void GetRnd(byte *RndBuf,size_t BufSize) +@@ -114,6 +114,8 @@ void GetRnd(byte *RndBuf,size_t BufSize) Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) == TRUE; CryptReleaseContext(hProvider, 0); } diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn index 15cadeeaeb90..581a230fafe9 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-07-24 14:27:53 UTC +--- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn @@ -59,7 +59,7 @@ config("vulkan_internal_config") { defines += [ @@ -8,4 +8,4 @@ + "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"", ] } - if (!vulkan_loader_shared) { + if (is_apple && !vulkan_loader_shared) { diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index 2b85ff666909..ec164a2a7d67 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-11-22 14:00:11 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-06-25 12:08:48 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -312,7 +312,15 @@ static inline char *loader_platform_executable_path(ch +@@ -327,7 +327,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn index 74d1009f4e5a..ab8013f29e02 100644 --- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2023-11-22 14:00:11 UTC +--- third_party/webrtc/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/webrtc/BUILD.gn -@@ -217,6 +217,9 @@ config("common_inherited_config") { +@@ -219,6 +219,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 49e08d6d45a7..89f315f45653 100644 --- a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -349,7 +349,7 @@ rtc_library("audio_device_impl") { +@@ -340,7 +340,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc index e39b3147e86d..34e637e36472 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2023-07-24 14:27:53 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -292,7 +292,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index d15ea05a261a..59a56dd04b06 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2024-06-25 12:08:48 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" @@ -9,7 +9,7 @@ #include <linux/sockios.h> #endif -@@ -73,7 +73,7 @@ typedef void* SockOptArg; +@@ -74,7 +74,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -307,7 +307,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -329,7 +329,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -325,7 +325,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -358,7 +358,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -353,7 +353,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -389,7 +389,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), @@ -45,7 +45,7 @@ // Suppress SIGPIPE. Without this, attempting to send on a socket whose // other end is closed will result in a SIGPIPE signal being raised to // our process, which by default will terminate the process, which we -@@ -382,7 +382,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -418,7 +418,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -697,7 +697,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; @@ -63,3 +63,52 @@ RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported."; return -1; #elif defined(WEBRTC_POSIX) +@@ -746,7 +746,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s + return -1; + #endif + case OPT_RECV_ECN: +-#if defined(WEBRTC_POSIX) ++#if defined(WEBRTC_POSIX) && defined(IP_RECVTOS) + if (family_ == AF_INET6) { + *slevel = IPPROTO_IPV6; + *sopt = IPV6_RECVTCLASS; +@@ -766,10 +766,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s + *sopt = SO_KEEPALIVE; + break; + case OPT_TCP_KEEPCNT: ++#if !defined(TCP_KEEPCNT) ++ RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPCNT not supported."; ++ return -1; ++#else + *slevel = IPPROTO_TCP; + *sopt = TCP_KEEPCNT; + break; ++#endif + case OPT_TCP_KEEPIDLE: ++#if !defined(TCP_KEEPALIVE) ++ RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPALIVE not supported."; ++ return -1; ++#else + *slevel = IPPROTO_TCP; + #if !defined(WEBRTC_MAC) + *sopt = TCP_KEEPIDLE; +@@ -777,12 +786,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s + *sopt = TCP_KEEPALIVE; + #endif + break; ++#endif + case OPT_TCP_KEEPINTVL: ++#if !defined(TCP_KEEPALIVE) ++ RTC_LOG(LS_WARNING) << "Socket::OPT_TCP_KEEPINTVL not supported."; ++ return -1; ++#else + *slevel = IPPROTO_TCP; + *sopt = TCP_KEEPINTVL; + break; ++#endif + case OPT_TCP_USER_TIMEOUT: +-#if defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) ++#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && defined(TCP_USER_TIMEOUT) + *slevel = IPPROTO_TCP; + *sopt = TCP_USER_TIMEOUT; + break; diff --git a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index f1696d6bc0fc..39303cbb0895 100644 --- a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -64,8 +64,6 @@ rtc_library("system_wrappers") { +@@ -63,8 +63,6 @@ rtc_library("system_wrappers") { if (!build_with_chromium) { sources += [ "source/cpu_features_linux.cc" ] } diff --git a/www/iridium/files/patch-third__party_zlib_BUILD.gn b/www/iridium/files/patch-third__party_zlib_BUILD.gn index 5ccc41bd8552..232661087a8a 100644 --- a/www/iridium/files/patch-third__party_zlib_BUILD.gn +++ b/www/iridium/files/patch-third__party_zlib_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/zlib/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- third_party/zlib/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ third_party/zlib/BUILD.gn -@@ -127,7 +127,7 @@ if (use_arm_neon_optimizations) { +@@ -128,7 +128,7 @@ if (use_arm_neon_optimizations) { defines = [ "CRC32_ARMV8_CRC32" ] if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] @@ -9,7 +9,7 @@ defines += [ "ARMV8_OS_LINUX" ] } else if (is_mac) { defines += [ "ARMV8_OS_MACOS" ] -@@ -137,6 +137,10 @@ if (use_arm_neon_optimizations) { +@@ -138,6 +138,10 @@ if (use_arm_neon_optimizations) { defines += [ "ARMV8_OS_FUCHSIA" ] } else if (is_win) { defines += [ "ARMV8_OS_WINDOWS" ] @@ -20,7 +20,7 @@ } else { assert(false, "Unsupported ARM OS") } -@@ -408,7 +412,7 @@ static_library("minizip") { +@@ -407,7 +411,7 @@ static_library("minizip") { ] } diff --git a/www/iridium/files/patch-third__party_zlib_cpu__features.c b/www/iridium/files/patch-third__party_zlib_cpu__features.c index 83bf30b1f875..1b03475a4e5f 100644 --- a/www/iridium/files/patch-third__party_zlib_cpu__features.c +++ b/www/iridium/files/patch-third__party_zlib_cpu__features.c @@ -1,16 +1,16 @@ ---- third_party/zlib/cpu_features.c.orig 2023-10-21 11:51:27 UTC +--- third_party/zlib/cpu_features.c.orig 2024-06-25 12:08:48 UTC +++ third_party/zlib/cpu_features.c -@@ -35,7 +35,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; - +@@ -39,7 +39,8 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0; #ifndef CPU_NO_SIMD --#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) -+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \ + #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \ +- defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) ++ defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \ + defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) #include <pthread.h> #endif -@@ -52,6 +53,10 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; +@@ -56,6 +57,10 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0; #include <windows.h> #elif defined(ARMV8_OS_IOS) #include <sys/sysctl.h> @@ -21,17 +21,17 @@ #elif !defined(_MSC_VER) #include <pthread.h> #else -@@ -62,7 +67,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0; - static void _cpu_check_features(void); - #endif - --#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) -+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ -+ defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD) +@@ -69,7 +74,8 @@ static void _cpu_check_features(void); + #if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || \ + defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || \ + defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || \ +- defined(RISCV_RVV) ++ defined(RISCV_RVV) || defined(ARMV8_OS_OPENBSD) || \ ++ defined(ARMV8_OS_FREEBSD) #if !defined(ARMV8_OS_MACOS) // _cpu_check_features() doesn't need to do anything on mac/arm since all // features are known at build time, so don't call it. -@@ -115,6 +121,17 @@ static void _cpu_check_features(void) +@@ -122,6 +128,17 @@ static void _cpu_check_features(void) unsigned long features = getauxval(AT_HWCAP2); arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32); arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL); @@ -44,7 +44,7 @@ + if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL) + arm_cpu_enable_pmull = 1; + -+ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) ++ if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE) + arm_cpu_enable_crc32 = 1; #elif defined(ARMV8_OS_FUCHSIA) uint32_t features; diff --git a/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py deleted file mode 100644 index 8f51d62c3310..000000000000 --- a/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2024-04-19 13:02:56 UTC -+++ tools/gn/bootstrap/bootstrap.py -@@ -122,7 +122,7 @@ def main(argv): - - shutil.copy2( - os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) -- cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'] -+ cmd = [ninja_binary, '-C', gn_build_dir, 'gn'] - if options.jobs: - cmd += ['-j', str(options.jobs)] - subprocess.check_call(cmd) diff --git a/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template b/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template index 41f6a42e2a63..243caea9550e 100644 --- a/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template +++ b/www/iridium/files/patch-tools_gn_build_build__linux.ninja.template @@ -1,11 +1,11 @@ ---- tools/gn/build/build_linux.ninja.template.orig 2022-03-28 18:11:04 UTC +--- tools/gn/build/build_linux.ninja.template.orig 2024-06-25 12:08:48 UTC +++ tools/gn/build/build_linux.ninja.template @@ -5,7 +5,7 @@ rule cxx deps = gcc rule alink_thin -- command = rm -f $out && $ar rcsT $out $in -+ command = rm -f $out && $ar rcs $out $in +- command = $ar rcsT $out $in ++ command = $ar rcs $out $in description = AR $out rule link diff --git a/www/iridium/files/patch-tools_gn_build_gen.py b/www/iridium/files/patch-tools_gn_build_gen.py index fe318adaed77..f670fae93efe 100644 --- a/www/iridium/files/patch-tools_gn_build_gen.py +++ b/www/iridium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2023-10-21 11:51:27 UTC +--- tools/gn/build/gen.py.orig 2024-06-25 12:08:48 UTC +++ tools/gn/build/gen.py @@ -94,6 +94,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd', 'serenity'] -@@ -288,7 +294,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -304,7 +310,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -512,6 +518,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -539,6 +545,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/iridium/files/patch-tools_grit_grit_node_base.py b/www/iridium/files/patch-tools_grit_grit_node_base.py new file mode 100644 index 000000000000..55700c2c1ebc --- /dev/null +++ b/www/iridium/files/patch-tools_grit_grit_node_base.py @@ -0,0 +1,12 @@ +--- tools/grit/grit/node/base.py.orig 2024-06-25 12:08:48 UTC ++++ tools/grit/grit/node/base.py +@@ -498,7 +498,8 @@ class Node: + value = defs + + elif name == 'is_linux': +- value = target_platform == 'linux' ++ value = (target_platform == 'linux' ++ or 'bsd' in target_platform) + elif name == 'is_chromeos': + value = target_platform == 'chromeos' + elif name == 'is_macosx': diff --git a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py index 35488ce66440..19ab8c2a868a 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2023-07-24 14:27:53 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2024-06-25 12:08:48 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -272,6 +272,8 @@ FEATURE_GRAMMAR = ({ +@@ -277,6 +277,8 @@ FEATURE_GRAMMAR = ({ 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', diff --git a/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h b/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h index d092423aa14b..d92ef47a596f 100644 --- a/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h +++ b/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h @@ -1,6 +1,6 @@ ---- tools/memory/partition_allocator/inspect_utils.h.orig 2022-10-05 07:34:01 UTC +--- tools/memory/partition_allocator/inspect_utils.h.orig 2024-06-25 12:08:48 UTC +++ tools/memory/partition_allocator/inspect_utils.h -@@ -60,7 +60,7 @@ class RemoteProcessMemoryReader { +@@ -61,7 +61,7 @@ class RemoteProcessMemoryReader { const pid_t pid_; bool is_valid_; diff --git a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index f8c7bacfd051..9db8fe8e731c 100644 --- a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn @@ -47,7 +47,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] @@ -9,7 +9,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] # CrOS currently has issues with the locally compiled version of -@@ -176,7 +176,7 @@ group("telemetry_chrome_test_without_chrome") { +@@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chrome") { ] # Cr-Fuchsia doesn't support breakpad. diff --git a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py index f1c397dadead..5cbdebbabb5d 100644 --- a/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py +++ b/www/iridium/files/patch-tools_protoc__wrapper_protoc__wrapper.py @@ -1,6 +1,6 @@ ---- tools/protoc_wrapper/protoc_wrapper.py.orig 2023-10-21 11:51:27 UTC +--- tools/protoc_wrapper/protoc_wrapper.py.orig 2024-06-25 12:08:48 UTC +++ tools/protoc_wrapper/protoc_wrapper.py -@@ -179,15 +179,19 @@ def main(argv): +@@ -183,15 +183,19 @@ def main(argv): if not options.exclude_imports: protoc_cmd += ["--include_imports"] diff --git a/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc b/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc index 0a3a690511e8..bd7f47f24621 100644 --- a/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc +++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc @@ -1,6 +1,6 @@ ---- ui/base/clipboard/clipboard_non_backed.cc.orig 2024-02-04 14:46:08 UTC +--- ui/base/clipboard/clipboard_non_backed.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/clipboard/clipboard_non_backed.cc -@@ -459,7 +459,7 @@ ClipboardNonBacked::ClipboardNonBacked() { +@@ -461,7 +461,7 @@ ClipboardNonBacked::ClipboardNonBacked() { // so create internal clipboards for platform supported clipboard buffers. constexpr ClipboardBuffer kClipboardBuffers[] = { ClipboardBuffer::kCopyPaste, diff --git a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc index 0af2971865de..ea58644200b5 100644 --- a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2023-10-21 11:51:27 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -98,7 +98,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -97,7 +97,7 @@ void CursorFactory::ObserveThemeChanges() { NOTIMPLEMENTED(); } diff --git a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index 36128ff2a161..457d56947b00 100644 --- a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,9 +1,9 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2023-11-22 14:00:11 UTC +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -96,7 +96,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( - } +@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( - bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { + std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString() + const { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (HasFile()) { diff --git a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc index 7db022656373..bd4a8bf13ed3 100644 --- a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc +++ b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.cc.orig 2023-10-21 11:51:27 UTC +--- ui/base/ime/fake_text_input_client.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/ime/fake_text_input_client.cc -@@ -171,7 +171,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -210,7 +210,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h index 3f5d89fb049b..6dbe266fc036 100644 --- a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h +++ b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.h.orig 2023-10-21 11:51:27 UTC +--- ui/base/ime/fake_text_input_client.h.orig 2024-06-25 12:08:48 UTC +++ ui/base/ime/fake_text_input_client.h -@@ -74,7 +74,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -98,7 +98,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc new file mode 100644 index 000000000000..50cb9fa8ce70 --- /dev/null +++ b/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -0,0 +1,29 @@ +--- ui/base/ime/init/input_method_initializer.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/base/ime/init/input_method_initializer.cc +@@ -10,7 +10,7 @@ + #include "build/chromeos_buildflags.h" + + #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 "ui/base/ime/linux/fake_input_method_context.h" + #include "ui/base/ime/linux/linux_input_method_context_factory.h" + #elif BUILDFLAG(IS_WIN) +@@ -33,7 +33,7 @@ void ShutdownInputMethod() { + } + + void InitializeInputMethodForTesting() { +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + GetInputMethodContextFactoryForTest() = + base::BindRepeating([](LinuxInputMethodContextDelegate* delegate) + -> std::unique_ptr<LinuxInputMethodContext> { +@@ -46,7 +46,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)) + // 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/iridium/files/patch-ui_base_ime_text__input__client.h b/www/iridium/files/patch-ui_base_ime_text__input__client.h index 69d184c20e47..40d3c505d29d 100644 --- a/www/iridium/files/patch-ui_base_ime_text__input__client.h +++ b/www/iridium/files/patch-ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/text_input_client.h.orig 2023-07-24 14:27:53 UTC +--- ui/base/ime/text_input_client.h.orig 2024-06-25 12:08:48 UTC +++ ui/base/ime/text_input_client.h -@@ -265,7 +265,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient +@@ -266,7 +266,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/iridium/files/patch-ui_base_resource_resource__bundle.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc index fdb232aba7a8..13d372b0cde6 100644 --- a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2023-11-22 14:00:11 UTC +--- ui/base/resource/resource_bundle.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/resource/resource_bundle.cc -@@ -925,7 +925,7 @@ void ResourceBundle::ReloadFonts() { +@@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index f7be90f32c4d..40c4d91623a0 100644 --- a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,8 +1,8 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-10-21 11:51:27 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/test/skia_gold_pixel_diff.cc @@ -115,7 +115,7 @@ const char* GetPlatformName() { return "macOS"; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_base_test_ui__controls.h b/www/iridium/files/patch-ui_base_test_ui__controls.h index c3cbdbbd5fbb..7c4e4ad4c792 100644 --- a/www/iridium/files/patch-ui_base_test_ui__controls.h +++ b/www/iridium/files/patch-ui_base_test_ui__controls.h @@ -1,6 +1,6 @@ ---- ui/base/test/ui_controls.h.orig 2024-02-04 14:46:08 UTC +--- ui/base/test/ui_controls.h.orig 2024-06-25 12:08:48 UTC +++ ui/base/test/ui_controls.h -@@ -183,7 +183,7 @@ bool SendTouchEventsNotifyWhenDone(int action, +@@ -186,7 +186,7 @@ bool SendTouchEventsNotifyWhenDone(int action, base::OnceClosure task); #endif diff --git a/www/iridium/files/patch-ui_base_ui__base__features.cc b/www/iridium/files/patch-ui_base_ui__base__features.cc index 416fbf888ad1..440d6454f9c9 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.cc +++ b/www/iridium/files/patch-ui_base_ui__base__features.cc @@ -1,15 +1,15 @@ ---- ui/base/ui_base_features.cc.orig 2024-02-04 14:46:08 UTC +--- ui/base/ui_base_features.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/ui_base_features.cc -@@ -224,7 +224,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -245,7 +245,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_WIN) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -337,7 +337,7 @@ bool IsForcedColorsEnabled() { +@@ -339,7 +339,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-ui_base_ui__base__types.h b/www/iridium/files/patch-ui_base_ui__base__types.h deleted file mode 100644 index ee09376ae76f..000000000000 --- a/www/iridium/files/patch-ui_base_ui__base__types.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/base/ui_base_types.h.orig 2022-12-06 08:09:13 UTC -+++ ui/base/ui_base_types.h -@@ -32,7 +32,7 @@ enum WindowShowState { - SHOW_STATE_END = 6 // The end of show state enum. - }; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Specifies which edges of the window are tiled. - // - // Wayland can notify the application if certain edge of the window is diff --git a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc index a6b3a86de85c..5da525ede289 100644 --- a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2024-02-04 14:46:08 UTC +--- ui/base/webui/web_ui_util.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/webui/web_ui_util.cc -@@ -38,7 +38,7 @@ namespace { +@@ -39,7 +39,7 @@ namespace { constexpr float kMaxScaleFactor = 1000.0f; std::string GetFontFamilyMd() { @@ -11,7 +11,7 @@ return GetFontFamily(); @@ -216,7 +216,7 @@ std::string GetFontFamily() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc index f680e693ad45..c73b7f2f08a7 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,15 +1,15 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2023-11-22 14:00:11 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ + #include "ui/gfx/x/connection.h" #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 -@@ -138,7 +138,11 @@ std::string CursorPathFromLibXcursor() { +@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -249,7 +253,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -448,7 +452,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -442,7 +446,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/www/iridium/files/patch-ui_base_x_x11__display__manager.cc b/www/iridium/files/patch-ui_base_x_x11__display__manager.cc index 12d5aef80e7c..aa0214227a2b 100644 --- a/www/iridium/files/patch-ui_base_x_x11__display__manager.cc +++ b/www/iridium/files/patch-ui_base_x_x11__display__manager.cc @@ -1,7 +1,7 @@ ---- ui/base/x/x11_display_manager.cc.orig 2023-11-22 14:00:11 UTC +--- ui/base/x/x11_display_manager.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/x/x11_display_manager.cc -@@ -15,7 +15,7 @@ - #include "ui/gfx/x/x11_atom_cache.h" +@@ -16,7 +16,7 @@ + #include "ui/gfx/x/randr.h" #include "ui/gfx/x/xproto.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -91,7 +91,7 @@ void XDisplayManager::FetchDisplayList() { +@@ -92,7 +92,7 @@ void XDisplayManager::FetchDisplayList() { ? display::Display::GetForcedDeviceScaleFactor() : 1.0f}; const auto* display_config = &empty_display_config; diff --git a/www/iridium/files/patch-ui_base_x_x11__display__util.cc b/www/iridium/files/patch-ui_base_x_x11__display__util.cc new file mode 100644 index 000000000000..ce9ed3a2f0bd --- /dev/null +++ b/www/iridium/files/patch-ui_base_x_x11__display__util.cc @@ -0,0 +1,365 @@ +--- ui/base/x/x11_display_util.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/base/x/x11_display_util.cc +@@ -14,7 +14,6 @@ + + #include "base/bits.h" + #include "base/command_line.h" +-#include "base/containers/flat_map.h" + #include "base/logging.h" + #include "base/numerics/clamped_math.h" + #include "base/ranges/algorithm.h" +@@ -28,7 +27,6 @@ + #include "ui/gfx/geometry/rect.h" + #include "ui/gfx/geometry/rect_conversions.h" + #include "ui/gfx/geometry/rect_f.h" +-#include "ui/gfx/switches.h" + #include "ui/gfx/x/atom_cache.h" + #include "ui/gfx/x/connection.h" + #include "ui/gfx/x/randr.h" +@@ -43,89 +41,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra + + constexpr const char kRandrEdidProperty[] = "EDID"; + +-std::map<x11::RandR::Output, size_t> GetMonitors( +- const x11::Response<x11::RandR::GetMonitorsReply>& reply) { +- std::map<x11::RandR::Output, size_t> output_to_monitor; +- if (!reply) { +- return output_to_monitor; +- } +- for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) { +- for (x11::RandR::Output output : reply->monitors[monitor].outputs) { +- output_to_monitor[output] = monitor; ++std::map<x11::RandR::Output, int> GetMonitors( ++ std::pair<uint32_t, uint32_t> version, ++ x11::RandR* randr, ++ x11::Window window) { ++ std::map<x11::RandR::Output, int> output_to_monitor; ++ if (version >= std::pair<uint32_t, uint32_t>{1, 5}) { ++ if (auto reply = randr->GetMonitors({window}).Sync()) { ++ for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) { ++ for (x11::RandR::Output output : reply->monitors[monitor].outputs) { ++ output_to_monitor[output] = monitor; ++ } ++ } + } + } + return output_to_monitor; + } + +-x11::Future<x11::GetPropertyReply> GetWorkAreaFuture( +- x11::Connection* connection) { +- return connection->GetProperty({ +- .window = connection->default_root(), +- .property = connection->GetAtom("_NET_WORKAREA"), +- .long_length = 4, +- }); +-} +- +-gfx::Rect GetWorkAreaSync(x11::Future<x11::GetPropertyReply> future) { +- auto response = future.Sync(); +- if (!response || response->format != 32 || response->value_len != 4) { +- return gfx::Rect(); +- } +- const uint32_t* value = response->value->cast_to<uint32_t>(); +- return gfx::Rect(value[0], value[1], value[2], value[3]); +-} +- +-x11::Future<x11::GetPropertyReply> GetIccProfileFuture( +- x11::Connection* connection, +- size_t monitor) { +- std::string atom_name = monitor == 0 +- ? "_ICC_PROFILE" +- : base::StringPrintf("_ICC_PROFILE_%zu", monitor); +- auto future = connection->GetProperty({ +- .window = connection->default_root(), +- .property = x11::GetAtom(atom_name.c_str()), +- .long_length = std::numeric_limits<uint32_t>::max(), +- }); +- future.IgnoreError(); +- return future; +-} +- +-gfx::ICCProfile GetIccProfileSync(x11::Future<x11::GetPropertyReply> future) { +- auto response = future.Sync(); +- if (!response || !response->value_len) { +- return gfx::ICCProfile(); +- } +- return gfx::ICCProfile::FromData(response->value->bytes(), +- response->value_len * response->format / 8u); +-} +- +-x11::Future<x11::RandR::GetOutputPropertyReply> GetEdidFuture( +- x11::Connection* connection, +- x11::RandR::Output output) { +- auto future = connection->randr().GetOutputProperty({ +- .output = output, +- .property = x11::GetAtom(kRandrEdidProperty), +- .long_length = 128, +- }); +- future.IgnoreError(); +- return future; +-} +- + // Sets the work area on a list of displays. The work area for each display + // must already be initialized to the display bounds. At most one display out + // of |displays| will be affected. + void ClipWorkArea(std::vector<display::Display>* displays, +- size_t primary_display_index, +- const gfx::Rect& net_workarea) { +- if (net_workarea.IsEmpty()) { ++ size_t primary_display_index) { ++ x11::Window x_root_window = ui::GetX11RootWindow(); ++ ++ std::vector<int32_t> value; ++ if (!x11::Connection::Get()->GetArrayProperty( ++ x_root_window, x11::GetAtom("_NET_WORKAREA"), &value) || ++ value.size() < 4) { + return; + } +- + auto get_work_area = [&](const display::Display& display) { + float scale = display::Display::HasForceDeviceScaleFactor() + ? display::Display::GetForcedDeviceScaleFactor() + : display.device_scale_factor(); +- return gfx::ScaleToEnclosingRect(net_workarea, 1.0f / scale); ++ return gfx::ScaleToEnclosingRect( ++ gfx::Rect(value[0], value[1], value[2], value[3]), 1.0f / scale); + }; + + // If the work area entirely contains exactly one display, assume it's meant +@@ -207,9 +158,14 @@ int DefaultBitsPerComponent() { + return visual.bits_per_rgb_value; + } + +-// Get the EDID data from the `output` and stores to `edid`. +-std::vector<uint8_t> GetEdidProperty( +- x11::Response<x11::RandR::GetOutputPropertyReply> response) { ++// Get the EDID data from the |output| and stores to |edid|. ++std::vector<uint8_t> GetEDIDProperty(x11::RandR* randr, ++ x11::RandR::Output output) { ++ auto future = randr->GetOutputProperty(x11::RandR::GetOutputPropertyRequest{ ++ .output = output, ++ .property = x11::GetAtom(kRandrEdidProperty), ++ .long_length = 128}); ++ auto response = future.Sync(); + std::vector<uint8_t> edid; + if (response && response->format == 8 && response->type != x11::Atom::None) { + edid = std::move(response->data); +@@ -261,8 +217,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa + std::vector<display::Display> GetFallbackDisplayList( + float scale, + size_t* primary_display_index_out) { +- auto* connection = x11::Connection::Get(); +- const auto& screen = connection->default_screen(); ++ const auto& screen = x11::Connection::Get()->default_screen(); + gfx::Size physical_size(screen.width_in_millimeters, + screen.height_in_millimeters); + +@@ -289,9 +244,7 @@ std::vector<display::Display> GetFallbackDisplayList( + std::vector<display::Display> displays{gfx_display}; + *primary_display_index_out = 0; + +- ClipWorkArea(&displays, *primary_display_index_out, +- GetWorkAreaSync(GetWorkAreaFuture(connection))); +- ++ ClipWorkArea(&displays, *primary_display_index_out); + return displays; + } + +@@ -307,16 +260,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI + auto x_root_window = ui::GetX11RootWindow(); + std::vector<display::Display> displays; + +- auto resources_future = randr.GetScreenResourcesCurrent({x_root_window}); +- auto output_primary_future = randr.GetOutputPrimary({x_root_window}); +- x11::Future<x11::RandR::GetMonitorsReply> monitors_future; +- if (connection->randr_version() >= std::pair<uint32_t, uint32_t>{1, 5}) { +- monitors_future = randr.GetMonitors(x_root_window); +- } +- auto work_area_future = GetWorkAreaFuture(connection); +- connection->Flush(); +- +- auto resources = resources_future.Sync(); ++ auto resources = randr.GetScreenResourcesCurrent({x_root_window}).Sync(); + if (!resources) { + LOG(ERROR) << "XRandR returned no displays; falling back to root window"; + return GetFallbackDisplayList(primary_scale, primary_display_index_out); +@@ -325,65 +269,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI + const int depth = connection->default_screen().root_depth; + const int bits_per_component = DefaultBitsPerComponent(); + +- auto output_primary = output_primary_future.Sync(); ++ std::map<x11::RandR::Output, int> output_to_monitor = ++ GetMonitors(connection->randr_version(), &randr, x_root_window); ++ auto output_primary = randr.GetOutputPrimary({x_root_window}).Sync(); + if (!output_primary) { + return GetFallbackDisplayList(primary_scale, primary_display_index_out); + } + x11::RandR::Output primary_display_id = output_primary->output; + +- const auto monitors_reply = monitors_future.Sync(); +- const auto output_to_monitor = GetMonitors(monitors_reply); +- const size_t n_iccs = +- monitors_reply ? std::max<size_t>(1, monitors_reply->monitors.size()) : 1; +- + int explicit_primary_display_index = -1; + int monitor_order_primary_display_index = -1; + +- std::vector<x11::Future<x11::RandR::GetCrtcInfoReply>> crtc_futures{}; +- crtc_futures.reserve(resources->crtcs.size()); +- for (auto crtc : resources->crtcs) { +- crtc_futures.push_back( +- randr.GetCrtcInfo({crtc, resources->config_timestamp})); +- } +- connection->Flush(); +- +- std::vector<x11::Future<x11::GetPropertyReply>> icc_futures{n_iccs}; +- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) { +- for (size_t monitor = 0; monitor < n_iccs; ++monitor) { +- icc_futures[monitor] = GetIccProfileFuture(connection, monitor); +- } +- connection->Flush(); +- } +- +- std::vector<x11::Future<x11::RandR::GetOutputInfoReply>> output_futures{}; +- output_futures.reserve(resources->outputs.size()); +- for (auto output : resources->outputs) { +- output_futures.push_back( +- randr.GetOutputInfo({output, resources->config_timestamp})); +- } +- connection->Flush(); +- +- std::vector<x11::Future<x11::RandR::GetOutputPropertyReply>> edid_futures{}; +- edid_futures.reserve(resources->outputs.size()); +- for (auto output : resources->outputs) { +- edid_futures.push_back(GetEdidFuture(connection, output)); +- } +- connection->Flush(); +- +- base::flat_map<x11::RandR::Crtc, x11::RandR::GetCrtcInfoResponse> crtcs; +- for (size_t i = 0; i < resources->crtcs.size(); ++i) { +- crtcs.emplace(resources->crtcs[i], crtc_futures[i].Sync()); +- } +- +- std::vector<gfx::ICCProfile> iccs; +- iccs.reserve(n_iccs); +- for (auto& future : icc_futures) { +- iccs.push_back(GetIccProfileSync(std::move(future))); +- } +- + for (size_t i = 0; i < resources->outputs.size(); i++) { + x11::RandR::Output output_id = resources->outputs[i]; +- auto output_info = output_futures[i].Sync(); ++ auto output_info = ++ randr.GetOutputInfo({output_id, resources->config_timestamp}).Sync(); + if (!output_info) { + continue; + } +@@ -398,16 +298,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI + continue; + } + +- auto crtc_it = crtcs.find(output_info->crtc); +- if (crtc_it == crtcs.end()) { +- continue; +- } +- const auto& crtc = crtc_it->second; ++ auto crtc = ++ randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp}) ++ .Sync(); + if (!crtc) { + continue; + } + +- display::EdidParser edid_parser(GetEdidProperty(edid_futures[i].Sync())); ++ display::EdidParser edid_parser( ++ GetEDIDProperty(&randr, static_cast<x11::RandR::Output>(output_id))); + auto output_32 = static_cast<uint32_t>(output_id); + int64_t display_id = + output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32); +@@ -462,9 +361,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI + } + + if (!display::HasForceDisplayColorProfile()) { +- const size_t monitor = +- monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second; +- const auto& icc_profile = iccs[monitor < iccs.size() ? monitor : 0]; ++ gfx::ICCProfile icc_profile = ui::GetICCProfileForMonitor( ++ monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second); + gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace(); + + // Most folks do not have an ICC profile set up, but we still want to +@@ -509,24 +407,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI + ConvertDisplayBoundsToDips(&displays, *primary_display_index_out); + } + +- ClipWorkArea(&displays, *primary_display_index_out, +- GetWorkAreaSync(std::move(work_area_future))); ++ ClipWorkArea(&displays, *primary_display_index_out); + return displays; + } + + base::TimeDelta GetPrimaryDisplayRefreshIntervalFromXrandr() { + constexpr base::TimeDelta kDefaultInterval = base::Seconds(1. / 60); +- +- size_t primary_display_index = 0; +- auto displays = BuildDisplaysFromXRandRInfo(display::DisplayConfig(), +- &primary_display_index); +- CHECK_LT(primary_display_index, displays.size()); +- ++ x11::RandR randr = x11::Connection::Get()->randr(); ++ auto root = ui::GetX11RootWindow(); ++ auto resources = randr.GetScreenResourcesCurrent({root}).Sync(); ++ if (!resources) { ++ return kDefaultInterval; ++ } + // TODO(crbug.com/41321728): It might make sense here to pick the output that + // the window is on. On the other hand, if compositing is enabled, all drawing + // might be synced to the primary output anyway. Needs investigation. +- auto frequency = displays[primary_display_index].display_frequency(); +- return frequency > 0 ? base::Seconds(1. / frequency) : kDefaultInterval; ++ auto output_primary = randr.GetOutputPrimary({root}).Sync(); ++ if (!output_primary) { ++ return kDefaultInterval; ++ } ++ x11::RandR::Output primary_output = output_primary->output; ++ bool disconnected_primary = false; ++ for (size_t i = 0; i < resources->outputs.size(); i++) { ++ if (!disconnected_primary && resources->outputs[i] != primary_output) { ++ continue; ++ } ++ ++ auto output_info = ++ randr.GetOutputInfo({primary_output, resources->config_timestamp}) ++ .Sync(); ++ if (!output_info) { ++ continue; ++ } ++ ++ if (output_info->connection != x11::RandR::RandRConnection::Connected) { ++ // If the primary monitor is disconnected, then start over and choose the ++ // first connected monitor instead. ++ if (!disconnected_primary) { ++ disconnected_primary = true; ++ i = -1; ++ } ++ continue; ++ } ++ auto crtc = ++ randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp}) ++ .Sync(); ++ if (!crtc) { ++ continue; ++ } ++ float refresh_rate = ++ GetRefreshRateFromXRRModeInfo(resources->modes, crtc->mode); ++ if (refresh_rate == 0) { ++ continue; ++ } ++ ++ return base::Seconds(1. / refresh_rate); ++ } ++ return kDefaultInterval; + } + + int RangeDistance(int min1, int max1, int min2, int max2) { diff --git a/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc b/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc index de836a1af833..1466cf515569 100644 --- a/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc +++ b/www/iridium/files/patch-ui_base_x_x11__shm__image__pool.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_shm_image_pool.cc.orig 2023-03-13 07:33:08 UTC +--- ui/base/x/x11_shm_image_pool.cc.orig 2024-06-25 12:08:48 UTC +++ ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ #include "base/functional/callback.h" @@ -23,17 +23,35 @@ } std::size_t MaxShmSegmentSize() { -@@ -65,6 +70,9 @@ bool IsRemoteHost(const std::string& name) { +@@ -57,14 +62,19 @@ std::size_t MaxShmSegmentSize() { } + #if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_BSD) + bool IsRemoteHost(const std::string& name) { + if (name.empty()) + return false; + + return !net::HostStringIsLocalhost(name); + } ++#endif + bool ShouldUseMitShm(x11::Connection* connection) { +#if BUILDFLAG(IS_BSD) + return false; -+#endif ++#else // MIT-SHM may be available on remote connetions, but it will be unusable. Do // a best-effort check to see if the host is remote to disable the SHM // codepath. It may be possible in contrived cases for there to be a -@@ -183,7 +191,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -93,6 +103,7 @@ bool ShouldUseMitShm(x11::Connection* connection) { + return false; + + return true; ++#endif + } + #endif + +@@ -183,7 +194,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size shmctl(state.shmid, IPC_RMID, nullptr); return false; } @@ -42,7 +60,7 @@ // On Linux, a shmid can still be attached after IPC_RMID if otherwise // kept alive. Detach before XShmAttach to prevent a memory leak in case // the process dies. -@@ -202,7 +210,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -202,7 +213,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size return false; state.shmseg = shmseg; state.shmem_attached_to_server = true; diff --git a/www/iridium/files/patch-ui_base_x_x11__util.cc b/www/iridium/files/patch-ui_base_x_x11__util.cc new file mode 100644 index 000000000000..bde85f23b3c9 --- /dev/null +++ b/www/iridium/files/patch-ui_base_x_x11__util.cc @@ -0,0 +1,23 @@ +--- ui/base/x/x11_util.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/base/x/x11_util.cc +@@ -703,4 +703,20 @@ gfx::ImageSkia GetNativeWindowIcon(intptr_t target_win + return gfx::ImageSkia::CreateFrom1xBitmap(result); + } + ++gfx::ICCProfile GetICCProfileForMonitor(int monitor) { ++ gfx::ICCProfile icc_profile; ++ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) { ++ return icc_profile; ++ } ++ std::string atom_name = monitor == 0 ++ ? "_ICC_PROFILE" ++ : base::StringPrintf("_ICC_PROFILE_%d", monitor); ++ scoped_refptr<base::RefCountedMemory> data; ++ if (GetRawBytesOfProperty(GetX11RootWindow(), x11::GetAtom(atom_name.c_str()), ++ &data, nullptr)) { ++ icc_profile = gfx::ICCProfile::FromData(data->data(), data->size()); ++ } ++ return icc_profile; ++} ++ + } // namespace ui diff --git a/www/iridium/files/patch-ui_base_x_x11__util.h b/www/iridium/files/patch-ui_base_x_x11__util.h new file mode 100644 index 000000000000..1843a64e3b89 --- /dev/null +++ b/www/iridium/files/patch-ui_base_x_x11__util.h @@ -0,0 +1,13 @@ +--- ui/base/x/x11_util.h.orig 2024-06-25 12:08:48 UTC ++++ ui/base/x/x11_util.h +@@ -256,6 +256,10 @@ COMPONENT_EXPORT(UI_BASE_X) bool IsVulkanSurfaceSuppor + COMPONENT_EXPORT(UI_BASE_X) + gfx::ImageSkia GetNativeWindowIcon(intptr_t target_window_id); + ++// Returns the ICCProfile corresponding to |monitor| using XGetWindowProperty. ++COMPONENT_EXPORT(UI_BASE_X) ++gfx::ICCProfile GetICCProfileForMonitor(int monitor); ++ + } // namespace ui + + #endif // UI_BASE_X_X11_UTIL_H_ diff --git a/www/iridium/files/patch-ui_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h index b87cb46da7c2..0a0c88e8bf42 100644 --- a/www/iridium/files/patch-ui_color_color__id.h +++ b/www/iridium/files/patch-ui_color_color__id.h @@ -1,9 +1,9 @@ ---- ui/color/color_id.h.orig 2024-02-04 14:46:08 UTC +--- ui/color/color_id.h.orig 2024-06-25 12:08:48 UTC +++ ui/color/color_id.h -@@ -606,7 +606,7 @@ - E_CPONLY(kColorNativeColor6) \ - E_CPONLY(kColorNativeBaseColor) \ - E_CPONLY(kColorNativeSecondaryColor) +@@ -620,7 +620,7 @@ + \ + E_CPONLY(kColorCrosSysPositive) \ + E_CPONLY(kColorCrosSysComplementVariant) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define PLATFORM_SPECIFIC_COLOR_IDS \ diff --git a/www/iridium/files/patch-ui_color_color__provider__utils.cc b/www/iridium/files/patch-ui_color_color__provider__utils.cc index 6de91fceab42..e57561a61dca 100644 --- a/www/iridium/files/patch-ui_color_color__provider__utils.cc +++ b/www/iridium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2024-02-04 14:46:08 UTC +--- ui/color/color_provider_utils.cc.orig 2024-06-25 12:08:48 UTC +++ ui/color/color_provider_utils.cc -@@ -187,7 +187,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -186,7 +186,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc new file mode 100644 index 000000000000..5f369209498d --- /dev/null +++ b/www/iridium/files/patch-ui_compositor_compositor.cc @@ -0,0 +1,11 @@ +--- ui/compositor/compositor.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/compositor/compositor.cc +@@ -922,7 +922,7 @@ void Compositor::OnResume() { + obs.ResetIfActive(); + } + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) { + for (auto& observer : observer_list_) + observer.OnCompositingCompleteSwapWithNewSize(this, size); diff --git a/www/iridium/files/patch-ui_compositor_compositor.h b/www/iridium/files/patch-ui_compositor_compositor.h new file mode 100644 index 000000000000..f5ebe08087d4 --- /dev/null +++ b/www/iridium/files/patch-ui_compositor_compositor.h @@ -0,0 +1,11 @@ +--- ui/compositor/compositor.h.orig 2024-06-25 12:08:48 UTC ++++ ui/compositor/compositor.h +@@ -456,7 +456,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe + // base::PowerSuspendObserver: + void OnResume() override; + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + void OnCompleteSwapWithNewSize(const gfx::Size& size); + #endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) + diff --git a/www/iridium/files/patch-ui_compositor_compositor__observer.h b/www/iridium/files/patch-ui_compositor_compositor__observer.h new file mode 100644 index 000000000000..63a73c243112 --- /dev/null +++ b/www/iridium/files/patch-ui_compositor_compositor__observer.h @@ -0,0 +1,11 @@ +--- ui/compositor/compositor_observer.h.orig 2024-06-25 12:08:48 UTC ++++ ui/compositor/compositor_observer.h +@@ -52,7 +52,7 @@ class COMPOSITOR_EXPORT CompositorObserver { + // Called when a child of the compositor is resizing. + virtual void OnCompositingChildResizing(Compositor* compositor) {} + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) + // Called when a swap with new size is completed. + virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor, + const gfx::Size& size) {} diff --git a/www/iridium/files/patch-ui_display_screen.h b/www/iridium/files/patch-ui_display_screen.h index 77428f2defdd..9df215083964 100644 --- a/www/iridium/files/patch-ui_display_screen.h +++ b/www/iridium/files/patch-ui_display_screen.h @@ -1,4 +1,4 @@ ---- ui/display/screen.h.orig 2023-03-13 07:33:08 UTC +--- ui/display/screen.h.orig 2024-06-25 12:08:48 UTC +++ ui/display/screen.h @@ -131,7 +131,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -232,7 +232,7 @@ class DISPLAY_EXPORT Screen { +@@ -231,7 +231,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/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index b13e697a04f3..d3876d28ddd4 100644 --- a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-07-24 14:27:53 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2024-06-25 12:08:48 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -876,6 +876,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -844,6 +844,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/iridium/files/patch-ui_events_event.cc b/www/iridium/files/patch-ui_events_event.cc index 30fd8069b9ca..5630e442b865 100644 --- a/www/iridium/files/patch-ui_events_event.cc +++ b/www/iridium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2023-10-21 11:51:27 UTC +--- ui/events/event.cc.orig 2024-06-25 12:08:48 UTC +++ ui/events/event.cc -@@ -427,7 +427,7 @@ std::string LocatedEvent::ToString() const { +@@ -438,7 +438,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -676,7 +676,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -688,7 +688,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,9 +18,9 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -936,7 +936,7 @@ void KeyEvent::InitializeNative() { +@@ -948,7 +948,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) - set_flags(flags() | EF_IS_REPEAT); + SetFlags(flags() | EF_IS_REPEAT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_events_gesture__detection_motion__event__generic.h b/www/iridium/files/patch-ui_events_gesture__detection_motion__event__generic.h deleted file mode 100644 index bd648c4530c6..000000000000 --- a/www/iridium/files/patch-ui_events_gesture__detection_motion__event__generic.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ui/events/gesture_detection/motion_event_generic.h.orig 2023-11-22 14:00:11 UTC -+++ ui/events/gesture_detection/motion_event_generic.h -@@ -7,6 +7,7 @@ - - #include <stddef.h> - #include <stdint.h> -+#include <vector> - - #include <memory> - #include <vector> diff --git a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index d40efae42c4a..696a9612991e 100644 --- a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,6 +1,6 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2022-04-01 07:48:30 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2024-06-25 12:08:48 UTC +++ ui/events/keycodes/dom/keycode_converter.cc -@@ -11,7 +11,7 @@ +@@ -13,7 +13,7 @@ #include "ui/events/keycodes/dom/dom_code.h" #include "ui/events/keycodes/dom/dom_key.h" @@ -9,7 +9,7 @@ #include <linux/input.h> #endif -@@ -24,7 +24,7 @@ namespace { +@@ -26,7 +26,7 @@ namespace { #if BUILDFLAG(IS_WIN) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, win, code } @@ -18,16 +18,16 @@ #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, xkb, code } #elif BUILDFLAG(IS_APPLE) -@@ -58,7 +58,7 @@ struct DomKeyMapEntry { - #undef DOM_KEY_MAP +@@ -65,7 +65,7 @@ struct DomKeyMapEntry { #undef DOM_KEY_UNI + #undef DOM_KEY_MAP_DECLARATION_END -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) // The offset between XKB Keycode and evdev code. constexpr int kXkbKeycodeOffset = 8; -@@ -139,7 +139,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c +@@ -186,7 +186,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c return UsbKeycodeToNativeKeycode(static_cast<uint32_t>(code)); } diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn index 5e8291ac04d2..5432165200d3 100644 --- a/www/iridium/files/patch-ui_gfx_BUILD.gn +++ b/www/iridium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- ui/gfx/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/BUILD.gn -@@ -664,7 +664,7 @@ source_set("memory_buffer_sources") { +@@ -663,7 +663,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/iridium/files/patch-ui_gfx_canvas__skia.cc b/www/iridium/files/patch-ui_gfx_canvas__skia.cc index 613150fc7188..d509af2c6993 100644 --- a/www/iridium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/iridium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2023-10-21 11:51:27 UTC +--- ui/gfx/canvas_skia.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/canvas_skia.cc -@@ -212,7 +212,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str +@@ -213,7 +213,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/iridium/files/patch-ui_gfx_codec_png__codec.cc b/www/iridium/files/patch-ui_gfx_codec_png__codec.cc deleted file mode 100644 index c820de65e491..000000000000 --- a/www/iridium/files/patch-ui_gfx_codec_png__codec.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gfx/codec/png_codec.cc.orig 2023-10-21 11:51:27 UTC -+++ ui/gfx/codec/png_codec.cc -@@ -12,7 +12,7 @@ - #include "base/metrics/histogram_macros.h" - #include "base/notreached.h" - #include "base/strings/string_util.h" --#include "third_party/libpng/png.h" -+#include <png.h> - #include "third_party/skia/include/core/SkBitmap.h" - #include "third_party/skia/include/core/SkColorPriv.h" - #include "third_party/skia/include/core/SkUnPreMultiply.h" diff --git a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc index 687c43fae386..c74a052d2998 100644 --- a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -26,6 +26,8 @@ +@@ -27,6 +27,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/iridium/files/patch-ui_gfx_font__render__params.h b/www/iridium/files/patch-ui_gfx_font__render__params.h index 76ec1d7d4d7d..1e23dc76ba0d 100644 --- a/www/iridium/files/patch-ui_gfx_font__render__params.h +++ b/www/iridium/files/patch-ui_gfx_font__render__params.h @@ -1,15 +1,15 @@ ---- ui/gfx/font_render_params.h.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/font_render_params.h.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/font_render_params.h -@@ -109,7 +109,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( +@@ -115,7 +115,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); -@@ -119,7 +119,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); +@@ -125,7 +125,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc b/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc index fa025a95dd3b..8e0d51f7dcff 100644 --- a/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc +++ b/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params_linux.cc.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/font_render_params_linux.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/font_render_params_linux.cc @@ -25,7 +25,7 @@ #include "ui/gfx/linux/fontconfig_util.h" @@ -15,6 +15,6 @@ FontRenderParams params; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (const auto* linux_ui = ui::LinuxUi::instance()) + if (auto* linux_ui = ui::LinuxUi::instance()) { params = linux_ui->GetDefaultFontRenderParams(); - #endif + } diff --git a/www/iridium/files/patch-ui_gfx_font__util.cc b/www/iridium/files/patch-ui_gfx_font__util.cc index 7a702f657d6a..7d0e33c12421 100644 --- a/www/iridium/files/patch-ui_gfx_font__util.cc +++ b/www/iridium/files/patch-ui_gfx_font__util.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_util.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/font_util.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/font_util.cc @@ -6,7 +6,7 @@ @@ -15,6 +15,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Ensures the config is created on this thread. - FcConfig* config = GetGlobalFontConfig(); - DCHECK(config); + // Early initialize FontConfig. + InitializeGlobalFontConfigAsync(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc index af9021e0ccea..e8e99940e935 100644 --- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc +++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -1,6 +1,6 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2023-04-22 17:45:15 UTC +--- ui/gfx/gpu_memory_buffer.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/gpu_memory_buffer.cc -@@ -54,7 +54,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c +@@ -55,7 +55,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.region = region.Duplicate(); handle.offset = offset; handle.stride = stride; diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h index 882930108e61..8b102c41a250 100644 --- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2023-04-22 17:45:15 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_APPLE) #include "ui/gfx/mac/io_surface.h" -@@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -76,7 +76,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; uint32_t stride = 0; diff --git a/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc b/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc index 153ee61d13fc..726bf8ee4178 100644 --- a/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc +++ b/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc @@ -1,9 +1,9 @@ ---- ui/gfx/linux/gbm_wrapper.cc.orig 2024-02-04 14:46:08 UTC +--- ui/gfx/linux/gbm_wrapper.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/linux/gbm_wrapper.cc -@@ -316,7 +316,7 @@ class Device final : public ui::GbmDevice { +@@ -314,7 +314,7 @@ class Device final : public ui::GbmDevice { // of 1x1 BOs which are destroyed before creating the final BO creation used // to instantiate the returned GbmBuffer. - gfx::Size size = + gfx::Size size_for_verification = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) gfx::Size(1, 1); diff --git a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index 3be3c9181590..bd70c60a752a 100644 --- a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,7 +1,7 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2023-01-17 19:19:00 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h -@@ -15,7 +15,7 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" +@@ -16,7 +16,7 @@ + #include "mojo/public/cpp/system/platform_handle.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #endif -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ namespace mojo { @@ -18,7 +18,7 @@ template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, -@@ -53,13 +53,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -54,13 +54,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED return pixmap_handle.planes; } diff --git a/www/iridium/files/patch-ui_gfx_native__widget__types.h b/www/iridium/files/patch-ui_gfx_native__widget__types.h index a1508580f5b2..9f94e96e9f25 100644 --- a/www/iridium/files/patch-ui_gfx_native__widget__types.h +++ b/www/iridium/files/patch-ui_gfx_native__widget__types.h @@ -1,17 +1,17 @@ ---- ui/gfx/native_widget_types.h.orig 2023-10-21 11:51:27 UTC +--- ui/gfx/native_widget_types.h.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/native_widget_types.h -@@ -103,7 +103,7 @@ class SkBitmap; +@@ -104,7 +104,7 @@ class SkBitmap; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -220,7 +220,7 @@ using NativeViewAccessible = struct objc_object*; #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_gfx_platform__font__skia.cc b/www/iridium/files/patch-ui_gfx_platform__font__skia.cc index 1a479098e972..9956886e7062 100644 --- a/www/iridium/files/patch-ui_gfx_platform__font__skia.cc +++ b/www/iridium/files/patch-ui_gfx_platform__font__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/platform_font_skia.cc.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/platform_font_skia.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/platform_font_skia.cc -@@ -28,7 +28,7 @@ +@@ -30,7 +30,7 @@ #include "ui/gfx/system_fonts_win.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -166,7 +166,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized +@@ -168,7 +168,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized weight = system_font.GetWeight(); #endif // BUILDFLAG(IS_WIN) @@ -17,4 +17,4 @@ +#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()) { + if (auto* linux_ui = ui::LinuxUi::instance()) { diff --git a/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc b/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc index 050aaa6895fc..6a37e32aff3d 100644 --- a/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc +++ b/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc @@ -1,15 +1,15 @@ ---- ui/gfx/render_text_fuzzer.cc.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/render_text_fuzzer.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/render_text_fuzzer.cc -@@ -14,7 +14,7 @@ +@@ -17,7 +17,7 @@ + #include "ui/gfx/canvas.h" #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 { +@@ -40,7 +40,7 @@ struct Environment { CHECK(base::i18n::InitializeICU()); diff --git a/www/iridium/files/patch-ui_gfx_switches.cc b/www/iridium/files/patch-ui_gfx_switches.cc index e60baaf6532c..1d992b8e3114 100644 --- a/www/iridium/files/patch-ui_gfx_switches.cc +++ b/www/iridium/files/patch-ui_gfx_switches.cc @@ -1,6 +1,6 @@ ---- ui/gfx/switches.cc.orig 2023-07-24 14:27:53 UTC +--- ui/gfx/switches.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/switches.cc -@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe +@@ -32,7 +32,7 @@ const char kForcePrefersNoReducedMotion[] = "force-pre // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; diff --git a/www/iridium/files/patch-ui_gfx_switches.h b/www/iridium/files/patch-ui_gfx_switches.h index 1188a001fb4f..f06ff0de66d2 100644 --- a/www/iridium/files/patch-ui_gfx_switches.h +++ b/www/iridium/files/patch-ui_gfx_switches.h @@ -1,7 +1,7 @@ ---- ui/gfx/switches.h.orig 2023-07-24 14:27:53 UTC +--- ui/gfx/switches.h.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/switches.h -@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu - GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; +@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersRed + GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc b/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc index 6749825f7c50..ce93e0d3db37 100644 --- a/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc +++ b/www/iridium/files/patch-ui_gfx_x_generated__protos_dri3.cc @@ -1,4 +1,4 @@ ---- ui/gfx/x/generated_protos/dri3.cc.orig 2024-02-04 14:46:08 UTC +--- ui/gfx/x/generated_protos/dri3.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/x/generated_protos/dri3.cc @@ -27,6 +27,8 @@ #include <xcb/xcb.h> @@ -8,4 +8,4 @@ + #include "base/logging.h" #include "base/posix/eintr_wrapper.h" - #include "ui/gfx/x/xproto_internal.h" + #include "ui/gfx/x/connection.h" diff --git a/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc b/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc index edd26c614813..40af7df44a77 100644 --- a/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc +++ b/www/iridium/files/patch-ui_gfx_x_generated__protos_shm.cc @@ -1,4 +1,4 @@ ---- ui/gfx/x/generated_protos/shm.cc.orig 2024-02-04 14:46:08 UTC +--- ui/gfx/x/generated_protos/shm.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/x/generated_protos/shm.cc @@ -27,6 +27,8 @@ #include <xcb/xcb.h> @@ -8,4 +8,4 @@ + #include "base/logging.h" #include "base/posix/eintr_wrapper.h" - #include "ui/gfx/x/xproto_internal.h" + #include "ui/gfx/x/connection.h" diff --git a/www/iridium/files/patch-ui_gfx_x_xlib__support.cc b/www/iridium/files/patch-ui_gfx_x_xlib__support.cc index fbe790734a7a..1aca72e4aa99 100644 --- a/www/iridium/files/patch-ui_gfx_x_xlib__support.cc +++ b/www/iridium/files/patch-ui_gfx_x_xlib__support.cc @@ -1,21 +1,21 @@ ---- ui/gfx/x/xlib_support.cc.orig 2023-11-22 14:00:11 UTC +--- ui/gfx/x/xlib_support.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gfx/x/xlib_support.cc @@ -39,10 +39,18 @@ void InitXlib() { return; } +#if BUILDFLAG(IS_BSD) -+ DUMP_WILL_BE_CHECK(xlib_loader->Load("libX11.so")); ++ CHECK(xlib_loader->Load("libX11.so")); +#else - DUMP_WILL_BE_CHECK(xlib_loader->Load("libX11.so.6")); + CHECK(xlib_loader->Load("libX11.so.6")); +#endif auto* xlib_xcb_loader = GetXlibXcbLoader(); +#if BUILDFLAG(IS_BSD) -+ DUMP_WILL_BE_CHECK(xlib_xcb_loader->Load("libX11-xcb.so")); ++ CHECK(xlib_xcb_loader->Load("libX11-xcb.so")); +#else - DUMP_WILL_BE_CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1")); + CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1")); +#endif - DUMP_WILL_BE_CHECK(xlib_loader->XInitThreads()); + CHECK(xlib_loader->XInitThreads()); diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn index 96be28849219..7743189c72d8 100644 --- a/www/iridium/files/patch-ui_gl_BUILD.gn +++ b/www/iridium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- ui/gl/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ ui/gl/BUILD.gn -@@ -151,8 +151,6 @@ component("gl") { +@@ -153,8 +153,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -169,7 +167,6 @@ component("gl") { +@@ -171,7 +169,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -377,7 +374,6 @@ component("gl") { +@@ -378,7 +375,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -582,7 +578,6 @@ test("gl_unittests") { +@@ -578,7 +574,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/iridium/files/patch-ui_gl_gl__context.cc b/www/iridium/files/patch-ui_gl_gl__context.cc index 501f7d665c58..cf5a67e5df2a 100644 --- a/www/iridium/files/patch-ui_gl_gl__context.cc +++ b/www/iridium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2024-02-04 14:46:08 UTC +--- ui/gl/gl_context.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gl/gl_context.cc -@@ -486,7 +486,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -472,7 +472,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/iridium/files/patch-ui_gl_gl__switches.cc b/www/iridium/files/patch-ui_gl_gl__switches.cc index 13ac54a2db25..9077bbabc105 100644 --- a/www/iridium/files/patch-ui_gl_gl__switches.cc +++ b/www/iridium/files/patch-ui_gl_gl__switches.cc @@ -1,20 +1,29 @@ ---- ui/gl/gl_switches.cc.orig 2023-10-21 11:51:27 UTC +--- ui/gl/gl_switches.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gl/gl_switches.cc @@ -11,7 +11,7 @@ #include "base/android/build_info.h" #endif --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -294,7 +294,7 @@ bool IsDefaultANGLEVulkan() { +@@ -299,7 +299,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) angle::SystemInfo system_info; if (!angle::GetSystemInfoVulkan(&system_info)) return false; +@@ -311,7 +311,7 @@ bool IsDefaultANGLEVulkan() { + + const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Vulkan 1.1 is required. + if (active_gpu.driverApiVersion < VK_VERSION_1_1) + return false; diff --git a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 560aa725ac08..cc2096ca81a2 100644 --- a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-11-22 14:00:11 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2024-06-25 12:08:48 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -433,7 +433,7 @@ void PrintDialogGtk::ShowDialog( +@@ -434,7 +434,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/iridium/files/patch-ui_message__center_views_message__popup__view.cc b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc index bc79c18d3b30..071cf4da2cd9 100644 --- a/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,8 +1,8 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2024-02-04 14:46:08 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2024-06-25 12:08:48 UTC +++ ui/message_center/views/message_popup_view.cc @@ -135,7 +135,7 @@ void MessagePopupView::Show() { params.z_order = ui::ZOrderLevel::kFloatingWindow; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-ui_native__theme_native__theme.h b/www/iridium/files/patch-ui_native__theme_native__theme.h index 5a449cc44981..30db9576dae0 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme.h +++ b/www/iridium/files/patch-ui_native__theme_native__theme.h @@ -1,8 +1,8 @@ ---- ui/native_theme/native_theme.h.orig 2023-10-21 11:51:27 UTC +--- ui/native_theme/native_theme.h.orig 2024-06-25 12:08:48 UTC +++ ui/native_theme/native_theme.h @@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc index ac7ef7ad4c54..bd56a0d7d825 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,8 +1,8 @@ ---- ui/native_theme/native_theme_base.cc.orig 2023-11-22 14:00:11 UTC +--- ui/native_theme/native_theme_base.cc.orig 2024-06-25 12:08:48 UTC +++ ui/native_theme/native_theme_base.cc -@@ -235,7 +235,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -236,7 +236,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-ui_native__theme_native__theme__features.cc b/www/iridium/files/patch-ui_native__theme_native__theme__features.cc new file mode 100644 index 000000000000..893b37603901 --- /dev/null +++ b/www/iridium/files/patch-ui_native__theme_native__theme__features.cc @@ -0,0 +1,20 @@ +--- ui/native_theme/native_theme_features.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/native_theme/native_theme_features.cc +@@ -54,7 +54,7 @@ bool IsOverlayScrollbarEnabled() { + + bool IsFluentScrollbarEnabled() { + // Fluent scrollbars are only used for some OSes due to UI design guidelines. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(features::kFluentScrollbar) || + IsFluentOverlayScrollbarEnabled(); + #else +@@ -63,7 +63,7 @@ bool IsFluentScrollbarEnabled() { + } + bool IsFluentOverlayScrollbarEnabled() { + // Fluent scrollbars are only used for some OSes due to UI design guidelines. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar); + #else + return false; diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc index 7b4084de0769..3e52747b78c4 100644 --- a/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc +++ b/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2022-10-05 07:34:01 UTC +--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/headless/ozone_platform_headless.cc -@@ -102,7 +102,7 @@ class OzonePlatformHeadless : public OzonePlatform { +@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform { } // Desktop Linux, not CastOS. diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc index 281eeb8fa0e5..5592baa6d70f 100644 --- a/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc +++ b/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -117,7 +117,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( +@@ -118,7 +118,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( VkExternalSemaphoreHandleTypeFlagBits VulkanImplementationHeadless::GetExternalSemaphoreHandleType() { @@ -9,7 +9,7 @@ return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; #else return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; -@@ -127,7 +127,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand +@@ -128,7 +128,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer( gpu::VulkanDeviceQueue* device_queue, gfx::GpuMemoryBufferType memory_buffer_type) { @@ -18,7 +18,7 @@ const auto& enabled_extensions = device_queue->enabled_extensions(); return gfx::HasExtension(enabled_extensions, VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) && -@@ -150,7 +150,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -151,7 +151,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; diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc new file mode 100644 index 000000000000..b05bf078921f --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/ozone/platform/wayland/common/wayland_util.cc +@@ -336,7 +336,7 @@ void TransformToWlArray( + } + + base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40287874): `milliseconds` comes from Weston that + // uses timestamp from libinput, which is different from TimeTicks. + // Use EventTimeForNow(), for now. diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc index e62f72342016..07727c3901b3 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.cc @@ -1,8 +1,8 @@ ---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig 2024-02-04 14:46:08 UTC +--- ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc -@@ -230,7 +230,7 @@ void WaylandInputEmulate::EmulateTouch(int action, - wayland_proxy->FlushForTesting(); +@@ -284,7 +284,7 @@ void WaylandInputEmulate::EmulateUpdateDisplay(const s } + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h b/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h index 43e1d6845639..a921891b6768 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_emulate_wayland__input__emulate.h @@ -1,8 +1,8 @@ ---- ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig 2024-02-04 14:46:08 UTC +--- ui/ozone/platform/wayland/emulate/wayland_input_emulate.h.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.h -@@ -61,7 +61,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D - int touch_id, - uint32_t request_id); +@@ -68,7 +68,7 @@ class WaylandInputEmulate : public wl::WaylandProxy::D + uint32_t request_id); + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc new file mode 100644 index 000000000000..37540d119ad8 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/ozone/platform/wayland/host/wayland_connection.cc +@@ -532,7 +532,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c + // isn't present on any non-exo Wayland compositors. + bool should_use_overlay_delegation = + IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Overlay delegation also requires a single-pixel-buffer protocol, which + // allows creation of non-backed solid color buffers. Even though only video + // overlays can be supported on Linux, these color buffers are still needed diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc new file mode 100644 index 000000000000..658574002957 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc +@@ -55,7 +55,7 @@ namespace { + // Only enable the preedit string for sequence mode (i.e. when using dead keys + // or the Compose key) on Linux ozone/wayland (see b/220370007). + constexpr CharacterComposer::PreeditStringMode kPreeditStringMode = +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + CharacterComposer::PreeditStringMode::kAlwaysEnabled; + #else + CharacterComposer::PreeditStringMode::kHexModeOnly; diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc new file mode 100644 index 000000000000..f7ae79b4418e --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/wayland/host/wayland_popup.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/ozone/platform/wayland/host/wayland_popup.cc +@@ -34,7 +34,7 @@ WaylandPopup::WaylandPopup(PlatformWindowDelegate* del + WaylandWindow* parent) + : WaylandWindow(delegate, connection) { + set_parent_window(parent); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/330384470): Whether the popup appear depends on whether + // anchor point is outside of the parent xdg_surface. On Mutter the popup will + // not show when outside. diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index 8716f62fd70d..4c03f2317f07 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,11 +1,11 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-11-22 14:00:11 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -570,7 +570,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -602,7 +602,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; --#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) // The tiled state affects the window geometry, so apply it here. if (window_states.tiled_edges != tiled_state_) { // This configure changes the decoration insets. We should adjust the diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index 1dad27bccec3..6170889a84e9 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,11 +1,11 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-11-22 14:00:11 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -256,7 +256,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -263,7 +263,7 @@ class WaylandToplevelWindow : public WaylandWindow, // The display ID to switch to in case the state is `kFullscreen`. int64_t fullscreen_display_id_ = display::kInvalidDisplayId; --#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) // Contains the current state of the tiled edges. WindowTiledEdges tiled_state_; #endif diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc index 47c89baa523b..b0cdf346aaaf 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -233,7 +233,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -294,7 +294,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused // Whenever the window gets the pointer focus back, the cursor shape must be // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not // restored by the Wayland compositor. @@ -9,7 +9,7 @@ if (focused && async_cursor_) { async_cursor_->AddCursorLoadedCallback( base::BindOnce(&WaylandWindow::OnCursorLoaded, -@@ -490,7 +490,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { +@@ -553,7 +553,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { DCHECK(platform_cursor); @@ -18,16 +18,16 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -661,7 +661,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -762,7 +762,7 @@ std::string WaylandWindow::WindowStates::ToString() co } else { base::TrimString(states, " ", &states); } --#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) states += "; tiled_edges: "; std::string tiled = ""; if (tiled_edges.left) { -@@ -1111,12 +1111,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1242,12 +1242,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi cursor->bitmaps(), hotspot_in_dips, std::ceil(cursor->cursor_image_scale_factor())); } diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index b7bd40981f38..832e1df35d9b 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ #include "ui/platform_window/platform_window_init_properties.h" #include "ui/platform_window/wm/wm_drag_handler.h" @@ -9,16 +9,16 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -241,7 +241,7 @@ class WaylandWindow : public PlatformWindow, +@@ -259,7 +259,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_primary = false; bool is_snapped_secondary = false; bool is_floated = false; --#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) WindowTiledEdges tiled_edges; #endif -@@ -492,7 +492,7 @@ class WaylandWindow : public PlatformWindow, +@@ -552,7 +552,7 @@ class WaylandWindow : public PlatformWindow, void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); @@ -27,7 +27,7 @@ void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, scoped_refptr<BitmapCursor> bitmap_cursor); #endif -@@ -551,7 +551,7 @@ class WaylandWindow : public PlatformWindow, +@@ -622,7 +622,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc index 982e014e5cb2..5f247fe382b0 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -1,11 +1,11 @@ ---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-11-22 14:00:11 UTC +--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -310,7 +310,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* - CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), - }; +@@ -316,7 +316,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* + window_states.is_activated = + CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED); --#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 (xdg_toplevel_get_version(toplevel) >= XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) { // All four tiled states have the same since version, so it is enough to diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index e207ed674bcb..8fdd885ade11 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-11-22 14:00:11 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -16,7 +16,7 @@ #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -262,7 +262,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -267,7 +267,7 @@ class OzonePlatformWayland : public OzonePlatform, buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>( connection_->buffer_manager_host()); @@ -25,7 +25,7 @@ cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get()); #else cursor_factory_ = std::make_unique<BitmapCursorFactory>(); -@@ -272,7 +272,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -277,7 +277,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -34,7 +34,16 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -507,7 +507,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -343,7 +343,7 @@ class OzonePlatformWayland : public OzonePlatform, + properties->supports_global_screen_coordinates = + kDefaultScreenCoordinateEnabled; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40800718): Revisit (and maybe remove) once proper + // support, probably backed by org.freedesktop.portal.Screenshot.PickColor + // API is implemented. Note: this is restricted to Linux Desktop as Lacros +@@ -536,7 +536,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc deleted file mode 100644 index 7b605acf3458..000000000000 --- a/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2023-10-21 11:51:27 UTC -+++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -196,7 +196,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; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - properties->supports_vaapi = true; - #endif - diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc b/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc index 0d40fc336bd2..5e37502677b0 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc +++ b/www/iridium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2022-04-01 07:48:30 UTC +--- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/x11/vulkan_implementation_x11.cc -@@ -58,7 +58,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance +@@ -59,7 +59,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance path = path.Append("libvk_swiftshader.so"); } else { diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc index 226cb4fb991b..70ab637873b3 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc +++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2023-11-22 14:00:11 UTC +--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/x11/x11_screen_ozone.cc @@ -22,7 +22,7 @@ #include "ui/ozone/platform/x11/x11_window.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -77,7 +77,7 @@ X11ScreenOzone::X11ScreenOzone() +@@ -97,7 +97,7 @@ X11ScreenOzone::X11ScreenOzone() window_manager_(X11WindowManager::GetInstance()), x11_display_manager_(std::make_unique<XDisplayManager>(this)) { DCHECK(window_manager_); @@ -18,3 +18,12 @@ if (auto* linux_ui = ui::LinuxUi::instance()) { display_scale_factor_observer_.Observe(linux_ui); } +@@ -260,7 +260,7 @@ void X11ScreenOzone::OnEvent(const x11::Event& xev) { + x11_display_manager_->OnEvent(xev); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void X11ScreenOzone::OnDeviceScaleFactorChanged() { + x11_display_manager_->DispatchDelayedDisplayListUpdate(); + } diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h index 353d68affbc5..d14946a1bc97 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h +++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h @@ -1,6 +1,33 @@ ---- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2023-11-22 14:00:11 UTC +--- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/platform/x11/x11_screen_ozone.h -@@ -102,7 +102,7 @@ class X11ScreenOzone : public PlatformScreen, +@@ -16,7 +16,7 @@ + #include "ui/gfx/x/event.h" + #include "ui/ozone/public/platform_screen.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/device_scale_factor_observer.h" + #include "ui/linux/linux_ui.h" + #endif +@@ -29,7 +29,7 @@ class X11WindowManager; + class X11ScreenOzone : public PlatformScreen, + public x11::EventObserver, + public XDisplayManager::Delegate +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + , + public DeviceScaleFactorObserver + #endif +@@ -97,7 +97,7 @@ class X11ScreenOzone : public PlatformScreen, + // ui::XDisplayManager::Delegate: + void OnXDisplayListUpdated() override; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // DeviceScaleFactorObserver: + void OnDeviceScaleFactorChanged() override; + #endif +@@ -109,7 +109,7 @@ class X11ScreenOzone : public PlatformScreen, // Indicates that |this| is initialized. bool initialized_ = false; diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc new file mode 100644 index 000000000000..eb4e08739ec9 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/x11/x11_window.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/ozone/platform/x11/x11_window.cc +@@ -1495,7 +1495,7 @@ void X11Window::OnXWindowStateChanged() { + WindowTiledEdges tiled_state = GetTiledState(); + if (tiled_state != tiled_state_) { + tiled_state_ = tiled_state; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + platform_window_delegate_->OnWindowTiledStateChanged(tiled_state); + UpdateDecorationInsets(); + #endif diff --git a/www/iridium/files/patch-ui_ozone_public_ozone__platform.h b/www/iridium/files/patch-ui_ozone_public_ozone__platform.h deleted file mode 100644 index f58a58280feb..000000000000 --- a/www/iridium/files/patch-ui_ozone_public_ozone__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/public/ozone_platform.h.orig 2023-10-21 11:51:27 UTC -+++ ui/ozone/public/ozone_platform.h -@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { - // back via gpu extra info. - bool fetch_buffer_formats_for_gmb_on_gpu = false; - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on - // Linux. At the moment, VA-API Linux implementation supports only X11 - // backend. This implementation must be refactored to support Ozone diff --git a/www/iridium/files/patch-ui_ozone_public_platform__screen.h b/www/iridium/files/patch-ui_ozone_public_platform__screen.h deleted file mode 100644 index 35b6dd3d0e7e..000000000000 --- a/www/iridium/files/patch-ui_ozone_public_platform__screen.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/public/platform_screen.h.orig 2023-11-22 14:00:11 UTC -+++ ui/ozone/public/platform_screen.h -@@ -15,7 +15,7 @@ - #include "ui/gfx/gpu_extra_info.h" - #include "ui/gfx/native_widget_types.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/linux_ui.h" - #endif - diff --git a/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h index dde73bdf438c..43a3109c0491 100644 --- a/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h +++ b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h @@ -1,11 +1,11 @@ ---- ui/ozone/test/mock_platform_window_delegate.h.orig 2023-11-22 14:00:11 UTC +--- ui/ozone/test/mock_platform_window_delegate.h.orig 2024-06-25 12:08:48 UTC +++ ui/ozone/test/mock_platform_window_delegate.h -@@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind +@@ -35,7 +35,7 @@ class MockPlatformWindowDelegate : public PlatformWind MOCK_METHOD2(OnWindowStateChanged, void(PlatformWindowState old_state, PlatformWindowState new_state)); --#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) MOCK_METHOD1(OnWindowTiledStateChanged, void(WindowTiledEdges new_tiled_edges)); - MOCK_METHOD0(OnFullscreenModeChanged, void()); + #endif diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc index f0567b67878f..b538865b625e 100644 --- a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc +++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc @@ -1,11 +1,11 @@ ---- ui/platform_window/platform_window_delegate.cc.orig 2023-07-24 14:27:53 UTC +--- ui/platform_window/platform_window_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ ui/platform_window/platform_window_delegate.cc -@@ -36,7 +36,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def +@@ -61,7 +61,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD + return gfx::Insets(); + } - PlatformWindowDelegate::~PlatformWindowDelegate() = default; - --#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) void PlatformWindowDelegate::OnWindowTiledStateChanged( WindowTiledEdges new_tiled_edges) {} #endif diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h index 6e9c8bf47609..8d692cdf7f5f 100644 --- a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h +++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h @@ -1,11 +1,11 @@ ---- ui/platform_window/platform_window_delegate.h.orig 2023-07-24 14:27:53 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2024-06-25 12:08:48 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -134,7 +134,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -180,7 +180,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; --#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) // Notifies the delegate that the tiled state of the window edges has changed. virtual void OnWindowTiledStateChanged(WindowTiledEdges new_tiled_edges); #endif diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h index 8acc31e98d2b..45b7c75f25d8 100644 --- a/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,4 +1,4 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2022-10-05 07:34:01 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2024-06-25 12:08:48 UTC +++ ui/platform_window/platform_window_init_properties.h @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; @@ -9,7 +9,7 @@ class X11ExtensionDelegate; #endif -@@ -118,7 +118,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -121,7 +121,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool prefer_dark_theme = false; raw_ptr<gfx::ImageSkia> icon = nullptr; - absl::optional<SkColor> background_color; + std::optional<SkColor> background_color; diff --git a/www/iridium/files/patch-ui_qt_BUILD.gn b/www/iridium/files/patch-ui_qt_BUILD.gn new file mode 100644 index 000000000000..aa180497e974 --- /dev/null +++ b/www/iridium/files/patch-ui_qt_BUILD.gn @@ -0,0 +1,11 @@ +--- ui/qt/BUILD.gn.orig 2024-06-25 12:08:48 UTC ++++ ui/qt/BUILD.gn +@@ -20,7 +20,7 @@ config("qt_internal_config") { + + # It's OK to depend on the system libstdc++ since it's a dependency of QT, so + # it will get loaded into the process anyway. +- libs = [ "stdc++" ] ++ # libs = [ "stdc++" ] + + configs = [ + "//build/config/linux:runtime_library", diff --git a/www/iridium/files/patch-ui_strings_app__locale__settings.grd b/www/iridium/files/patch-ui_strings_app__locale__settings.grd deleted file mode 100644 index 803b6644655d..000000000000 --- a/www/iridium/files/patch-ui_strings_app__locale__settings.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/strings/app_locale_settings.grd.orig 2022-10-05 07:34:01 UTC -+++ ui/strings/app_locale_settings.grd -@@ -218,7 +218,7 @@ - 75% - </message> - </if> -- <if expr="is_linux or is_android or is_bsd or is_fuchsia"> -+ <if expr="is_posix or is_android or is_bsd or is_fuchsia"> - <!-- The font used in Web UI (e.g. History). Note that these are only - backups. We try to use the system font if possible. --> - <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true"> diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc index 62cb31982480..aa8641d2f383 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2024-02-04 14:46:08 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -81,7 +81,7 @@ +@@ -85,7 +85,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" -@@ -176,7 +176,7 @@ bool IsControlKeyModifier(int flags) { +@@ -183,7 +183,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,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -747,7 +747,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -743,7 +743,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -930,7 +930,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -926,7 +926,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,16 +36,16 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1941,7 +1941,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1979,7 +1979,7 @@ bool Textfield::ShouldDoLearning() { return false; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // TODO(https://crbug.com/952355): Implement this method to support Korean IME + // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2437,14 +2437,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2483,14 +2483,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h index 51f9c00e656d..cae79768fb99 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,7 +1,7 @@ ---- ui/views/controls/textfield/textfield.h.orig 2023-10-21 11:51:27 UTC +--- ui/views/controls/textfield/textfield.h.orig 2024-06-25 12:08:48 UTC +++ ui/views/controls/textfield/textfield.h -@@ -44,7 +44,7 @@ - #include "ui/views/view.h" +@@ -47,7 +47,7 @@ + #include "ui/views/view_observer.h" #include "ui/views/word_lookup_client.h" -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -452,7 +452,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -462,7 +462,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/iridium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc index 93b123689012..fefc5aeee6b6 100644 --- a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,8 +1,8 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2023-07-24 14:27:53 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -38,7 +38,7 @@ namespace { +@@ -36,7 +36,7 @@ namespace { bool CanUseTranslucentTooltipWidget() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_views_focus_focus__manager.cc b/www/iridium/files/patch-ui_views_focus_focus__manager.cc index 2bb07a0b4894..919937974797 100644 --- a/www/iridium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/iridium/files/patch-ui_views_focus_focus__manager.cc @@ -1,17 +1,17 @@ ---- ui/views/focus/focus_manager.cc.orig 2023-08-28 20:17:35 UTC +--- ui/views/focus/focus_manager.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/focus/focus_manager.cc -@@ -577,7 +577,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -582,7 +582,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) // 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 -@@ -594,7 +594,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -599,7 +599,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-ui_views_style_platform__style.cc b/www/iridium/files/patch-ui_views_style_platform__style.cc index 2172d3a33be8..9ed502db17c2 100644 --- a/www/iridium/files/patch-ui_views_style_platform__style.cc +++ b/www/iridium/files/patch-ui_views_style_platform__style.cc @@ -1,4 +1,4 @@ ---- ui/views/style/platform_style.cc.orig 2023-03-13 07:33:08 UTC +--- ui/views/style/platform_style.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/style/platform_style.cc @@ -17,7 +17,7 @@ #include "ui/views/controls/focusable_border.h" @@ -18,12 +18,12 @@ false; #else true; -@@ -58,7 +58,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = - +@@ -59,7 +59,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = // static - std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { + std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar( + ScrollBar::Orientation orientation) { -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return std::make_unique<OverlayScrollBar>(is_horizontal); + return std::make_unique<OverlayScrollBar>(orientation); #else - return std::make_unique<ScrollBarViews>(is_horizontal); + return std::make_unique<ScrollBarViews>(orientation); diff --git a/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc b/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc index 685612cda32a..ee84d86fec5f 100644 --- a/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc +++ b/www/iridium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc @@ -1,6 +1,6 @@ ---- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig 2024-02-04 14:46:08 UTC +--- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc -@@ -284,7 +284,7 @@ bool SendTouchEventsNotifyWhenDone(int action, +@@ -296,7 +296,7 @@ void UpdateDisplaySync(const std::string& display_spec } #endif diff --git a/www/iridium/files/patch-ui_views_views__delegate.h b/www/iridium/files/patch-ui_views_views__delegate.h index 9afe3bc3e9f4..5d428637bb4e 100644 --- a/www/iridium/files/patch-ui_views_views__delegate.h +++ b/www/iridium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2022-03-28 18:11:04 UTC +--- ui/views/views_delegate.h.orig 2024-06-25 12:08:48 UTC +++ ui/views/views_delegate.h -@@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index 62702970f53e..91d261024bbd 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -1,7 +1,7 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-08-28 20:17:35 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd - return drag_operation_; +@@ -200,7 +200,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd + return selected_operation_; } -#if BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h index 55aca1cc7bbe..8c40d2aefd56 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h +++ b/www/iridium/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 2023-01-17 19:19:00 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2024-06-25 12:08:48 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h -@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -65,7 +65,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone // The offset of |drag_widget_| relative to the mouse position. gfx::Vector2d offset; @@ -9,7 +9,7 @@ // The last received drag location. The drag widget is moved asynchronously // so its position is updated when the UI thread has time for that. When // the first change to the location happens, a call to UpdateDragWidget() -@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -86,7 +86,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone const gfx::Point& root_location, int allowed_operations, ui::mojom::DragEventSource source) override; diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 03e293ed6c41..2ddabcb07d83 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-11-22 14:00:11 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -44,7 +44,7 @@ +@@ -48,7 +48,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,16 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -265,7 +265,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; -@@ -349,7 +349,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -358,7 +358,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -27,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1084,7 +1084,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1142,7 +1142,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc index 24b06760e3f1..90d0689490fe 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc +++ b/www/iridium/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 2023-03-13 07:33:08 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc -@@ -21,7 +21,7 @@ +@@ -23,7 +23,7 @@ #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/native_frame_view.h" diff --git a/www/iridium/files/patch-ui_views_widget_root__view.cc b/www/iridium/files/patch-ui_views_widget_root__view.cc new file mode 100644 index 000000000000..4c816600aeb6 --- /dev/null +++ b/www/iridium/files/patch-ui_views_widget_root__view.cc @@ -0,0 +1,11 @@ +--- ui/views/widget/root_view.cc.orig 2024-06-25 12:08:48 UTC ++++ ui/views/widget/root_view.cc +@@ -127,7 +127,7 @@ class AnnounceTextView : public View { + #if BUILDFLAG(IS_CHROMEOS) + // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. + node_data->role = ax::mojom::Role::kStaticText; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40658933): Use live regions (do not use alerts). + // May require setting kLiveStatus, kContainerLiveStatus to "polite". + node_data->role = ax::mojom::Role::kAlert; diff --git a/www/iridium/files/patch-ui_views_widget_widget.cc b/www/iridium/files/patch-ui_views_widget_widget.cc index 10fd80574623..9a587cc1121c 100644 --- a/www/iridium/files/patch-ui_views_widget_widget.cc +++ b/www/iridium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2024-02-04 14:46:08 UTC +--- ui/views/widget/widget.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/widget/widget.cc -@@ -54,7 +54,7 @@ +@@ -57,7 +57,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2068,7 +2068,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2152,7 +2152,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/iridium/files/patch-ui_views_widget_widget.h b/www/iridium/files/patch-ui_views_widget_widget.h deleted file mode 100644 index 78ebe4b327f1..000000000000 --- a/www/iridium/files/patch-ui_views_widget_widget.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/widget/widget.h.orig 2023-11-22 14:00:11 UTC -+++ ui/views/widget/widget.h -@@ -417,7 +417,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/iridium/files/patch-ui_views_window_custom__frame__view.cc b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc index 17128385707c..5bebd22b7daf 100644 --- a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,8 +1,8 @@ ---- ui/views/window/custom_frame_view.cc.orig 2022-12-01 10:35:46 UTC +--- ui/views/window/custom_frame_view.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/window/custom_frame_view.cc -@@ -266,7 +266,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -267,7 +267,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // TODO(crbug.com/40118868): 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) diff --git a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc index be8f5a088f88..6946dd48fb53 100644 --- a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2024-02-04 14:46:08 UTC +--- ui/views/window/dialog_delegate.cc.orig 2024-06-25 12:08:48 UTC +++ ui/views/window/dialog_delegate.cc -@@ -79,7 +79,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -104,7 +104,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index c0715b45cbaa..eea79d7b7aa0 100644 --- a/www/iridium/files/patch-v8_BUILD.gn +++ b/www/iridium/files/patch-v8_BUILD.gn @@ -1,21 +1,28 @@ ---- v8/BUILD.gn.orig 2024-02-04 14:46:08 UTC +--- v8/BUILD.gn.orig 2024-06-25 12:08:48 UTC +++ v8/BUILD.gn -@@ -1425,6 +1425,14 @@ config("toolchain") { - } else if (target_os == "chromeos") { - defines += [ "V8_HAVE_TARGET_OS" ] - defines += [ "V8_TARGET_OS_CHROMEOS" ] -+ } else if (target_os == "openbsd") { -+ defines += [ "V8_HAVE_TARGET_OS" ] -+ defines += [ "V8_TARGET_OS_OPENBSD" ] -+ defines += [ "V8_TARGET_OS_BSD" ] -+ } else if (target_os == "freebsd") { -+ defines += [ "V8_HAVE_TARGET_OS" ] -+ defines += [ "V8_TARGET_OS_FREEBSD" ] -+ defines += [ "V8_TARGET_OS_BSD" ] - } +@@ -890,6 +890,8 @@ external_v8_defines = [ + "V8_TARGET_OS_MACOS", + "V8_TARGET_OS_WIN", + "V8_TARGET_OS_CHROMEOS", ++ "V8_TARGET_OS_OPENBSD", ++ "V8_TARGET_OS_FREEBSD", + ] + + enabled_external_v8_defines = [] +@@ -962,6 +964,12 @@ if (target_os == "android") { + } else if (target_os == "chromeos") { + enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] + enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ] ++} else if (target_os == "openbsd") { ++ enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] ++ enabled_external_v8_defines += [ "V8_TARGET_OS_OPENBSD" ] ++} else if (target_os == "freebsd") { ++ enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] ++ enabled_external_v8_defines += [ "V8_TARGET_OS_FREEBSD" ] + } - # TODO(infra): Support v8_enable_prof on Windows. -@@ -2388,6 +2396,12 @@ template("run_mksnapshot") { + disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines +@@ -2458,6 +2466,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -28,7 +35,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6248,7 +6262,7 @@ v8_component("v8_libbase") { +@@ -6495,7 +6509,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6259,6 +6273,18 @@ v8_component("v8_libbase") { +@@ -6506,6 +6520,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/iridium/files/patch-v8_include_v8-internal.h b/www/iridium/files/patch-v8_include_v8-internal.h index c2fc212b4be8..8a8d2b2e6af9 100644 --- a/www/iridium/files/patch-v8_include_v8-internal.h +++ b/www/iridium/files/patch-v8_include_v8-internal.h @@ -1,11 +1,11 @@ ---- v8/include/v8-internal.h.orig 2024-02-04 14:46:08 UTC +--- v8/include/v8-internal.h.orig 2024-06-25 12:08:48 UTC +++ v8/include/v8-internal.h -@@ -175,7 +175,7 @@ using SandboxedPointer_t = Address; +@@ -185,7 +185,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. --#ifdef V8_TARGET_OS_ANDROID -+#if defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD) +-#if defined(V8_TARGET_OS_ANDROID) ++#if (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD)) // On Android, most 64-bit devices seem to be configured with only 39 bits of // virtual address space for userspace. As such, limit the sandbox to 128GB (a // quarter of the total available address space). diff --git a/www/iridium/files/patch-v8_include_v8config.h b/www/iridium/files/patch-v8_include_v8config.h index 2276a45af502..e08c45eed255 100644 --- a/www/iridium/files/patch-v8_include_v8config.h +++ b/www/iridium/files/patch-v8_include_v8config.h @@ -1,6 +1,6 @@ ---- v8/include/v8config.h.orig 2023-04-22 17:45:15 UTC +--- v8/include/v8config.h.orig 2024-06-25 12:08:48 UTC +++ v8/include/v8config.h -@@ -184,6 +184,8 @@ path. Add it with -I<path> to the command line +@@ -185,6 +185,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ @@ -9,7 +9,7 @@ && !defined(V8_TARGET_OS_MACOS) \ && !defined(V8_TARGET_OS_WIN) \ && !defined(V8_TARGET_OS_CHROMEOS) -@@ -196,6 +198,8 @@ path. Add it with -I<path> to the command line +@@ -197,6 +199,8 @@ path. Add it with -I<path> to the command line || defined(V8_TARGET_OS_FUCHSIA) \ || defined(V8_TARGET_OS_IOS) \ || defined(V8_TARGET_OS_LINUX) \ @@ -18,7 +18,7 @@ || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) \ || defined(V8_TARGET_OS_CHROMEOS) -@@ -217,6 +221,16 @@ path. Add it with -I<path> to the command line +@@ -218,6 +222,16 @@ path. Add it with -I<path> to the command line #ifdef V8_OS_LINUX # define V8_TARGET_OS_LINUX diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc index de43a4238644..4e283fc57c8e 100644 --- a/www/iridium/files/patch-v8_src_api_api.cc +++ b/www/iridium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2024-02-04 14:46:08 UTC +--- v8/src/api/api.cc.orig 2024-06-25 12:08:48 UTC +++ v8/src/api/api.cc -@@ -141,7 +141,7 @@ +@@ -144,7 +144,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6356,7 +6356,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6434,7 +6434,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc index f7ebaed330bc..6f8044e62673 100644 --- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2024-02-04 14:46:08 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2024-06-25 12:08:48 UTC +++ v8/src/base/platform/platform-posix.cc @@ -54,7 +54,7 @@ #if V8_OS_DARWIN @@ -18,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -303,8 +303,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -399,6 +406,7 @@ void* OS::GetRandomMmapAddr() { +@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1303,7 +1311,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1304,7 +1312,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/iridium/files/patch-v8_src_base_small-vector.h b/www/iridium/files/patch-v8_src_base_small-vector.h new file mode 100644 index 000000000000..658417bf89aa --- /dev/null +++ b/www/iridium/files/patch-v8_src_base_small-vector.h @@ -0,0 +1,11 @@ +--- v8/src/base/small-vector.h.orig 2024-06-25 12:08:48 UTC ++++ v8/src/base/small-vector.h +@@ -22,7 +22,7 @@ template <typename T, size_t kSize, typename Allocator + class SmallVector { + // Currently only support trivially copyable and trivially destructible data + // types, as it uses memcpy to copy elements and never calls destructors. +- ASSERT_TRIVIALLY_COPYABLE(T); ++ // XXX FREEBSD ASSERT_TRIVIALLY_COPYABLE(T); + static_assert(std::is_trivially_destructible<T>::value); + + public: diff --git a/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h b/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h deleted file mode 100644 index fe20f7a90f8e..000000000000 --- a/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h +++ /dev/null @@ -1,13 +0,0 @@ ---- v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig 2023-11-22 14:00:11 UTC -+++ v8/src/baseline/x64/baseline-assembler-x64-inl.h -@@ -76,9 +76,7 @@ MemOperand BaselineAssembler::FeedbackCellOperand() { - - void BaselineAssembler::Bind(Label* label) { __ bind(label); } - --void BaselineAssembler::JumpTarget() { -- // NOP on x64. --} -+void BaselineAssembler::JumpTarget() { __ endbr64(); } - - void BaselineAssembler::Jump(Label* target, Label::Distance distance) { - __ jmp(target, distance); diff --git a/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc deleted file mode 100644 index 389595c845c9..000000000000 --- a/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc +++ /dev/null @@ -1,46 +0,0 @@ ---- v8/src/builtins/x64/builtins-x64.cc.orig 2024-02-04 14:46:08 UTC -+++ v8/src/builtins/x64/builtins-x64.cc -@@ -44,6 +44,8 @@ namespace internal { - #define __ ACCESS_MASM(masm) - - void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) { -+ __ CodeEntry(); -+ - __ LoadAddress(kJavaScriptCallExtraArg1Register, - ExternalReference::Create(address)); - __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame), -@@ -430,7 +432,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta - // Jump to a faked try block that does the invoke, with a faked catch - // block that sets the pending exception. - __ jmp(&invoke); -- __ bind(&handler_entry); -+ __ BindExceptionHandler(&handler_entry); - - // Store the current pc as the handler offset. It's used later to create the - // handler table. -@@ -3339,6 +3341,9 @@ void SwitchBackAndReturnPromise(MacroAssembler* masm, - void GenerateExceptionHandlingLandingPad(MacroAssembler* masm, - Label* return_promise) { - int catch_handler = __ pc_offset(); -+ -+ __ endbr64(); -+ - // Restore rsp to free the reserved stack slots for the sections. - __ leaq(rsp, MemOperand(rbp, StackSwitchFrameConstants::kLastSpillOffset)); - -@@ -3696,6 +3701,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma - LoadJumpBuffer(masm, jmpbuf, true); - __ Trap(); - __ bind(&resume); -+ __ endbr64(); - __ LeaveFrame(StackFrame::STACK_SWITCH); - __ ret(0); - } -@@ -3828,6 +3834,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w - } - __ Trap(); - __ bind(&suspend); -+ __ endbr64(); - __ LeaveFrame(StackFrame::STACK_SWITCH); - // Pop receiver + parameter. - __ ret(2 * kSystemPointerSize); diff --git a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.cc b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.cc deleted file mode 100644 index 1679ea83b62e..000000000000 --- a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.cc +++ /dev/null @@ -1,42 +0,0 @@ ---- v8/src/codegen/x64/assembler-x64.cc.orig 2023-10-21 11:51:27 UTC -+++ v8/src/codegen/x64/assembler-x64.cc -@@ -1316,6 +1316,14 @@ void Assembler::hlt() { - emit(0xF4); - } - -+void Assembler::endbr64() { -+ EnsureSpace ensure_space(this); -+ emit(0xF3); -+ emit(0x0f); -+ emit(0x1e); -+ emit(0xfa); -+} -+ - void Assembler::emit_idiv(Register src, int size) { - EnsureSpace ensure_space(this); - emit_rex(src, size); -@@ -1583,16 +1591,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo - emitl(code_target_index); - } - --void Assembler::jmp(Register target) { -+void Assembler::jmp(Register target, bool notrack) { - EnsureSpace ensure_space(this); -+ if (notrack) { -+ emit(0x3e); -+ } - // Opcode FF/4 r64. - emit_optional_rex_32(target); - emit(0xFF); - emit_modrm(0x4, target); - } - --void Assembler::jmp(Operand src) { -+void Assembler::jmp(Operand src, bool notrack) { - EnsureSpace ensure_space(this); -+ if (notrack) { -+ emit(0x3e); -+ } - // Opcode FF/4 m64. - emit_optional_rex_32(src); - emit(0xFF); diff --git a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h deleted file mode 100644 index d7b1485a6f3b..000000000000 --- a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h +++ /dev/null @@ -1,21 +0,0 @@ ---- v8/src/codegen/x64/assembler-x64.h.orig 2023-11-22 14:00:11 UTC -+++ v8/src/codegen/x64/assembler-x64.h -@@ -860,6 +860,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa - void ret(int imm16); - void ud2(); - void setcc(Condition cc, Register reg); -+ void endbr64(); - - void pblendw(XMMRegister dst, Operand src, uint8_t mask); - void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask); -@@ -918,8 +919,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa - void jmp(Handle<Code> target, RelocInfo::Mode rmode); - - // Jump near absolute indirect (r64) -- void jmp(Register adr); -- void jmp(Operand src); -+ void jmp(Register adr, bool notrack = false); -+ void jmp(Operand src, bool notrack = false); - - // Unconditional jump relative to the current address. Low-level routine, - // use with caution! diff --git a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc deleted file mode 100644 index 7ed6fdb907aa..000000000000 --- a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2024-02-04 14:46:08 UTC -+++ v8/src/codegen/x64/macro-assembler-x64.cc -@@ -51,6 +51,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int - return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); - } - -+void MacroAssembler::CodeEntry() { endbr64(); } -+ - void MacroAssembler::Load(Register destination, ExternalReference source) { - if (root_array_available_ && options().enable_root_relative_access) { - intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); -@@ -2144,7 +2146,7 @@ void MacroAssembler::Switch(Register scratch, Register - cmpq(reg, Immediate(num_labels)); - j(above_equal, &fallthrough); - leaq(table, MemOperand(&jump_table)); -- jmp(MemOperand(table, reg, times_8, 0)); -+ jmp(MemOperand(table, reg, times_8, 0), /*notrack=*/true); - // Emit the jump table inline, under the assumption that it's not too big. - Align(kSystemPointerSize); - bind(&jump_table); diff --git a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h deleted file mode 100644 index 2d51e8d24baa..000000000000 --- a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h +++ /dev/null @@ -1,20 +0,0 @@ ---- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-11-22 14:00:11 UTC -+++ v8/src/codegen/x64/macro-assembler-x64.h -@@ -655,11 +655,14 @@ class V8_EXPORT_PRIVATE MacroAssembler - - // Define a function entrypoint. This doesn't emit any code for this - // architecture, as control-flow integrity is not supported for it. -- void CodeEntry() {} -+ void CodeEntry(); - // Define an exception handler. -- void ExceptionHandler() {} -+ void ExceptionHandler() { CodeEntry(); } - // Define an exception handler and bind a label. -- void BindExceptionHandler(Label* label) { bind(label); } -+ void BindExceptionHandler(Label* label) { -+ bind(label); -+ CodeEntry(); -+ } - - // --------------------------------------------------------------------------- - // Pointer compression support diff --git a/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc b/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc deleted file mode 100644 index bab21184fe93..000000000000 --- a/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2024-02-04 14:46:08 UTC -+++ v8/src/compiler/backend/x64/code-generator-x64.cc -@@ -6850,11 +6850,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio - // target = table + (target - table) - __ addq(input, kScratchRegister); - // Jump to the target. -- __ jmp(input); -+ __ jmp(input, /*notrack=*/true); - } else { - // For non builtins, the value in the table is 'target_address' (8 bytes) - // jmp [table + index*8] -- __ jmp(Operand(kScratchRegister, input, times_8, 0)); -+ __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true); - } - } - diff --git a/www/iridium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc b/www/iridium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc deleted file mode 100644 index e7c91e29bb3b..000000000000 --- a/www/iridium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/deoptimizer/x64/deoptimizer-x64.cc.orig 2023-07-24 14:27:53 UTC -+++ v8/src/deoptimizer/x64/deoptimizer-x64.cc -@@ -21,7 +21,7 @@ ASSERT_OFFSET(Builtin::kDeoptimizationEntry_Lazy); - #undef ASSERT_OFFSET - - const int Deoptimizer::kEagerDeoptExitSize = 4; --const int Deoptimizer::kLazyDeoptExitSize = 4; -+const int Deoptimizer::kLazyDeoptExitSize = 8; - - Float32 RegisterValues::GetFloatRegister(unsigned n) const { - return Float32::FromBits( diff --git a/www/iridium/files/patch-v8_src_execution_isolate.cc b/www/iridium/files/patch-v8_src_execution_isolate.cc index a644a2d7c466..d1665ef2d41f 100644 --- a/www/iridium/files/patch-v8_src_execution_isolate.cc +++ b/www/iridium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2024-02-04 14:46:08 UTC +--- v8/src/execution/isolate.cc.orig 2024-06-25 12:08:48 UTC +++ v8/src/execution/isolate.cc -@@ -147,6 +147,10 @@ +@@ -157,6 +157,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,14 +11,16 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -4190,6 +4194,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4535,6 +4539,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); + +#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32) -+ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), -+ code_size, PROT_READ | PROT_EXEC); ++ if (code_size > 0) { ++ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)), ++ code_size, PROT_READ | PROT_EXEC); ++ } +#endif if (StickyEmbeddedBlobCode() != nullptr) { diff --git a/www/iridium/files/patch-v8_src_flags_flags.cc b/www/iridium/files/patch-v8_src_flags_flags.cc index 17ca33d8bde1..95c30afc34ef 100644 --- a/www/iridium/files/patch-v8_src_flags_flags.cc +++ b/www/iridium/files/patch-v8_src_flags_flags.cc @@ -1,6 +1,6 @@ ---- v8/src/flags/flags.cc.orig 2023-11-22 14:00:11 UTC +--- v8/src/flags/flags.cc.orig 2024-06-25 12:08:48 UTC +++ v8/src/flags/flags.cc -@@ -13,6 +13,10 @@ +@@ -15,6 +15,10 @@ #include <set> #include <sstream> @@ -9,9 +9,9 @@ +#endif + #include "src/base/functional.h" - #include "src/base/logging.h" + #include "src/base/lazy-instance.h" #include "src/base/platform/platform.h" -@@ -32,7 +36,11 @@ +@@ -34,7 +38,11 @@ namespace v8::internal { // Define {v8_flags}, declared in flags.h. @@ -23,7 +23,7 @@ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a // multiple of a page size. This is required for memory-protection of the memory -@@ -905,6 +913,10 @@ void FlagList::FreezeFlags() { +@@ -807,6 +815,10 @@ void FlagList::FreezeFlags() { // Note that for string flags we only protect the pointer itself, but not the // string storage. TODO(12887): Fix this. base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); diff --git a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h deleted file mode 100644 index 2f29c0fd1e4e..000000000000 --- a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h +++ /dev/null @@ -1,14 +0,0 @@ ---- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2024-02-04 14:46:08 UTC -+++ v8/src/maglev/x64/maglev-assembler-x64-inl.h -@@ -232,7 +232,10 @@ void MaglevAssembler::PushReverse(T... vals) { - detail::PushAllHelper<T...>::PushReverse(this, vals...); - } - --inline void MaglevAssembler::BindJumpTarget(Label* label) { bind(label); } -+inline void MaglevAssembler::BindJumpTarget(Label* label) { -+ bind(label); -+ endbr64(); -+} - - inline void MaglevAssembler::BindBlock(BasicBlock* block) { - bind(block->label()); diff --git a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc deleted file mode 100644 index 02922999637d..000000000000 --- a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-10-21 11:51:27 UTC -+++ v8/src/maglev/x64/maglev-assembler-x64.cc -@@ -433,10 +433,12 @@ void MaglevAssembler::OSRPrologue(Graph* graph) { - void MaglevAssembler::Prologue(Graph* graph) { - DCHECK(!graph->is_osr()); - -+ CodeEntry(); -+ - BailoutIfDeoptimized(rbx); - - if (graph->has_recursive_calls()) { -- bind(code_gen_state()->entry_label()); -+ BindJumpTarget(code_gen_state()->entry_label()); - } - - // Tiering support. diff --git a/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc b/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc deleted file mode 100644 index 2ac5fc9723a7..000000000000 --- a/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- v8/src/regexp/x64/regexp-macro-assembler-x64.cc.orig 2023-07-24 14:27:53 UTC -+++ v8/src/regexp/x64/regexp-macro-assembler-x64.cc -@@ -110,6 +110,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isola - backtrack_label_(), - exit_label_() { - DCHECK_EQ(0, registers_to_save % 2); -+ __ CodeEntry(); - __ jmp(&entry_label_); // We'll write the entry code when we know more. - __ bind(&start_label_); // And then continue from here. - } -@@ -714,6 +715,11 @@ bool RegExpMacroAssemblerX64::CheckSpecialClassRanges( - // Match any character. - return true; - } -+} -+ -+void RegExpMacroAssemblerX64::BindJumpTarget(Label* label) { -+ Bind(label); -+ __ CodeEntry(); - } - - void RegExpMacroAssemblerX64::Fail() { diff --git a/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h b/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h deleted file mode 100644 index f08cb279ffc9..000000000000 --- a/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h +++ /dev/null @@ -1,12 +0,0 @@ ---- v8/src/regexp/x64/regexp-macro-assembler-x64.h.orig 2023-07-24 14:27:53 UTC -+++ v8/src/regexp/x64/regexp-macro-assembler-x64.h -@@ -59,6 +59,9 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerX64 - void CheckPosition(int cp_offset, Label* on_outside_input) override; - bool CheckSpecialClassRanges(StandardCharacterSet type, - Label* on_no_match) override; -+ -+ void BindJumpTarget(Label* label) override; -+ - void Fail() override; - Handle<HeapObject> GetCode(Handle<String> source) override; - void GoTo(Label* label) override; diff --git a/www/iridium/files/patch-v8_src_sandbox_sandbox.cc b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc index 1c832820b516..8141916a0b94 100644 --- a/www/iridium/files/patch-v8_src_sandbox_sandbox.cc +++ b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc @@ -1,6 +1,6 @@ ---- v8/src/sandbox/sandbox.cc.orig 2023-03-13 07:33:08 UTC +--- v8/src/sandbox/sandbox.cc.orig 2024-06-25 12:08:48 UTC +++ v8/src/sandbox/sandbox.cc -@@ -46,7 +46,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -47,7 +47,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc index a7ec066b581e..35ee5398710e 100644 --- a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc +++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/trap-handler/handler-inside-posix.cc.orig 2024-02-04 14:46:08 UTC +--- v8/src/trap-handler/handler-inside-posix.cc.orig 2024-06-25 12:08:48 UTC +++ v8/src/trap-handler/handler-inside-posix.cc @@ -61,6 +61,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -78,8 +80,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { +@@ -80,8 +82,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { // si_code at its default of 0 for signals that don’t originate in hardware. // The other conditions are only relevant for Linux. return info->si_code > 0 && info->si_code != SI_USER && diff --git a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h index 1a7855341877..a880994f2fe9 100644 --- a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h +++ b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-02-04 14:46:08 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-06-25 12:08:48 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -487,7 +487,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -492,7 +492,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -567,7 +567,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -569,7 +569,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -647,7 +647,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -645,7 +645,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -667,7 +667,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -663,7 +663,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -35,8 +35,8 @@ + uintptr_t offset_imm, LiftoffRegister src, StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { - DCHECK_NE(offset_reg, no_reg); -@@ -737,7 +737,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; + DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); +@@ -733,7 +733,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -804,7 +804,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -801,7 +801,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -63,7 +63,7 @@ LiftoffRegister value, LiftoffRegister result) { // We need {ebx} here, which is the root register. As the root register it // needs special treatment. As we use {ebx} directly in the code below, we -@@ -1008,7 +1008,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1022,7 +1022,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1035,7 +1035,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1049,7 +1049,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -99,7 +99,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1063,7 +1063,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -108,7 +108,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1077,7 +1077,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -117,7 +117,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1092,7 +1092,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc deleted file mode 100644 index 023589174106..000000000000 --- a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc +++ /dev/null @@ -1,51 +0,0 @@ ---- v8/src/wasm/jump-table-assembler.cc.orig 2023-11-22 14:00:11 UTC -+++ v8/src/wasm/jump-table-assembler.cc -@@ -74,15 +74,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT - #if V8_TARGET_ARCH_X64 - void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index, - Address lazy_compile_target) { -+ intptr_t displacement = -+ static_cast<intptr_t>(reinterpret_cast<uint8_t*>(lazy_compile_target) - -+ (pc_ + 9) - kNearJmpInstrSize); -+ if (!is_int32(displacement)) return; -+ CodeEntry(); // 4 bytes - // Use a push, because mov to an extended register takes 6 bytes. -- pushq_imm32(func_index); // 5 bytes -- EmitJumpSlot(lazy_compile_target); // 5 bytes -+ pushq_imm32(func_index); // 5 bytes -+ near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes - } - - bool JumpTableAssembler::EmitJumpSlot(Address target) { - intptr_t displacement = static_cast<intptr_t>( -- reinterpret_cast<uint8_t*>(target) - pc_ - kNearJmpInstrSize); -+ reinterpret_cast<uint8_t*>(target) - (pc_ + 4) - kNearJmpInstrSize); - if (!is_int32(displacement)) return false; -+ CodeEntry(); // 4 bytes - near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes - return true; - } -@@ -90,11 +96,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) - void JumpTableAssembler::EmitFarJumpSlot(Address target) { - Label data; - int start_offset = pc_offset(); -+ CodeEntry(); // 4 bytes - jmp(Operand(&data)); // 6 bytes -- Nop(2); // 2 bytes -+ Nop(6); // 6 bytes - // The data must be properly aligned, so it can be patched atomically (see - // {PatchFarJumpSlot}). -- DCHECK_EQ(start_offset + kSystemPointerSize, pc_offset()); -+ DCHECK_EQ(start_offset + kFarJumpTableSlotOffset, pc_offset()); - USE(start_offset); - bind(&data); - dq(target); // 8 bytes -@@ -105,7 +112,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot - // The slot needs to be pointer-size aligned so we can atomically update it. - DCHECK(IsAligned(slot, kSystemPointerSize)); - // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}. -- reinterpret_cast<std::atomic<Address>*>(slot + kSystemPointerSize) -+ reinterpret_cast<std::atomic<Address>*>(slot + kFarJumpTableSlotOffset) - ->store(target, std::memory_order_relaxed); - // The update is atomic because the address is properly aligned. - // Because of cache coherence, the data update will eventually be seen by all diff --git a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h deleted file mode 100644 index 9e39adf98498..000000000000 --- a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h +++ /dev/null @@ -1,16 +0,0 @@ ---- v8/src/wasm/jump-table-assembler.h.orig 2023-11-22 14:00:11 UTC -+++ v8/src/wasm/jump-table-assembler.h -@@ -174,9 +174,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma - // boundaries. The jump table line size has been chosen to satisfy this. - #if V8_TARGET_ARCH_X64 - static constexpr int kJumpTableLineSize = 64; -- static constexpr int kJumpTableSlotSize = 5; -- static constexpr int kFarJumpTableSlotSize = 16; -- static constexpr int kLazyCompileTableSlotSize = 10; -+ static constexpr int kJumpTableSlotSize = 5 + 4; -+ static constexpr int kFarJumpTableSlotOffset = 2 * kSystemPointerSize; -+ static constexpr int kFarJumpTableSlotSize = 16 + 8; -+ static constexpr int kLazyCompileTableSlotSize = 10 + 4; - #elif V8_TARGET_ARCH_IA32 - static constexpr int kJumpTableLineSize = 64; - static constexpr int kJumpTableSlotSize = 5; diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist index 7f1f62468c5d..c7c3458c9524 100644 --- a/www/iridium/pkg-plist +++ b/www/iridium/pkg-plist @@ -127,6 +127,9 @@ bin/iridium %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc %%DATADIR%%/resources.pak +%%DATADIR%%/resources/accessibility/reading_mode_gdocs_helper/content.js +%%DATADIR%%/resources/accessibility/reading_mode_gdocs_helper/gdocs_script.js +%%DATADIR%%/resources/accessibility/reading_mode_gdocs_helper_manifest.json %%DATADIR%%/resources/inspector_overlay/inspector_overlay_resources.grd %%DATADIR%%/resources/inspector_overlay/main.js %%DATADIR%%/snapshot_blob.bin |