diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2025-02-23 07:56:17 +0100 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2025-02-23 07:58:58 +0100 |
| commit | 696d6d4927ee8bee949bb3d91b13026c8a090e1a (patch) | |
| tree | d41e61010d6cb7334edbba61ba19525e9f7f547d | |
| parent | editors/imhex: Update to 1.37.1 (diff) | |
www/iridium: update to 2025.02.133
699 files changed, 4112 insertions, 4190 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile index fe1408ddbb53..24a6180689d2 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,5 @@ PORTNAME= iridium -PORTVERSION= 2024.11.131.1 -PORTREVISION= 2 +PORTVERSION= 2025.02.133 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland @@ -47,7 +46,6 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libepoll-shim.so:devel/libepoll-shim \ - libevent.so:devel/libevent \ libffi.so:devel/libffi \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ @@ -107,7 +105,6 @@ 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 \ fatal_linker_warnings=false \ @@ -214,7 +211,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -LLVM_DEFAULT= 18 +LLVM_DEFAULT= 19 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ @@ -269,7 +266,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - dav1d flac fontconfig harfbuzz-ng icu libdrm libevent libpng \ + dav1d flac fontconfig harfbuzz-ng libdrm libpng \ libusb libwebp libxml libxslt openh264 opus || ${FALSE} # Iridium uses an unreleased version of FFmpeg, so configure it cd ${WRKSRC}/media/ffmpeg && \ @@ -282,7 +279,8 @@ pre-configure: .endfor touch ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h @${REINPLACE_CMD} -e 's|$${LOCALBASE}|${LOCALBASE}|;s|$${MODCLANG_VERSION}|${LLVM_DEFAULT}|' \ - ${WRKSRC}/build/rust/rust_bindgen.gni + ${WRKSRC}/build/rust/rust_bindgen.gni \ + ${WRKSRC}/build/rust/rust_bindgen_generator.gni do-configure: # GN generator bootstrapping and generating ninja files diff --git a/www/iridium/distinfo b/www/iridium/distinfo index a580c4376a5d..05687e5f949c 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1734871188 -SHA256 (iridium-browser-2024.11.131.1.tar.xz) = 23b8a7eb31a38cc9cf01eb900569d994beeb018f6f6126ec27c14f8ad6e9b336 -SIZE (iridium-browser-2024.11.131.1.tar.xz) = 2844538972 +TIMESTAMP = 1740247633 +SHA256 (iridium-browser-2025.02.133.tar.xz) = 367175beb730f36cafaaf92f921909dc4bbc2b6652aeb351da5690c30e975c43 +SIZE (iridium-browser-2025.02.133.tar.xz) = 3119656712 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 diff --git a/www/iridium/files/patch-.gn b/www/iridium/files/patch-.gn deleted file mode 100644 index 0689b202865a..000000000000 --- a/www/iridium/files/patch-.gn +++ /dev/null @@ -1,9 +0,0 @@ ---- .gn.orig 2024-11-04 17:00:34 UTC -+++ .gn -@@ -172,4 +172,6 @@ exec_script_whitelist = - - "//tools/grit/grit_rule.gni", - "//tools/gritsettings/BUILD.gn", -+ -+ "//third_party/icu/BUILD.gn", - ] diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index 15ded9a36a5f..f6c3abfe50c4 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ BUILD.gn -@@ -66,7 +66,7 @@ declare_args() { +@@ -71,7 +71,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) -@@ -98,7 +98,6 @@ group("gn_all") { +@@ -103,7 +103,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", -@@ -444,7 +443,7 @@ group("gn_all") { +@@ -445,7 +444,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -634,6 +633,15 @@ group("gn_all") { +@@ -635,6 +634,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -682,7 +690,7 @@ group("gn_all") { +@@ -683,7 +691,7 @@ group("gn_all") { } } @@ -51,7 +51,7 @@ # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -1168,7 +1176,7 @@ if (use_blink && !is_cronet_build) { +@@ -1171,7 +1179,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 = _common_web_test_options + [ "--product=chrome" ] -@@ -1261,7 +1269,7 @@ if (use_blink && !is_cronet_build) { +@@ -1264,7 +1272,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) { +@@ -1278,7 +1286,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -78,7 +78,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1739,7 +1747,7 @@ group("chromium_builder_perf") { +@@ -1748,7 +1756,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index 70e9ec7a1c6c..29616d32c187 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-12-22 12:24:29 UTC +--- base/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ base/BUILD.gn -@@ -1097,11 +1097,26 @@ component("base") { +@@ -1089,11 +1089,26 @@ 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. @@ -28,7 +28,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1121,7 +1136,7 @@ component("base") { +@@ -1113,7 +1128,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -37,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2113,6 +2128,22 @@ component("base") { +@@ -2121,6 +2136,22 @@ component("base") { ] } @@ -60,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2257,6 +2288,33 @@ component("base") { +@@ -2266,6 +2297,33 @@ component("base") { } } @@ -94,7 +94,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2583,7 +2641,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2616,7 +2674,7 @@ buildflag_header("protected_memory_buildflags") { header = "protected_memory_buildflags.h" header_dir = "base/memory" @@ -103,7 +103,7 @@ (is_win || is_linux || is_android || is_mac) flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] -@@ -3068,7 +3126,7 @@ if (is_apple) { +@@ -3093,7 +3151,7 @@ if (is_apple) { } } @@ -112,7 +112,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3744,7 +3802,7 @@ test("base_unittests") { +@@ -3779,7 +3837,7 @@ test("base_unittests") { ] } @@ -121,7 +121,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3771,7 +3829,7 @@ test("base_unittests") { +@@ -3807,7 +3865,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -130,7 +130,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3782,7 +3840,7 @@ test("base_unittests") { +@@ -3818,7 +3876,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -139,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3972,7 +4030,7 @@ test("base_unittests") { +@@ -4006,7 +4064,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } diff --git a/www/iridium/files/patch-base_allocator_dispatcher_tls.h b/www/iridium/files/patch-base_allocator_dispatcher_tls.h index ad6f0fbaaae1..7be94ac7db78 100644 --- a/www/iridium/files/patch-base_allocator_dispatcher_tls.h +++ b/www/iridium/files/patch-base_allocator_dispatcher_tls.h @@ -1,6 +1,6 @@ ---- base/allocator/dispatcher/tls.h.orig 2024-06-25 12:08:48 UTC +--- base/allocator/dispatcher/tls.h.orig 2025-02-22 18:06:53 UTC +++ base/allocator/dispatcher/tls.h -@@ -77,7 +77,7 @@ struct BASE_EXPORT MMapAllocator { +@@ -81,7 +81,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; 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 577bf60eafeb..e0df18646808 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-12-22 12:24:29 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2025-02-22 18:06:53 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -38,7 +38,7 @@ if (is_nacl) { +@@ -39,7 +39,7 @@ if (is_nacl) { use_large_empty_slot_span_ring = true has_memory_tagging = @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -432,7 +432,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -433,7 +433,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = 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 cafd7d0293a0..62d1e2ebedd2 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,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -863,7 +863,7 @@ if (is_clang_or_gcc) { +@@ -864,7 +864,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } 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 3bf0f2302aec..b7beb55fdb22 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,12 +1,12 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-08-27 06:28:16 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2025-02-22 18:06:53 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h @@ -26,8 +26,8 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ -- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ - (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) -+ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ + ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc index 363a589ca2c0..db001f0e9fa3 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2024-12-22 12:24:29 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc -@@ -38,7 +38,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTaskRef task) API - #endif // PA_BUILDFLAG(IS_MAC) +@@ -39,7 +39,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTaskRef task) API - #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ -- (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)) -+ (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && !PA_BUILDFLAG(IS_BSD)) + #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ + (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && \ +- __has_include(<sys/ifunc.h>)) ++ __has_include(<sys/ifunc.h>) && !PA_BUILDFLAG(IS_BSD)) struct __ifunc_arg_t; #include "partition_alloc/aarch64_support.h" 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 6bb1e7ae7e69..ee58d0297aef 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,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2024-08-01 05:47:53 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc @@ -18,7 +18,7 @@ #include "partition_alloc/partition_alloc_base/logging.h" @@ -7,5 +7,5 @@ -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include <sys/syscall.h> + #include <atomic> - #endif 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 74f57539b6e4..26f223b2b26c 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,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-12-22 12:24:29 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2025-02-22 18:06:53 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc @@ -44,7 +44,7 @@ #include "wow64apiset.h" @@ -9,7 +9,7 @@ #include <pthread.h> #if PA_CONFIG(ENABLE_SHADOW_METADATA) #include <sys/mman.h> -@@ -293,7 +293,7 @@ void PartitionAllocMallocInitOnce() { +@@ -297,7 +297,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -1113,7 +1113,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1117,7 +1117,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_atomicops.h b/www/iridium/files/patch-base_atomicops.h index 4a01c8920277..fed521c9eb76 100644 --- a/www/iridium/files/patch-base_atomicops.h +++ b/www/iridium/files/patch-base_atomicops.h @@ -1,6 +1,6 @@ ---- base/atomicops.h.orig 2023-04-22 17:45:15 UTC +--- base/atomicops.h.orig 2025-02-22 18:06:53 UTC +++ base/atomicops.h -@@ -71,7 +71,11 @@ typedef intptr_t Atomic64; +@@ -74,7 +74,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc index 03ba237ba61e..613a18325529 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 2024-11-04 08:56:03 UTC +--- base/base_paths_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -27,23 +27,22 @@ *result = bin_dir; return true; #elif BUILDFLAG(IS_FREEBSD) -- int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; +- int name[] = {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."; } -@@ -62,13 +66,65 @@ bool PathProviderPosix(int key, FilePath* result) { +@@ -62,14 +66,65 @@ bool PathProviderPosix(int key, FilePath* result) { *result = FilePath(bin_dir); return true; #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) - // There is currently no way to get the executable path on OpenBSD - char* cpath; -- if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) +- if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) { - *result = FilePath(cpath); -- else +- } else { - *result = FilePath("/usr/local/chrome/chrome"); -- return true; + char *cpath; +#if !BUILDFLAG(IS_AIX) + struct kinfo_file *files; @@ -71,7 +70,8 @@ + *result = FilePath(retval); + VLOG(1) << "PathProviderPosix (sandbox) result: " << retval; + goto out; -+ } + } +- return true; + + if ((kd = kvm_openfiles(NULL, NULL, NULL, (int)KVM_NO_FILES, errbuf)) == NULL) + goto out; diff --git a/www/iridium/files/patch-base_compiler__specific.h b/www/iridium/files/patch-base_compiler__specific.h index a04e77d5df83..3110ec8c350f 100644 --- a/www/iridium/files/patch-base_compiler__specific.h +++ b/www/iridium/files/patch-base_compiler__specific.h @@ -1,11 +1,10 @@ ---- base/compiler_specific.h.orig 2024-12-22 12:24:29 UTC +--- base/compiler_specific.h.orig 2025-02-22 18:06:53 UTC +++ base/compiler_specific.h -@@ -683,7 +683,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { +@@ -683,6 +683,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { #if __has_cpp_attribute(clang::preserve_most) && \ (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ !defined(COMPONENT_BUILD) && \ -- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) -+ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) ++ !BUILDFLAG(IS_OPENBSD) && \ + !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) #define PRESERVE_MOST [[clang::preserve_most]] #else - #define PRESERVE_MOST diff --git a/www/iridium/files/patch-base_debug_debugger__posix.cc b/www/iridium/files/patch-base_debug_debugger__posix.cc index 949b55d02948..560758b47625 100644 --- a/www/iridium/files/patch-base_debug_debugger__posix.cc +++ b/www/iridium/files/patch-base_debug_debugger__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/debugger_posix.cc.orig 2024-06-25 12:08:48 UTC +--- base/debug/debugger_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/debug/debugger_posix.cc @@ -41,6 +41,10 @@ #include <sys/sysctl.h> @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -100,32 +104,51 @@ bool BeingDebugged() { +@@ -100,33 +104,52 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -24,8 +24,9 @@ +#endif #if BUILDFLAG(IS_OPENBSD) - if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) { return -1; + } - mib[5] = (info_size / sizeof(struct kinfo_proc)); + mib[5] = static_cast<int>((info_size / sizeof(struct kinfo_proc))); 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 90fa0fa91c4f..e7f67490a26b 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 2024-06-25 12:08:48 UTC +--- base/debug/proc_maps_linux.cc.orig 2025-02-22 18:06:53 UTC +++ base/debug/proc_maps_linux.cc -@@ -18,7 +18,7 @@ +@@ -22,7 +22,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 a16d02798a21..a3e01acda5fe 100644 --- a/www/iridium/files/patch-base_debug_stack__trace.cc +++ b/www/iridium/files/patch-base_debug_stack__trace.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.cc.orig 2024-11-04 08:56:03 UTC +--- base/debug/stack_trace.cc.orig 2025-02-22 18:06:53 UTC +++ base/debug/stack_trace.cc -@@ -258,7 +258,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { +@@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { // Symbols are not expected to be reliable when gn args specifies // symbol_level=0. return false; @@ -9,7 +9,17 @@ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 return false; -@@ -320,7 +320,7 @@ std::string StackTrace::ToString() const { +@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream + } + return; + } ++#if !BUILDFLAG(IS_BSD) + OutputToStreamWithPrefixImpl(os, prefix_string); ++#endif + } + + std::string StackTrace::ToString() const { +@@ -330,7 +332,7 @@ std::string StackTrace::ToString() const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; @@ -18,7 +28,7 @@ OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -@@ -344,7 +344,7 @@ bool StackTrace::ShouldSuppressOutput() { +@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() { } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { 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 0d9478fe2fb9..7a45d4e430ae 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2024-12-22 12:24:29 UTC +--- base/debug/stack_trace_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/debug/stack_trace_posix.cc @@ -46,7 +46,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -322,7 +324,7 @@ void PrintToStderr(const char* output) { +@@ -324,7 +326,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 -@@ -339,7 +341,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -341,7 +343,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) -@@ -537,7 +543,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -547,7 +553,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; -@@ -562,6 +568,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -572,6 +578,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) { -@@ -576,6 +583,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -586,6 +593,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) -@@ -772,6 +780,7 @@ class SandboxSymbolizeHelper { +@@ -778,6 +786,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. -@@ -864,11 +873,15 @@ class SandboxSymbolizeHelper { +@@ -870,11 +879,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -886,6 +899,7 @@ class SandboxSymbolizeHelper { +@@ -892,6 +905,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; 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 a31e0f0a4636..9b8914493a17 100644 --- a/www/iridium/files/patch-base_files_dir__reader__linux.h +++ b/www/iridium/files/patch-base_files_dir__reader__linux.h @@ -1,4 +1,4 @@ ---- base/files/dir_reader_linux.h.orig 2024-06-25 12:08:48 UTC +--- base/files/dir_reader_linux.h.orig 2025-02-22 18:06:53 UTC +++ base/files/dir_reader_linux.h @@ -21,10 +21,16 @@ #include "base/logging.h" @@ -15,25 +15,25 @@ +typedef struct dirent linux_dirent; +#else struct linux_dirent { - uint64_t d_ino; - int64_t d_off; + uint64_t d_ino; + int64_t d_off; @@ -32,6 +38,7 @@ struct linux_dirent { - unsigned char d_type; - char d_name[0]; + unsigned char d_type; + char d_name[0]; }; +#endif class DirReaderLinux { public: @@ -66,7 +73,11 @@ class DirReaderLinux { - if (offset_ != size_) return true; + } +#if BUILDFLAG(IS_BSD) + const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_)); +#else const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); +#endif - if (r == 0) + if (r == 0) { return false; - if (r < 0) { + } diff --git a/www/iridium/files/patch-base_files_drive__info.h b/www/iridium/files/patch-base_files_drive__info.h index 4e1235a0dadd..0e6771192e8d 100644 --- a/www/iridium/files/patch-base_files_drive__info.h +++ b/www/iridium/files/patch-base_files_drive__info.h @@ -1,6 +1,6 @@ ---- base/files/drive_info.h.orig 2024-12-22 12:24:29 UTC +--- base/files/drive_info.h.orig 2025-02-22 18:06:53 UTC +++ base/files/drive_info.h -@@ -40,7 +40,7 @@ class BASE_EXPORT DriveInfo { +@@ -48,7 +48,7 @@ struct BASE_EXPORT DriveInfo { std::optional<bool> has_seek_penalty; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-base_files_drive__info__posix.cc b/www/iridium/files/patch-base_files_drive__info__posix.cc index 11b82dd5f23f..4744dd3cef3d 100644 --- a/www/iridium/files/patch-base_files_drive__info__posix.cc +++ b/www/iridium/files/patch-base_files_drive__info__posix.cc @@ -1,6 +1,6 @@ ---- base/files/drive_info_posix.cc.orig 2024-12-22 12:24:29 UTC +--- base/files/drive_info_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/files/drive_info_posix.cc -@@ -28,7 +28,7 @@ DriveInfo& DriveInfo::operator=(DriveInfo&&) = default +@@ -23,7 +23,7 @@ namespace base { std::optional<DriveInfo> GetFileDriveInfo(const FilePath& file_path) { DriveInfo drive_info; 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 2e9f3708cf97..74ec534396a6 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-12-22 12:24:29 UTC +--- base/files/file_util_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/files/file_util_unittest.cc -@@ -3928,7 +3928,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3908,7 +3908,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"; -@@ -4665,7 +4665,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4645,7 +4645,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 b550ad298cd6..f13710d13dc1 100644 --- a/www/iridium/files/patch-base_functional_unretained__traits.h +++ b/www/iridium/files/patch-base_functional_unretained__traits.h @@ -1,6 +1,6 @@ ---- base/functional/unretained_traits.h.orig 2024-06-25 12:08:48 UTC +--- base/functional/unretained_traits.h.orig 2025-02-22 18:06:53 UTC +++ base/functional/unretained_traits.h -@@ -93,7 +93,7 @@ struct SupportsUnretainedImpl { +@@ -90,7 +90,7 @@ struct SupportsUnretainedImpl { // official builds, and then in non-test code as well. #if defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS) || \ (!defined(UNIT_TEST) && !defined(OFFICIAL_BUILD) && \ diff --git a/www/iridium/files/patch-base_linux__util.cc b/www/iridium/files/patch-base_linux__util.cc index bab19f9fc248..5058282a0b9e 100644 --- a/www/iridium/files/patch-base_linux__util.cc +++ b/www/iridium/files/patch-base_linux__util.cc @@ -1,13 +1,13 @@ ---- base/linux_util.cc.orig 2024-06-25 12:08:48 UTC +--- base/linux_util.cc.orig 2025-02-22 18:06:53 UTC +++ base/linux_util.cc -@@ -154,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) { +@@ -159,10 +159,14 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { +#if BUILDFLAG(IS_BSD) + return false; +#else - // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 + // 25 > strlen("/proc//task") + strlen(base::NumberToString(INT_MAX)) + 1 = 22 char buf[25]; strings::SafeSPrintf(buf, "/proc/%d/task", pid); return GetThreadsFromProcessDir(buf, tids); diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc index 857d3c21cc6a..53c1f6fdeb27 100644 --- a/www/iridium/files/patch-base_logging__unittest.cc +++ b/www/iridium/files/patch-base_logging__unittest.cc @@ -1,4 +1,4 @@ ---- base/logging_unittest.cc.orig 2024-12-22 12:24:29 UTC +--- base/logging_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/logging_unittest.cc @@ -41,7 +41,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -585,14 +585,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -589,14 +589,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_discardable__memory.cc b/www/iridium/files/patch-base_memory_discardable__memory.cc index 4705d9f313a6..1a267e210ca3 100644 --- a/www/iridium/files/patch-base_memory_discardable__memory.cc +++ b/www/iridium/files/patch-base_memory_discardable__memory.cc @@ -1,4 +1,4 @@ ---- base/memory/discardable_memory.cc.orig 2024-11-04 08:56:03 UTC +--- base/memory/discardable_memory.cc.orig 2025-02-22 18:06:53 UTC +++ base/memory/discardable_memory.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -39,7 +39,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, +@@ -38,7 +38,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -58,7 +58,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -57,7 +57,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -88,7 +88,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -89,7 +89,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { 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 c0097403e3f0..fa2df95630a3 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 2024-11-04 08:56:03 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -310,6 +310,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -305,6 +305,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,8 +11,8 @@ #if BUILDFLAG(IS_APPLE) std::vector<char> vec(allocated_pages_); #else -@@ -325,6 +329,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons - return false; +@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons + } } return true; +#endif 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 04371b430d70..db503465598b 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,6 +1,6 @@ ---- base/memory/platform_shared_memory_region.h.orig 2024-06-25 12:08:48 UTC +--- base/memory/platform_shared_memory_region.h.orig 2025-02-22 18:06:53 UTC +++ base/memory/platform_shared_memory_region.h -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "base/unguessable_token.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ namespace content { class SandboxIPCHandler; } -@@ -84,7 +84,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -85,7 +85,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: -@@ -216,7 +216,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -217,7 +217,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 9be8fe7bf885..ac1b12bc6dde 100644 --- a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2023-03-13 07:33:08 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { +@@ -56,7 +56,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { } // namespace @@ -9,7 +9,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -168,7 +168,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { +@@ -176,7 +176,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -197,7 +197,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -205,7 +205,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/iridium/files/patch-base_memory_protected__memory.h b/www/iridium/files/patch-base_memory_protected__memory.h index dce786fedae3..95b4fc65f22f 100644 --- a/www/iridium/files/patch-base_memory_protected__memory.h +++ b/www/iridium/files/patch-base_memory_protected__memory.h @@ -1,6 +1,6 @@ ---- base/memory/protected_memory.h.orig 2024-11-04 08:56:03 UTC +--- base/memory/protected_memory.h.orig 2025-02-22 18:06:53 UTC +++ base/memory/protected_memory.h -@@ -119,12 +119,12 @@ __declspec(selectany) char __stop_protected_memory; +@@ -120,12 +120,12 @@ __declspec(selectany) char __stop_protected_memory; #define DECLARE_PROTECTED_DATA constinit #define DEFINE_PROTECTED_DATA constinit __declspec(allocate("prot$mem")) @@ -15,7 +15,7 @@ // arm64 supports 4kb, 16kb, and 64kb pages. Set to the largest of 64kb as that // will guarantee the section is page aligned regardless of the choice. inline constexpr int kProtectedMemoryAlignment = 65536; -@@ -339,7 +339,7 @@ class BASE_EXPORT AutoWritableMemoryBase { +@@ -340,7 +340,7 @@ class BASE_EXPORT AutoWritableMemoryBase { // where an attacker could overwrite it with a large value and invoke code // that constructs and destructs an AutoWritableMemory. After such a call // protected memory would still be set writable because writers > 0. @@ -24,7 +24,7 @@ // On Linux, the protected memory section is not automatically page aligned. // This means that attempts to reset the protected memory region to readonly // will set some of the preceding section that is on the same page readonly -@@ -353,7 +353,7 @@ class BASE_EXPORT AutoWritableMemoryBase { +@@ -354,7 +354,7 @@ class BASE_EXPORT AutoWritableMemoryBase { #endif static inline size_t writers GUARDED_BY(writers_lock()) = 0; @@ -33,7 +33,7 @@ // On Linux, there is no guarantee the section following the protected // memory section is page aligned. This can result in attempts to change // the access permissions of the end of the protected memory section -@@ -411,7 +411,7 @@ class BASE_EXPORT AutoWritableMemoryInitializer +@@ -412,7 +412,7 @@ class BASE_EXPORT AutoWritableMemoryInitializer // the variable to something large before the section was read-only. WriterData::writers = 0; CHECK(SetProtectedSectionReadOnly()); diff --git a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc index d200475045cc..90dc05509fbc 100644 --- a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- base/message_loop/message_pump_glib.cc.orig 2022-10-05 07:34:01 UTC +--- base/message_loop/message_pump_glib.cc.orig 2025-02-22 18:06:53 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" -@@ -51,9 +56,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti +@@ -52,9 +57,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti } bool RunningOnMainThread() { 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 0e84bc17992c..4d155e9f0729 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 2024-06-25 12:08:48 UTC +--- base/posix/unix_domain_socket.cc.orig 2025-02-22 18:06:53 UTC +++ base/posix/unix_domain_socket.cc -@@ -56,7 +56,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { +@@ -47,7 +47,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -9,7 +9,7 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else -@@ -82,7 +82,7 @@ bool UnixDomainSocket::SendMsg(int fd, +@@ -73,7 +73,7 @@ bool UnixDomainSocket::SendMsg(int fd, struct cmsghdr* cmsg; msg.msg_control = control_buffer; @@ -18,7 +18,7 @@ msg.msg_controllen = checked_cast<socklen_t>(control_len); #else msg.msg_controllen = control_len; -@@ -90,7 +90,7 @@ bool UnixDomainSocket::SendMsg(int fd, +@@ -81,7 +81,7 @@ bool UnixDomainSocket::SendMsg(int fd, cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; @@ -27,7 +27,7 @@ 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, +@@ -133,7 +133,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) @@ -36,7 +36,7 @@ // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) -@@ -182,7 +182,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -162,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } @@ -45,10 +45,10 @@ // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { -@@ -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) +@@ -199,6 +199,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, + if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) { pid = -1; + } +#elif BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); + pid = -1; diff --git a/www/iridium/files/patch-base_process_internal__linux.h b/www/iridium/files/patch-base_process_internal__linux.h index c6c8df6c62b7..a9eabfd98d6c 100644 --- a/www/iridium/files/patch-base_process_internal__linux.h +++ b/www/iridium/files/patch-base_process_internal__linux.h @@ -1,6 +1,6 @@ ---- base/process/internal_linux.h.orig 2024-06-25 12:08:48 UTC +--- base/process/internal_linux.h.orig 2025-02-22 18:06:53 UTC +++ base/process/internal_linux.h -@@ -140,6 +140,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); +@@ -139,6 +139,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks); // arguments to the lambda. template <typename Lambda> void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) { @@ -10,7 +10,7 @@ // 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 +@@ -161,6 +164,7 @@ void ForEachProcessTask(base::ProcessHandle process, L FilePath task_path = fd_path.Append(tid_str); lambda(tid, task_path); } diff --git a/www/iridium/files/patch-base_process_kill.h b/www/iridium/files/patch-base_process_kill.h index 7f96c47919dd..6df840728a0c 100644 --- a/www/iridium/files/patch-base_process_kill.h +++ b/www/iridium/files/patch-base_process_kill.h @@ -1,8 +1,8 @@ ---- base/process/kill.h.orig 2024-06-25 12:08:48 UTC +--- base/process/kill.h.orig 2025-02-22 18:06:53 UTC +++ base/process/kill.h @@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro - BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( - ProcessHandle handle, int* exit_code); + BASE_EXPORT TerminationStatus + GetKnownDeadTerminationStatus(ProcessHandle handle, int* exit_code); -#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_process_kill__posix.cc b/www/iridium/files/patch-base_process_kill__posix.cc index b3f9c84db283..4a22d02d5514 100644 --- a/www/iridium/files/patch-base_process_kill__posix.cc +++ b/www/iridium/files/patch-base_process_kill__posix.cc @@ -1,6 +1,6 @@ ---- base/process/kill_posix.cc.orig 2023-04-22 17:45:15 UTC +--- base/process/kill_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/kill_posix.cc -@@ -157,7 +157,7 @@ void EnsureProcessTerminated(Process process) { +@@ -161,7 +161,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), Seconds(2))); } diff --git a/www/iridium/files/patch-base_process_memory__linux.cc b/www/iridium/files/patch-base_process_memory__linux.cc index 62745a8085f0..49f360844638 100644 --- a/www/iridium/files/patch-base_process_memory__linux.cc +++ b/www/iridium/files/patch-base_process_memory__linux.cc @@ -1,4 +1,4 @@ ---- base/process/memory_linux.cc.orig 2024-08-01 05:47:53 UTC +--- base/process/memory_linux.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/memory_linux.cc @@ -28,6 +28,7 @@ void __libc_free(void*); @@ -8,7 +8,7 @@ namespace { void ReleaseReservationOrTerminate() { -@@ -37,12 +38,14 @@ void ReleaseReservationOrTerminate() { +@@ -38,12 +39,14 @@ void ReleaseReservationOrTerminate() { } } // namespace @@ -23,7 +23,7 @@ // Set the new-out of memory handler. std::set_new_handler(&ReleaseReservationOrTerminate); // If we're using glibc's allocator, the above functions will override -@@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() { +@@ -52,8 +55,10 @@ void EnableTerminationOnOutOfMemory() { #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM) allocator_shim::SetCallNewHandlerOnMallocFailure(true); #endif @@ -34,7 +34,7 @@ // 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 -@@ -110,6 +115,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr +@@ -111,6 +116,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr bool AdjustOOMScore(ProcessId process, int score) { return AdjustOOMScoreHelper::AdjustOOMScore(process, score); } 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 8c2714f8da10..e36d6eb2b785 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 2024-06-25 12:08:48 UTC +--- base/process/process_handle_freebsd.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_handle_freebsd.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. @@ -14,12 +14,12 @@ struct kinfo_proc info; - size_t length; + size_t length = sizeof(struct kinfo_proc); - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; + int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process}; - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { + return -1; + + if (length < sizeof(struct kinfo_proc)) return -1; + } - return info.ki_ppid; 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 6e18bf7dc366..bf69ded34de8 100644 --- a/www/iridium/files/patch-base_process_process__handle__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__openbsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_handle_openbsd.cc.orig 2024-06-25 12:08:48 UTC +--- base/process/process_handle_openbsd.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_handle_openbsd.cc -@@ -3,48 +3,112 @@ +@@ -3,17 +3,25 @@ // found in the LICENSE file. #include "base/process/process_handle.h" @@ -24,25 +24,26 @@ + struct kinfo_proc *info; size_t length; + pid_t ppid; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, - sizeof(struct kinfo_proc), 0 }; - - if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) + int mib[] = { + CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), + 0}; +@@ -22,37 +30,87 @@ ProcessId GetParentProcessId(ProcessHandle process) { return -1; + } - mib[5] = (length / sizeof(struct kinfo_proc)); + info = (struct kinfo_proc *)malloc(length); -- if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) +- 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: @@ -58,24 +59,17 @@ + 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 }; +- 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) -- return FilePath(); -- mib[5] = (len / sizeof(struct kinfo_proc)); -- if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) { - return FilePath(); -- if ((kp.p_flag & P_SYSTEM) != 0) -- 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(); ++ + if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) + result = FilePath(cpath); + else @@ -125,8 +119,19 @@ + result = FilePath(retval); + } + } -+ } -+ + } +- mib[5] = (len / sizeof(struct kinfo_proc)); +- if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) { +- return FilePath(); +- } +- if ((kp.p_flag & P_SYSTEM) != 0) { +- return FilePath(); +- } +- if (strcmp(kp.p_comm, "chrome") == 0) { +- return FilePath(kp.p_comm); +- } + +- return FilePath(); + return result; } diff --git a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc index 2e9ddf581754..02fbc03ecd11 100644 --- a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,11 +1,11 @@ ---- base/process/process_iterator_freebsd.cc.orig 2023-04-22 17:45:15 UTC +--- base/process/process_iterator_freebsd.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_iterator_freebsd.cc @@ -18,7 +18,7 @@ namespace base { ProcessIterator::ProcessIterator(const ProcessFilter* filter) : filter_(filter) { -- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid() }; -+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid() }; +- int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid()}; ++ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid()}; bool done = false; int try_num = 1; @@ -23,19 +23,20 @@ } else { // Got the list, just make sure we're sized exactly right - size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc); -+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); ++ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); kinfo_procs_.resize(num_of_kinfo_proc); done = true; } -@@ -68,18 +68,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -68,19 +68,14 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; -- int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid }; +- int mib[] = {CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid}; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid }; - if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) + if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) { continue; + } - length = 0; - if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) { diff --git a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc index 43f7355a6c60..4ef76a12970f 100644 --- a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_openbsd.cc.orig 2023-04-22 17:45:15 UTC +--- base/process/process_iterator_openbsd.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_iterator_openbsd.cc @@ -6,6 +6,9 @@ @@ -10,13 +10,14 @@ #include <sys/sysctl.h> #include "base/logging.h" -@@ -16,12 +19,13 @@ namespace base { - +@@ -17,12 +20,13 @@ namespace base { ProcessIterator::ProcessIterator(const ProcessFilter* filter) : filter_(filter) { -- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(), -+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()), - sizeof(struct kinfo_proc), 0 }; + int mib[] = { +- CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), +- 0}; ++ CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()), ++ sizeof(struct kinfo_proc), 0 }; bool done = false; int try_num = 1; @@ -25,7 +26,7 @@ do { size_t len = 0; -@@ -30,7 +34,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -31,7 +35,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* kinfo_procs_.resize(0); done = true; } else { @@ -34,7 +35,7 @@ // Leave some spare room for process table growth (more could show up // between when we check and now) num_of_kinfo_proc += 16; -@@ -46,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -47,7 +51,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index 627ac996b1a4..abf9aa35b023 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 2024-06-25 12:08:48 UTC +--- base/process/process_metrics.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -35,7 +35,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -129,10 +128,9 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() { +@@ -130,10 +129,9 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() { return GetPlatformIndependentCPUUsage(cpu_usage); }); } diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h index abfb122391c9..e7ae6eb98d60 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-11-04 08:56:03 UTC +--- base/process/process_metrics.h.orig 2025-02-22 18:06:53 UTC +++ base/process/process_metrics.h -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ #include <string> #include <utility> #include <vector> -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ namespace base { @@ -18,16 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -113,7 +113,7 @@ class BASE_EXPORT ProcessMetrics { - // convenience wrapper for CreateProcessMetrics(). - static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Resident Set Size is a Linux/Android specific memory concept. Do not - // attempt to extend this to other platforms. - BASE_EXPORT size_t GetResidentSetSize() const; -@@ -147,7 +147,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -179,7 +179,7 @@ class BASE_EXPORT ProcessMetrics { base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -36,16 +27,16 @@ // 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 -@@ -192,7 +192,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -224,7 +224,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Bytes of swap as reported by /proc/[pid]/status. - uint64_t GetVmSwapBytes() const; - -@@ -213,7 +213,7 @@ class BASE_EXPORT ProcessMetrics { + // Minor and major page fault count as reported by /proc/[pid]/stat. + // Returns true for success. + bool GetPageFaultCounts(PageFaultCounts* counts) const; +@@ -242,7 +242,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +45,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -235,12 +235,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -264,12 +264,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_; @@ -68,7 +59,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -281,7 +279,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -310,7 +308,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) || \ @@ -77,7 +68,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -316,7 +314,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -345,7 +343,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -86,7 +77,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 -@@ -331,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -360,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -95,7 +86,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -368,7 +366,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -397,7 +395,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -104,7 +95,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. -@@ -563,7 +561,7 @@ class BASE_EXPORT SystemMetrics { +@@ -591,7 +589,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 d441d5f56619..9019ee249616 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 2024-11-04 08:56:03 UTC +--- base/process/process_metrics_freebsd.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,43 +3,58 @@ +@@ -3,41 +3,92 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -26,8 +26,7 @@ + int pageshift = 0; -ProcessMetrics::ProcessMetrics(ProcessHandle process) -- : process_(process), -- last_cpu_(0) {} +- : process_(process), last_cpu_(0) {} + while (pagesize > 1) { + pageshift++; + pagesize >>= 1; @@ -47,36 +46,68 @@ -base::expected<double, ProcessCPUUsageError> -ProcessMetrics::GetPlatformIndependentCPUUsage() { -+base::expected<TimeDelta, ProcessCPUUsageError> -+ProcessMetrics::GetCumulativeCPUUsage() { - struct kinfo_proc info; +- struct kinfo_proc info; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; - size_t length = sizeof(info); -+ size_t length = sizeof(struct kinfo_proc); -+ struct timeval tv; ++base::expected<ProcessMemoryInfo, ProcessUsageError> ++ProcessMetrics::GetMemoryInfo() const { ++ ProcessMemoryInfo memory_info; ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ struct kinfo_proc *pp; ++ int nproc; -+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; -+ - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { - return base::unexpected(ProcessCPUUsageError::kSystemError); -+ return base::ok(TimeDelta()); ++ if (kd == nullptr) { ++ return base::unexpected(ProcessUsageError::kSystemError); + } - return base::ok(double{info.ki_pctcpu} / FSCALE * 100.0); -+ return base::ok(Microseconds(info.ki_runtime)); ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return base::unexpected(ProcessUsageError::kProcessNotFound); ++ } ++ ++ if (nproc > 0) { ++ memory_info.resident_set_bytes = pp->ki_rssize << GetPageShift(); ++ } else { ++ kvm_close(kd); ++ return base::unexpected(ProcessUsageError::kProcessNotFound); ++ } ++ ++ kvm_close(kd); ++ return memory_info; } --base::expected<TimeDelta, ProcessCPUUsageError> --ProcessMetrics::GetCumulativeCPUUsage() { + base::expected<TimeDelta, ProcessCPUUsageError> + ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); --} -- ++ struct kinfo_proc info; ++ size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; ++ ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; ++ ++ if (process_ == 0) { ++ return base::unexpected(ProcessCPUUsageError::kSystemError); ++ } ++ ++ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { ++ return base::unexpected(ProcessCPUUsageError::kSystemError); ++ } ++ ++ if (length == 0) { ++ return base::unexpected(ProcessCPUUsageError::kProcessNotFound); ++ } ++ ++ return base::ok(Microseconds(info.ki_runtime)); + } + size_t GetSystemCommitCharge() { - int mib[2], pagesize; - unsigned long mem_total, mem_free, mem_inactive; -@@ -61,6 +76,230 @@ size_t GetSystemCommitCharge() { +@@ -64,6 +115,176 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); - return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); + return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize); +} + +int64_t GetNumberOfThreads(ProcessHandle process) { @@ -159,60 +190,6 @@ + return total_count; +} + -+size_t ProcessMetrics::GetResidentSetSize() const { -+ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); -+ -+ if (kd == nullptr) -+ return 0; -+ -+ struct kinfo_proc *pp; -+ int nproc; -+ -+ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { -+ kvm_close(kd); -+ return 0; -+ } -+ -+ size_t rss; -+ -+ if (nproc > 0) { -+ rss = pp->ki_rssize << GetPageShift(); -+ } else { -+ rss = 0; -+ } -+ -+ kvm_close(kd); -+ return rss; -+} -+ -+uint64_t ProcessMetrics::GetVmSwapBytes() const { -+ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); -+ -+ if (kd == nullptr) -+ return 0; -+ -+ struct kinfo_proc *pp; -+ int nproc; -+ -+ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { -+ kvm_close(kd); -+ return 0; -+ } -+ -+ size_t swrss; -+ -+ if (nproc > 0) { -+ swrss = pp->ki_swrss > pp->ki_rssize -+ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift() -+ : 0; -+ } else { -+ swrss = 0; -+ } -+ -+ kvm_close(kd); -+ return swrss; -+} -+ +int ProcessMetrics::GetIdleWakeupsPerSecond() { + NOTIMPLEMENTED(); + return 0; 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 66c9ae0670df..c2288de879d9 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 2024-11-04 08:56:03 UTC +--- base/process/process_metrics_openbsd.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_metrics_openbsd.cc -@@ -6,74 +6,50 @@ +@@ -6,73 +6,85 @@ #include <stddef.h> #include <stdint.h> @@ -22,85 +22,114 @@ +ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {} -base::expected<int, ProcessCPUUsageError> GetProcessCPU(pid_t pid) { -+base::expected<TimeDelta, ProcessCPUUsageError> -+ProcessMetrics::GetCumulativeCPUUsage() { ++base::expected<ProcessMemoryInfo, ProcessUsageError> ++ProcessMetrics::GetMemoryInfo() const { ++ ProcessMemoryInfo memory_info; struct kinfo_proc info; - size_t length; -- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, -- sizeof(struct kinfo_proc), 0 }; +- int mib[] = { +- CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, sizeof(struct kinfo_proc), 0}; + size_t length = sizeof(struct kinfo_proc); -+ struct timeval tv; - 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 }; ++ ++ if (process_ == 0) { ++ return base::unexpected(ProcessUsageError::kSystemError); + } - mib[5] = (length / sizeof(struct kinfo_proc)); - if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { - return base::unexpected(ProcessCPUUsageError::kSystemError); +- return base::unexpected(ProcessCPUUsageError::kSystemError); ++ return base::unexpected(ProcessUsageError::kSystemError); } - 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))); - } +-} ++ if (length == 0) { ++ return base::unexpected(ProcessUsageError::kProcessNotFound); ++ } -} // namespace -- - // static - std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( - ProcessHandle process) { - return WrapUnique(new ProcessMetrics(process)); ++ memory_info.resident_set_bytes = ++ checked_cast<uint64_t>(info.p_vm_rssize * getpagesize()); + +-// static +-std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( +- ProcessHandle process) { +- return WrapUnique(new ProcessMetrics(process)); ++ return memory_info; } -base::expected<double, ProcessCPUUsageError> -ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); -- ++base::expected<TimeDelta, ProcessCPUUsageError> ++ProcessMetrics::GetCumulativeCPUUsage() { ++ struct kinfo_proc info; ++ size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; + - if (last_cpu_time_.is_zero()) { - // First call, just set the last values. - last_cpu_time_ = time; - return base::ok(0.0); -- } -- ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, ++ sizeof(struct kinfo_proc), 1 }; ++ ++ if (process_ == 0) { ++ return base::unexpected(ProcessCPUUsageError::kSystemError); + } + - const base::expected<int, ProcessCPUUsageError> cpu = GetProcessCPU(process_); - if (!cpu.has_value()) { - return base::unexpected(cpu.error()); -- } -- ++ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) { ++ return base::unexpected(ProcessCPUUsageError::kSystemError); + } + - last_cpu_time_ = time; - return base::ok(double{cpu.value()} / FSCALE * 100.0); --} -- ++ if (length == 0) { ++ return base::unexpected(ProcessCPUUsageError::kProcessNotFound); ++ } ++ ++ tv.tv_sec = info.p_rtime_sec; ++ tv.tv_usec = info.p_rtime_usec; ++ ++ return base::ok(Microseconds(TimeValToMicroseconds(tv))); + } + -base::expected<TimeDelta, ProcessCPUUsageError> -ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); --} -- ++// static ++std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( ++ ProcessHandle process) { ++ return WrapUnique(new ProcessMetrics(process)); + } + -ProcessMetrics::ProcessMetrics(ProcessHandle process) -- : process_(process), -- last_cpu_(0) {} +- : process_(process), last_cpu_(0) {} - size_t GetSystemCommitCharge() { - int mib[] = { CTL_VM, VM_METER }; + int mib[] = {CTL_VM, VM_METER}; - int pagesize; + size_t pagesize; struct vmtotal vmtotal; unsigned long mem_total, mem_free, mem_inactive; size_t len = sizeof(vmtotal); -@@ -85,9 +61,136 @@ size_t GetSystemCommitCharge() { +@@ -85,9 +97,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); + return mem_total - (mem_free * pagesize) - (mem_inactive * pagesize); +} + +int ProcessMetrics::GetOpenFdCount() const { @@ -112,11 +141,11 @@ + + if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL) + goto out; -+ -+ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process_, ++ ++ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process_, + sizeof(struct kinfo_file), &total_count)) == NULL) { -+ total_count = 0; -+ goto out; ++ total_count = 0; ++ goto out; + } + + kvm_close(kd); @@ -132,9 +161,9 @@ +// return GetMaxFds(); +} + -+uint64_t ProcessMetrics::GetVmSwapBytes() const { ++bool ProcessMetrics::GetPageFaultCounts(PageFaultCounts* counts) const { + NOTIMPLEMENTED(); -+ return 0; ++ return false; +} + +bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) { @@ -164,14 +193,14 @@ + res.Set("available", available); + res.Set("buffers", buffers); + res.Set("cached", cached); -+ res.Set("active_anon", active_anon); ++ res.Set("active_anon", active_anon); + res.Set("inactive_anon", inactive_anon); + res.Set("active_file", active_file); + res.Set("inactive_file", inactive_file); + res.Set("swap_total", swap_total); + res.Set("swap_free", swap_free); + res.Set("swap_used", swap_total - swap_free); -+ res.Set("dirty", dirty); ++ res.Set("dirty", dirty); + res.Set("reclaimable", reclaimable); + + NOTIMPLEMENTED(); @@ -188,7 +217,7 @@ + NOTIMPLEMENTED(); + + return res; -+} ++} + +SystemDiskInfo::SystemDiskInfo() { + reads = 0; @@ -210,7 +239,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)); diff --git a/www/iridium/files/patch-base_process_process__metrics__posix.cc b/www/iridium/files/patch-base_process_process__metrics__posix.cc index e8d8812b6afd..7f084e488eed 100644 --- a/www/iridium/files/patch-base_process_process__metrics__posix.cc +++ b/www/iridium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2023-07-24 14:27:53 UTC +--- base/process/process_metrics_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_metrics_posix.cc @@ -21,6 +21,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -134,7 +136,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -136,7 +138,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); diff --git a/www/iridium/files/patch-base_process_process__metrics__unittest.cc b/www/iridium/files/patch-base_process_process__metrics__unittest.cc index 3036e74ca962..efb65e4df657 100644 --- a/www/iridium/files/patch-base_process_process__metrics__unittest.cc +++ b/www/iridium/files/patch-base_process_process__metrics__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_unittest.cc.orig 2024-06-25 12:08:48 UTC +--- base/process/process_metrics_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_metrics_unittest.cc -@@ -62,7 +62,8 @@ +@@ -58,7 +58,8 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-base_process_process__posix.cc b/www/iridium/files/patch-base_process_process__posix.cc index 546b12e97a40..95e824f4ad62 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 2024-06-25 12:08:48 UTC +--- base/process/process_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_posix.cc @@ -23,10 +23,15 @@ #include "base/trace_event/base_tracing.h" @@ -17,7 +17,7 @@ #if BUILDFLAG(CLANG_PROFILING) #include "base/test/clang_profiling.h" #endif -@@ -99,7 +104,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, +@@ -100,7 +105,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, } #endif @@ -26,7 +26,7 @@ // Using kqueue on Mac so that we can wait on non-child processes. // We can't use kqueues on child processes because we need to reap // our own children using wait. -@@ -376,7 +381,7 @@ bool Process::WaitForExitWithTimeoutImpl(base::Process +@@ -379,7 +384,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 -@@ -413,7 +418,56 @@ void Process::Exited(int exit_code) const { +@@ -416,7 +421,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 5aa682a621c2..79fa086eff61 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 2024-11-04 08:56:03 UTC +--- base/process/process_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/process/process_unittest.cc -@@ -203,7 +203,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -202,7 +202,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_stack__base__address__posix.cc b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc index 2907c038f053..c5210eab14ab 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 2024-06-25 12:08:48 UTC +--- base/profiler/stack_base_address_posix.cc.orig 2025-02-22 18:06:53 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 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase +@@ -47,7 +51,21 @@ std::optional<uintptr_t> GetAndroidMainThreadStackBase #if !BUILDFLAG(IS_LINUX) uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { @@ -33,7 +33,7 @@ // pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox // and pthread_id refers to a different thread, due to the use of // sched_getaffinity(). -@@ -58,12 +76,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr +@@ -60,12 +78,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr << logging::SystemErrorCodeToString(result); // See crbug.com/617730 for limitations of this approach on Linux-like // systems. @@ -48,7 +48,7 @@ const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; return base_address; } -@@ -80,7 +100,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla +@@ -82,7 +102,7 @@ std::optional<uintptr_t> GetThreadStackBaseAddress(Pla // trying to work around the problem. return std::nullopt; #else 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 cc6323c1e7f9..f682e5becc7d 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 2024-06-25 12:08:48 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2025-02-22 18:06:53 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -42,7 +42,7 @@ +@@ -46,7 +46,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 1f3f9f622e36..45e2cceabac1 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,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-08-27 06:28:16 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ #include <intrin.h> #include <malloc.h> diff --git a/www/iridium/files/patch-base_rand__util.h b/www/iridium/files/patch-base_rand__util.h index 864efef0a114..1817296f1124 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-06-25 12:08:48 UTC +--- base/rand_util.h.orig 2025-02-22 18:06:53 UTC +++ base/rand_util.h -@@ -147,7 +147,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -141,7 +141,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 f5fb22be7d0f..c89e00f98194 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 2024-11-04 08:56:03 UTC +--- base/rand_util_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/rand_util_posix.cc -@@ -28,7 +28,7 @@ +@@ -23,7 +23,7 @@ #include "base/time/time.h" #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. -@@ -44,6 +44,7 @@ namespace base { +@@ -39,6 +39,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; -@@ -68,10 +69,11 @@ class URandomFd { +@@ -63,10 +64,11 @@ class URandomFd { private: const int fd_; }; @@ -30,7 +30,7 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() { +@@ -151,6 +153,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { @@ -38,7 +38,7 @@ #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -213,6 +216,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi +@@ -185,6 +188,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); @@ -48,7 +48,7 @@ } } // namespace -@@ -232,9 +238,11 @@ void RandBytes(span<uint8_t> output) { +@@ -204,9 +210,11 @@ void RandBytes(span<uint8_t> output) { RandBytesInternal(output, /*avoid_allocation=*/false); } 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 e9e3ad133bce..5d6f3698d912 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 2024-06-25 12:08:48 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -740,6 +740,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -744,6 +744,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { #endif } @@ -8,7 +8,7 @@ TEST(SafeSPrintfTest, EmitNULL) { char buf[40]; #if defined(__GNUC__) -@@ -756,6 +757,7 @@ TEST(SafeSPrintfTest, EmitNULL) { +@@ -760,6 +761,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/iridium/files/patch-base_synchronization_cancelable__event.h b/www/iridium/files/patch-base_synchronization_cancelable__event.h new file mode 100644 index 000000000000..35874fbb7549 --- /dev/null +++ b/www/iridium/files/patch-base_synchronization_cancelable__event.h @@ -0,0 +1,20 @@ +--- base/synchronization/cancelable_event.h.orig 2025-02-22 18:06:53 UTC ++++ base/synchronization/cancelable_event.h +@@ -11,7 +11,7 @@ + + #if BUILDFLAG(IS_WIN) + #include <windows.h> +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <semaphore.h> + #else + #include "base/synchronization/waitable_event.h" +@@ -49,7 +49,7 @@ class BASE_EXPORT CancelableEvent { + + #if BUILDFLAG(IS_WIN) + using NativeHandle = HANDLE; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + using NativeHandle = sem_t; + #else + using NativeHandle = WaitableEvent; diff --git a/www/iridium/files/patch-base_syslog__logging.cc b/www/iridium/files/patch-base_syslog__logging.cc index 93f9f649cb10..7b5f1320860f 100644 --- a/www/iridium/files/patch-base_syslog__logging.cc +++ b/www/iridium/files/patch-base_syslog__logging.cc @@ -1,4 +1,4 @@ ---- base/syslog_logging.cc.orig 2024-06-25 12:08:48 UTC +--- base/syslog_logging.cc.orig 2025-02-22 18:06:53 UTC +++ base/syslog_logging.cc @@ -17,7 +17,7 @@ #include "base/strings/string_util.h" @@ -9,10 +9,10 @@ // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include <syslog.h> -@@ -149,7 +149,7 @@ EventLogMessage::~EventLogMessage() { - - if (user_sid != nullptr) +@@ -151,7 +151,7 @@ EventLogMessage::~EventLogMessage() { + if (user_sid != nullptr) { ::LocalFree(user_sid); + } -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kEventSource[] = "chrome"; diff --git a/www/iridium/files/patch-base_system_sys__info.cc b/www/iridium/files/patch-base_system_sys__info.cc index 85fcf8a6c9cd..ed68b99c0241 100644 --- a/www/iridium/files/patch-base_system_sys__info.cc +++ b/www/iridium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2024-12-22 12:24:29 UTC +--- base/system/sys_info.cc.orig 2025-02-22 18:06:53 UTC +++ base/system/sys_info.cc -@@ -229,7 +229,7 @@ std::string SysInfo::SocManufacturer() { +@@ -231,7 +231,7 @@ std::string SysInfo::SocManufacturer() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { 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 0414e7876333..2d64568fbc18 100644 --- a/www/iridium/files/patch-base_system_sys__info__openbsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__openbsd.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_openbsd.cc.orig 2024-11-04 08:56:03 UTC +--- base/system/sys_info_openbsd.cc.orig 2025-02-22 18:06:53 UTC +++ base/system/sys_info_openbsd.cc @@ -12,6 +12,7 @@ @@ -8,7 +8,7 @@ namespace { -@@ -27,9 +28,14 @@ uint64_t AmountOfMemory(int pages_name) { +@@ -28,9 +29,14 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { @@ -24,7 +24,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -40,10 +46,26 @@ int SysInfo::NumberOfProcessors() { +@@ -41,10 +47,26 @@ int SysInfo::NumberOfProcessors() { // static uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -52,7 +52,7 @@ uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { // We should add inactive file-backed memory also but there is no such // information from OpenBSD unfortunately. -@@ -55,15 +77,27 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -56,15 +78,27 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index 97020c3f2cb4..836089c2bb06 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-11-04 08:56:03 UTC +--- base/system/sys_info_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/system/sys_info_posix.cc -@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -119,7 +119,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -9,7 +9,7 @@ // static int SysInfo::NumberOfProcessors() { #if BUILDFLAG(IS_MAC) -@@ -173,7 +173,7 @@ int SysInfo::NumberOfProcessors() { +@@ -175,7 +175,7 @@ int SysInfo::NumberOfProcessors() { return cached_num_cpus; } @@ -18,7 +18,7 @@ // static uint64_t SysInfo::AmountOfVirtualMemory() { -@@ -256,6 +256,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -263,6 +263,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc index b8f261c47475..447c620bdb00 100644 --- a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,4 +1,4 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2022-10-05 07:34:01 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/task/thread_pool/environment_config_unittest.cc @@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) @@ -9,3 +9,12 @@ EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread()); #else #error Platform doesn't match any block +@@ -24,7 +24,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) + EXPECT_TRUE(CanUseUtilityThreadTypeForWorkerThread()); + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + EXPECT_FALSE(CanUseUtilityThreadTypeForWorkerThread()); + #else + #error Platform doesn't match any block 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 c1e93d8baf8a..0a462ee9b2de 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 2024-06-25 12:08:48 UTC +--- base/test/launcher/test_launcher.cc.orig 2025-02-22 18:06:53 UTC +++ base/test/launcher/test_launcher.cc -@@ -74,6 +74,7 @@ +@@ -75,6 +75,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/iridium/files/patch-base_test_test__file__util__linux.cc b/www/iridium/files/patch-base_test_test__file__util__linux.cc index ea53eb10ca5d..6c2e8b21eee1 100644 --- a/www/iridium/files/patch-base_test_test__file__util__linux.cc +++ b/www/iridium/files/patch-base_test_test__file__util__linux.cc @@ -1,12 +1,13 @@ ---- base/test/test_file_util_linux.cc.orig 2023-10-21 11:51:27 UTC +--- base/test/test_file_util_linux.cc.orig 2025-02-22 18:06:53 UTC +++ base/test/test_file_util_linux.cc -@@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const FilePath& file) { - return false; - if (fdatasync(fd.get()) != 0) +@@ -56,9 +56,11 @@ bool EvictFileFromSystemCache(const FilePath& file) { + if (fdatasync(fd.get()) != 0) { return false; + } +#if !BUILDFLAG(IS_BSD) - if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) + if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) { return false; + } +#endif return true; } 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 3de0bce58e6d..442bc8867f06 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 2024-06-25 12:08:48 UTC +--- base/test/test_file_util_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/test/test_file_util_posix.cc -@@ -91,7 +91,7 @@ void SyncPageCacheToDisk() { +@@ -93,7 +93,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 deleted file mode 100644 index ec5e9032ad20..000000000000 --- a/www/iridium/files/patch-base_threading_hang__watcher.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/threading/hang_watcher.cc.orig 2024-12-22 12:24:29 UTC -+++ base/threading/hang_watcher.cc -@@ -352,7 +352,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p - - bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) - if (is_zygote_child) { - enable_hang_watcher = - enable_hang_watcher && diff --git a/www/iridium/files/patch-base_threading_platform__thread.h b/www/iridium/files/patch-base_threading_platform__thread.h index dd0f5e9a2423..63d415bc7a99 100644 --- a/www/iridium/files/patch-base_threading_platform__thread.h +++ b/www/iridium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2024-06-25 12:08:48 UTC +--- base/threading/platform_thread.h.orig 2025-02-22 18:06:53 UTC +++ base/threading/platform_thread.h -@@ -49,6 +49,8 @@ typedef DWORD PlatformThreadId; +@@ -48,6 +48,8 @@ typedef DWORD PlatformThreadId; typedef zx_koid_t PlatformThreadId; #elif BUILDFLAG(IS_APPLE) typedef mach_port_t PlatformThreadId; 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 97b5e71e3caa..45409b0dab07 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 2024-11-04 08:56:03 UTC +--- base/threading/platform_thread_internal_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/threading/platform_thread_internal_posix.cc -@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest +@@ -43,7 +43,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 e017242243d8..956005ab6172 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__posix.cc @@ -1,8 +1,8 @@ ---- base/threading/platform_thread_posix.cc.orig 2024-06-25 12:08:48 UTC +--- base/threading/platform_thread_posix.cc.orig 2025-02-22 18:06:53 UTC +++ base/threading/platform_thread_posix.cc -@@ -77,11 +77,11 @@ void* ThreadFunc(void* params) { - if (!thread_params->joinable) +@@ -79,11 +79,11 @@ void* ThreadFunc(void* params) { base::DisallowSingleton(); + } -#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) +#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD) @@ -14,7 +14,7 @@ #if BUILDFLAG(IS_APPLE) PlatformThread::SetCurrentThreadRealtimePeriodValue( delegate->GetRealtimePeriod()); -@@ -265,6 +265,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { +@@ -270,6 +270,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() { return reinterpret_cast<int32_t>(pthread_self()); #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX) return pthread_self(); @@ -23,7 +23,7 @@ #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX) return reinterpret_cast<int64_t>(pthread_self()); #endif -@@ -355,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t +@@ -363,7 +365,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t // static bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) { @@ -32,7 +32,7 @@ return false; #else if (from >= to) { -@@ -376,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -384,6 +386,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) NOTIMPLEMENTED(); @@ -40,9 +40,9 @@ +#elif BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); #else - if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) + if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) { return; -@@ -398,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -407,7 +412,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 4b91f6050e49..953c12428b10 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 2024-11-04 08:56:03 UTC +--- base/threading/platform_thread_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ base/threading/platform_thread_unittest.cc -@@ -38,7 +38,7 @@ +@@ -36,7 +36,7 @@ #include "base/time/time.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -362,7 +362,7 @@ TEST(PlatformThreadTest, +@@ -371,7 +371,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; -@@ -616,12 +616,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -625,12 +625,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_time_time__now__posix.cc b/www/iridium/files/patch-base_time_time__now__posix.cc new file mode 100644 index 000000000000..709627a104d7 --- /dev/null +++ b/www/iridium/files/patch-base_time_time__now__posix.cc @@ -0,0 +1,11 @@ +--- base/time/time_now_posix.cc.orig 2025-02-22 18:06:53 UTC ++++ base/time/time_now_posix.cc +@@ -27,7 +27,7 @@ + #endif + + // NaCl doesn't support CLOCK_MONOTONIC_COARSE. +-#if BUILDFLAG(IS_NACL) ++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC + #else + #define TIMETICKS_LOW_RESOLUTION_CLOCK CLOCK_MONOTONIC_COARSE 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 956a00ac7e2d..214d238d8919 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 2024-08-27 06:28:16 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2025-02-22 18:06:53 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -28,6 +28,8 @@ +@@ -31,6 +31,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -178,7 +180,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -181,7 +183,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -368,6 +370,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -371,6 +373,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 3fdcf38412e3..8d48b7b32f82 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 2024-11-04 08:56:03 UTC +--- base/trace_event/memory_dump_manager.cc.orig 2025-02-22 18:06:53 UTC +++ base/trace_event/memory_dump_manager.cc -@@ -83,7 +83,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP +@@ -79,7 +79,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 34b366687752..1b8dc6619195 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,4 +1,4 @@ ---- base/trace_event/process_memory_dump.cc.orig 2024-08-27 06:28:16 UTC +--- base/trace_event/process_memory_dump.cc.orig 2025-02-22 18:06:53 UTC +++ base/trace_event/process_memory_dump.cc @@ -120,7 +120,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) @@ -9,10 +9,10 @@ auto vec = base::HeapArray<char>::WithSize(max_vec_size); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) auto vec = base::HeapArray<unsigned char>::WithSize(max_vec_size); -@@ -143,7 +143,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident - - for (size_t i = 0; i < page_count; i++) +@@ -144,7 +144,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/42050620): Implement counting resident bytes. diff --git a/www/iridium/files/patch-base_tracing_trace__time.cc b/www/iridium/files/patch-base_tracing_trace__time.cc index e2e76aa2e2c8..b4693bd4420f 100644 --- a/www/iridium/files/patch-base_tracing_trace__time.cc +++ b/www/iridium/files/patch-base_tracing_trace__time.cc @@ -1,4 +1,4 @@ ---- base/tracing/trace_time.cc.orig 2022-03-28 18:11:04 UTC +--- base/tracing/trace_time.cc.orig 2025-02-22 18:06:53 UTC +++ base/tracing/trace_time.cc @@ -8,13 +8,17 @@ #include "build/build_config.h" @@ -18,11 +18,4 @@ + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) struct timespec ts; int res = clock_gettime(CLOCK_BOOTTIME, &ts); - if (res != -1) -@@ -24,4 +28,4 @@ int64_t TraceBootTicksNow() { - } - - } // namespace tracing --} // namespace base -\ No newline at end of file -+} // namespace base + if (res != -1) { diff --git a/www/iridium/files/patch-build_config_BUILD.gn b/www/iridium/files/patch-build_config_BUILD.gn index feef140087fd..78bd3c99109d 100644 --- a/www/iridium/files/patch-build_config_BUILD.gn +++ b/www/iridium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2024-08-01 05:47:53 UTC +--- build/config/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ build/config/BUILD.gn -@@ -213,6 +213,10 @@ config("default_libs") { +@@ -215,6 +215,10 @@ config("default_libs") { # Targets should choose to explicitly link frameworks they require. Since # linking can have run-time side effects, nothing should be listed here. libs = [] diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn index 414a5c35a9ed..655297e96d0a 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 2024-06-25 12:08:48 UTC +--- build/config/BUILDCONFIG.gn.orig 2025-02-22 18:06:53 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" && -@@ -231,6 +232,10 @@ if (host_toolchain == "") { +@@ -234,6 +235,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") } -@@ -274,6 +279,8 @@ if (target_os == "android") { +@@ -278,6 +283,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") } -@@ -308,7 +315,11 @@ is_android = current_os == "android" +@@ -312,7 +319,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" @@ -42,4 +42,4 @@ +is_bsd = current_os == "openbsd" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" - is_win = current_os == "win" || current_os == "winuwp" + is_watchos = current_os == "watchos" diff --git a/www/iridium/files/patch-build_config_clang_BUILD.gn b/www/iridium/files/patch-build_config_clang_BUILD.gn index 3d267d0f600a..6ecc3c6469a6 100644 --- a/www/iridium/files/patch-build_config_clang_BUILD.gn +++ b/www/iridium/files/patch-build_config_clang_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/clang/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- build/config/clang/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ build/config/clang/BUILD.gn -@@ -210,7 +210,12 @@ template("clang_lib") { +@@ -213,7 +213,12 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index 1e2f4682f13d..da8a533f04f2 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-12-22 12:24:29 UTC +--- build/config/compiler/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ build/config/compiler/BUILD.gn -@@ -199,7 +199,7 @@ declare_args() { +@@ -198,7 +198,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() { -@@ -256,13 +256,16 @@ config("default_include_dirs") { +@@ -255,13 +255,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") { @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -508,6 +511,10 @@ config("compiler") { +@@ -519,6 +522,10 @@ config("compiler") { } } @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -561,7 +568,7 @@ config("compiler") { +@@ -578,7 +585,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -47,25 +47,25 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1220,7 +1227,7 @@ config("compiler_cpu_abi") { +@@ -1240,7 +1247,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl && -+ if (is_clang && !is_android && !is_nacl && !is_bsd && - !(is_chromeos_lacros && is_chromeos_device)) { +- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { ++ if (is_clang && !is_android && !is_nacl && !is_chromeos_device && !is_bsd) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1235,7 +1242,7 @@ config("compiler_cpu_abi") { - cflags += [ "-mtune=$arm_tune" ] + } +@@ -1255,7 +1262,7 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia && -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd && - !(is_chromeos_lacros && is_chromeos_device)) { + if (is_clang && !is_android && !is_nacl && !is_fuchsia && +- !is_chromeos_device) { ++ !is_chromeos_device && !is_bsd) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1570,7 +1577,7 @@ config("compiler_deterministic") { + } +@@ -1589,7 +1596,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1628,7 +1635,7 @@ config("compiler_deterministic") { +@@ -1647,7 +1654,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +83,7 @@ current_os != "zos") { update_args = [ "--print-revision", -@@ -1952,9 +1959,6 @@ config("default_warnings") { +@@ -1968,9 +1975,6 @@ config("default_warnings") { cflags += [ # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. "-Wno-cast-function-type", @@ -93,27 +93,17 @@ ] cflags_cc += [ -@@ -1962,18 +1966,12 @@ config("default_warnings") { - "-Wenum-compare-conditional", - ] - -- if (!is_nacl) { -+ if (!is_nacl && !is_openbsd) { - cflags_cc += [ - # TODO(crbug.com/41486292): Fix and re-enable. - "-Wno-c++11-narrowing-const-reference", - ] +@@ -1989,9 +1993,6 @@ config("default_warnings") { -- # TODO(crbug.com/344680447): Fix and re-enable. -- cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] + # TODO(crbug.com/356172342): Fix and re-enable. + cflags_cc += [ "-Wno-dangling-assignment-gsl" ] - -- # TODO(crbug.com/356172342): Fix and re-enable. -- cflags_cc += [ "-Wno-dangling-assignment-gsl" ] -- - if (llvm_force_head_revision) { - # TODO(crbug.com/373130005): Fix and re-enable. - cflags_cc += [ "-Wno-deprecated-literal-operator" ] -@@ -2711,7 +2709,7 @@ config("afdo_optimize_size") { +- # TODO(crbug.com/376641662): Fix and re-enable. +- cflags += [ "-Wno-nontrivial-memcall" ] + } + } + +@@ -2769,7 +2770,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") { @@ -122,7 +112,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2738,7 +2736,7 @@ config("afdo") { +@@ -2796,7 +2797,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -131,7 +121,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2915,7 +2913,7 @@ config("symbols") { +@@ -2973,7 +2974,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } diff --git a/www/iridium/files/patch-build_config_gcc_BUILD.gn b/www/iridium/files/patch-build_config_gcc_BUILD.gn new file mode 100644 index 000000000000..cc3ee115dbee --- /dev/null +++ b/www/iridium/files/patch-build_config_gcc_BUILD.gn @@ -0,0 +1,13 @@ +--- build/config/gcc/BUILD.gn.orig 2025-02-22 18:06:53 UTC ++++ build/config/gcc/BUILD.gn +@@ -32,7 +32,9 @@ declare_args() { + # See http://gcc.gnu.org/wiki/Visibility + config("symbol_visibility_hidden") { + cflags = [ "-fvisibility=hidden" ] +- rustflags = [ "-Zdefault-visibility=hidden" ] ++ if (!is_bsd) { ++ rustflags = [ "-Zdefault-visibility=hidden" ] ++ } + + # Visibility attribute is not supported on AIX. + if (current_os != "aix") { diff --git a/www/iridium/files/patch-build_config_linux_libdrm_BUILD.gn b/www/iridium/files/patch-build_config_linux_libdrm_BUILD.gn new file mode 100644 index 000000000000..279961b01ffb --- /dev/null +++ b/www/iridium/files/patch-build_config_linux_libdrm_BUILD.gn @@ -0,0 +1,11 @@ +--- build/config/linux/libdrm/BUILD.gn.orig 2025-02-22 18:06:53 UTC ++++ build/config/linux/libdrm/BUILD.gn +@@ -15,7 +15,7 @@ declare_args() { + } + + if (use_system_libdrm) { +- assert(!is_linux, "System libdrm is not supported in linux") ++# assert(!is_linux, "System libdrm is not supported in linux") + pkg_config("libdrm_config") { + packages = [ "libdrm" ] + } diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni index 97653ecca148..00a7a6f73648 100644 --- a/www/iridium/files/patch-build_config_rust.gni +++ b/www/iridium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2024-12-22 12:24:29 UTC +--- build/config/rust.gni.orig 2025-02-22 18:06:53 UTC +++ build/config/rust.gni -@@ -321,6 +321,10 @@ if (is_linux || is_chromeos) { +@@ -297,6 +297,10 @@ if (is_linux || is_chromeos) { } } diff --git a/www/iridium/files/patch-build_linux_unbundle_icu.gn b/www/iridium/files/patch-build_linux_unbundle_icu.gn index 99fb2c1e540c..0685cacfb689 100644 --- a/www/iridium/files/patch-build_linux_unbundle_icu.gn +++ b/www/iridium/files/patch-build_linux_unbundle_icu.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/icu.gn.orig 2024-12-22 12:24:29 UTC +--- build/linux/unbundle/icu.gn.orig 2025-02-22 18:06:53 UTC +++ build/linux/unbundle/icu.gn @@ -17,6 +17,15 @@ config("icu_config") { "USING_SYSTEM_ICU=1", @@ -16,26 +16,17 @@ # U_EXPORT (defined in unicode/platform.h) is used to set public visibility # on classes through the U_COMMON_API and U_I18N_API macros (among others). # When linking against the system ICU library, we want its symbols to have -@@ -35,6 +44,18 @@ config("icu_config") { +@@ -34,6 +43,9 @@ config("icu_config") { + # to define U_IMPORT to have the same value as U_EXPORT. For more details, # please see: https://crbug.com/822820 "U_IMPORT=U_EXPORT", - ] -+ -+ _icu_version = exec_script(pkg_config_script, -+ common_pkg_config_args + pkg_config_args + [ -+ "icu-i18n", -+ "--version-as-components", -+ ], -+ "value") + -+ # Unbreak with icu 76 where private symbols are picked up -+ if (_icu_version[0] >= 76) { -+ defines += [ "U_HIDE_DRAFT_API" ] -+ } ++ # Unbreak with icu 76 where private symbols are picked up ++ "U_HIDE_DRAFT_API", + ] } - pkg_config("system_icui18n") { -@@ -46,6 +67,14 @@ pkg_config("system_icuuc") { +@@ -46,6 +58,14 @@ pkg_config("system_icuuc") { } source_set("icui18n") { diff --git a/www/iridium/files/patch-build_linux_unbundle_libevent.gn b/www/iridium/files/patch-build_linux_unbundle_libevent.gn deleted file mode 100644 index d5f276de574d..000000000000 --- a/www/iridium/files/patch-build_linux_unbundle_libevent.gn +++ /dev/null @@ -1,15 +0,0 @@ ---- build/linux/unbundle/libevent.gn.orig 2022-05-28 07:21:18 UTC -+++ build/linux/unbundle/libevent.gn -@@ -9,7 +9,12 @@ shim_headers("libevent_shim") { - headers = [ "event.h" ] - } - -+config("system_libevent") { -+ defines = [ "USE_SYSTEM_LIBEVENT=1" ] -+} -+ - source_set("libevent") { - deps = [ ":libevent_shim" ] - libs = [ "event" ] -+ public_configs = [ ":system_libevent" ] - } diff --git a/www/iridium/files/patch-build_nocompile.gni b/www/iridium/files/patch-build_nocompile.gni new file mode 100644 index 000000000000..b9b57ea8d5d1 --- /dev/null +++ b/www/iridium/files/patch-build_nocompile.gni @@ -0,0 +1,11 @@ +--- build/nocompile.gni.orig 2025-02-22 18:06:53 UTC ++++ build/nocompile.gni +@@ -55,7 +55,7 @@ if (is_win) { + } + + declare_args() { +- enable_nocompile_tests = is_clang && !is_nacl ++ enable_nocompile_tests = is_clang && !is_nacl && !is_bsd + } + + if (enable_nocompile_tests) { diff --git a/www/iridium/files/patch-build_rust_rust__bindgen.gni b/www/iridium/files/patch-build_rust_rust__bindgen.gni index e0d9446aeb7b..fdf61649b007 100644 --- a/www/iridium/files/patch-build_rust_rust__bindgen.gni +++ b/www/iridium/files/patch-build_rust_rust__bindgen.gni @@ -1,6 +1,6 @@ ---- build/rust/rust_bindgen.gni.orig 2024-08-01 05:47:53 UTC +--- build/rust/rust_bindgen.gni.orig 2025-02-22 18:06:53 UTC +++ build/rust/rust_bindgen.gni -@@ -11,14 +11,14 @@ if (is_win) { +@@ -12,14 +12,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } diff --git a/www/iridium/files/patch-build_rust_rust__bindgen__generator.gni b/www/iridium/files/patch-build_rust_rust__bindgen__generator.gni new file mode 100644 index 000000000000..6d51fdfd00cc --- /dev/null +++ b/www/iridium/files/patch-build_rust_rust__bindgen__generator.gni @@ -0,0 +1,19 @@ +--- build/rust/rust_bindgen_generator.gni.orig 2025-02-22 18:06:53 UTC ++++ build/rust/rust_bindgen_generator.gni +@@ -11,14 +11,14 @@ if (is_win) { + import("//build/toolchain/win/win_toolchain_data.gni") + } + +-_bindgen_path = "${rust_bindgen_root}/bin/bindgen" ++_bindgen_path = "${LOCALBASE}/bin/bindgen" + if (host_os == "win") { + _bindgen_path = "${_bindgen_path}.exe" + } + + # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in + # ../lib. +-_libclang_path = rust_bindgen_root ++_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" + if (host_os == "win") { + _libclang_path += "/bin" + } else { diff --git a/www/iridium/files/patch-build_rust_std_BUILD.gn b/www/iridium/files/patch-build_rust_std_BUILD.gn index cd7bc8ee55dd..63e59fbdaba2 100644 --- a/www/iridium/files/patch-build_rust_std_BUILD.gn +++ b/www/iridium/files/patch-build_rust_std_BUILD.gn @@ -1,6 +1,6 @@ ---- build/rust/std/BUILD.gn.orig 2024-08-27 06:28:16 UTC +--- build/rust/std/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ build/rust/std/BUILD.gn -@@ -100,7 +100,6 @@ if (toolchain_has_rust) { +@@ -115,7 +115,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. skip_stdlib_files = [ diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index f1dd85098df5..171a85121dac 100644 --- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2024-08-27 06:28:16 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2025-02-22 18:06:53 UTC +++ build/toolchain/gcc_toolchain.gni @@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -904,22 +911,12 @@ template("gcc_toolchain") { +@@ -888,22 +895,12 @@ template("gcc_toolchain") { # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/iridium/files/patch-cc_base_features.cc b/www/iridium/files/patch-cc_base_features.cc index f572c1e88bd9..41ac54f25618 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 2024-12-22 12:24:29 UTC +--- cc/base/features.cc.orig 2025-02-22 18:06:53 UTC +++ cc/base/features.cc -@@ -85,7 +85,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr +@@ -43,7 +43,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", 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 61d35770d035..827d350f06b0 100644 --- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2024-06-25 12:08:48 UTC +--- chrome/app/chrome_command_ids.h.orig 2025-02-22 18:06:53 UTC +++ chrome/app/chrome_command_ids.h -@@ -68,12 +68,12 @@ +@@ -68,11 +68,11 @@ #define IDC_TOGGLE_MULTITASK_MENU 34050 #endif @@ -9,9 +9,8 @@ #define IDC_USE_SYSTEM_TITLE_BAR 34051 #endif - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define IDC_RESTORE_WINDOW 34052 #endif diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index 8c2d14e92283..b65a185f5b4b 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/app/chrome_main.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/app/chrome_main.cc -@@ -30,11 +30,11 @@ +@@ -28,11 +28,11 @@ #include "chrome/app/chrome_main_mac.h" #endif @@ -14,16 +14,16 @@ #include "chrome/app/chrome_main_linux.h" #endif -@@ -55,7 +55,7 @@ - #endif // BUILDFLAG(IS_WIN) - +@@ -57,7 +57,7 @@ + // sometime after old headless code is removed from Chrome. + // See https://crbug.com/373672160. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #define ENABLE_OLD_HEADLESS + #define ENABLE_OLD_HEADLESS_INFO #endif -@@ -120,7 +120,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -115,7 +115,7 @@ int ChromeMain(int argc, const char** argv) { #error Unknown platform. #endif @@ -32,7 +32,7 @@ PossiblyDetermineFallbackChromeChannel(argv[0]); #endif -@@ -186,7 +186,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -181,7 +181,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif 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 55f34f1aacbb..211dea55e9d6 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/app/chrome_main_delegate.cc @@ -145,7 +145,7 @@ #include "components/about_ui/credit_utils.h" @@ -30,7 +30,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -342,7 +342,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -340,7 +340,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -39,7 +39,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -427,7 +427,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -425,7 +425,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -48,7 +48,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -439,7 +439,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -437,7 +437,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -57,7 +57,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -521,7 +521,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -519,7 +519,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -66,7 +66,7 @@ // 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. -@@ -605,7 +605,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -603,7 +603,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -75,7 +75,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. -@@ -698,7 +698,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -699,7 +699,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -84,7 +84,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -887,7 +887,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -888,7 +888,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -93,7 +93,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1091,7 +1091,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1089,7 +1089,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) || \ @@ -102,7 +102,7 @@ is_canary_dev; #else false; -@@ -1241,7 +1241,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1238,7 +1238,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -111,7 +111,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1271,7 +1271,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1268,7 +1268,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -120,7 +120,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1634,7 +1634,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1563,7 +1563,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -129,7 +129,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1723,13 +1723,13 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1651,13 +1651,13 @@ absl::variant<int, content::MainFunctionParams> Chrome #else #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ diff --git a/www/iridium/files/patch-chrome_browser_BUILD.gn b/www/iridium/files/patch-chrome_browser_BUILD.gn index 1e2ad0a48999..3477e8e37eaa 100644 --- a/www/iridium/files/patch-chrome_browser_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_BUILD.gn @@ -1,16 +1,16 @@ ---- chrome/browser/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/BUILD.gn -@@ -6980,6 +6980,13 @@ static_library("browser") { +@@ -6957,6 +6957,13 @@ static_library("browser") { + [ "//third_party/webrtc/modules/desktop_capture:pipewire_config" ] } - } -+ if (is_bsd) { -+ sources -= [ -+ "metrics/bluetooth_metrics_provider.cc", -+ "metrics/bluetooth_metrics_provider.h", -+ ] -+ } ++ if (is_bsd) { ++ sources -= [ ++ "metrics/bluetooth_metrics_provider.cc", ++ "metrics/bluetooth_metrics_provider.h", ++ ] ++ } + - if (is_linux && use_dbus) { - sources += [ - "dbus_memory_pressure_evaluator_linux.cc", + if (use_dbus) { + sources += [ + "dbus_memory_pressure_evaluator_linux.cc", diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index 5ec6d4e35035..c09600c0f0aa 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,8 +1,8 @@ ---- chrome/browser/about_flags.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/about_flags.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/about_flags.cc -@@ -246,7 +246,7 @@ - #include "ui/ui_features.h" - #include "url/url_features.h" +@@ -254,7 +254,7 @@ + #include "extensions/common/extension_features.h" + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -10,13 +10,13 @@ #endif @@ -341,7 +341,7 @@ - #include "device/vr/public/cpp/features.h" + #include "device/vr/public/cpp/switches.h" #endif --#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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/ozone/public/ozone_switches.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -350,7 +350,7 @@ #include "chrome/browser/win/mica_titlebar.h" @@ -24,10 +24,10 @@ -#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/contextual_cueing/contextual_cueing_features.h" #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - -@@ -360,7 +360,7 @@ +@@ -361,7 +361,7 @@ #include "components/user_education/common/user_education_features.h" // nogncheck #endif @@ -36,7 +36,7 @@ #include "chrome/browser/ui/ui_features.h" #include "ui/base/ui_base_features.h" #endif -@@ -506,7 +506,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -516,7 +516,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -45,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -783,6 +783,26 @@ const FeatureEntry::FeatureVariation +@@ -799,6 +799,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -72,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1224,7 +1244,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1203,7 +1223,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,16 +81,16 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1268,7 +1288,7 @@ const FeatureEntry::FeatureVariation +@@ -1241,7 +1261,7 @@ const FeatureEntry::FeatureVariation kRemotePageMetada }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { - {"ShortcutBoostSearchScore", "0"}, - {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -1886,7 +1906,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari + + // A limited number of combinations of the rich autocompletion params. + const FeatureEntry::FeatureParam +@@ -1834,7 +1854,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,8 +99,8 @@ const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = { {"stale_threshold_duration", "10s"}, {"declutter_timer_interval", "10s"}, -@@ -3635,7 +3655,7 @@ const flags_ui::FeatureEntry::FeatureVariation - }; +@@ -3598,7 +3618,7 @@ const FeatureEntry::FeatureVariation + #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS) @@ -108,16 +108,16 @@ const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = {{"link_capturing_state", "on_by_default"}}; const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = -@@ -4159,7 +4179,7 @@ const FeatureEntry::FeatureVariation - std::size(kSecurePaymentConfirmationNetworkAndIssuerIcons_Rows), - nullptr}}; +@@ -4095,7 +4115,7 @@ const FeatureEntry::FeatureVariation kSkiaGraphiteVari + {"dawn frontend validation disabled", kSkiaGraphite_ValidationDisabled, + std::size(kSkiaGraphite_ValidationDisabled), nullptr}}; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = { {"TranslationAPIAcceptLanguagesCheck", "false"}, {"TranslationAPILimitLanguagePackCount", "false"}}; -@@ -4905,7 +4925,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4907,7 +4927,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_WIN) @@ -126,16 +126,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5314,7 +5334,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kDesktopPWAsSyncChangesDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kWebAppDontAddExistingAppsToSync)}, - #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, -@@ -5469,7 +5489,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5463,7 +5483,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -144,10 +135,11 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5500,9 +5520,18 @@ const FeatureEntry kFeatureEntries[] = { - {"wayland-ui-scaling", flag_descriptions::kWaylandUiScalingName, - flag_descriptions::kWaylandUiScalingDescription, kOsLinux, - FEATURE_VALUE_TYPE(features::kWaylandUiScale)}, +@@ -5499,9 +5519,19 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWaylandLinuxDrmSyncobjName, + flag_descriptions::kWaylandLinuxDrmSyncobjDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kWaylandLinuxDrmSyncobj)}, ++ +#if BUILDFLAG(IS_BSD) + {"audio-backend", + flag_descriptions::kAudioBackendName, @@ -164,7 +156,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6414,7 +6443,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6407,7 +6437,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -173,7 +165,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6620,7 +6649,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6605,7 +6635,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -182,7 +174,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7235,7 +7264,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7162,7 +7192,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -191,7 +183,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -8239,7 +8268,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8066,7 +8096,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCooperativeSchedulingDescription, kOsAll, FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, @@ -200,25 +192,16 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8255,7 +8284,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(media::kUseOutOfProcessVideoDecoding)}, - #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) - --#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, -@@ -9069,7 +9098,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8751,7 +8781,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, - flag_descriptions::kGetAllScreensMediaDescription, - kOsCrOS | kOsLacros | kOsLinux, -@@ -9102,7 +9131,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(blink::features::kGetAllScreensMedia)}, +@@ -8778,7 +8808,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -227,7 +210,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9603,7 +9632,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9255,7 +9285,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -236,7 +219,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10390,7 +10419,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9964,7 +9994,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -245,25 +228,25 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10421,7 +10450,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, +@@ -9990,7 +10020,7 @@ const FeatureEntry kFeatureEntries[] = { + "RenderDocument")}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"site-search-settings-policy", - flag_descriptions::kSiteSearchSettingsPolicyName, - flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10546,7 +10575,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, - FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, + {"enable-search-aggregator-policy", + flag_descriptions::kEnableSearchAggregatorPolicyName, + flag_descriptions::kEnableSearchAggregatorPolicyDescription, +@@ -10092,7 +10122,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chrome::android::kReadAloudTapToSeek)}, + #endif -#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, -@@ -10588,7 +10617,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10134,7 +10164,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -272,8 +255,8 @@ {"enable-user-navigation-capturing-pwa", flag_descriptions::kPwaNavigationCapturingName, flag_descriptions::kPwaNavigationCapturingDescription, -@@ -11476,7 +11505,7 @@ const FeatureEntry kFeatureEntries[] = { - kAuthenticateUsingUserConsentVerifierInteropApi)}, +@@ -10976,7 +11006,7 @@ const FeatureEntry kFeatureEntries[] = { + performance_manager::features::kPerformanceInterventionDemoMode)}, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -281,7 +264,7 @@ {"sync-enable-bookmarks-in-transport-mode", flag_descriptions::kSyncEnableBookmarksInTransportModeName, flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -11575,7 +11604,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11058,7 +11088,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -290,7 +273,7 @@ {"classify-url-on-process-response-event", flag_descriptions::kClassifyUrlOnProcessResponseEventName, flag_descriptions::kClassifyUrlOnProcessResponseEventDescription, -@@ -11584,7 +11613,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11067,7 +11097,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -299,16 +282,16 @@ {"tab-organization", flag_descriptions::kTabOrganizationName, flag_descriptions::kTabOrganizationDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kTabOrganization)}, -@@ -11629,7 +11658,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kLanguageDetectionAPIDescription, kOsAll, - FEATURE_VALUE_TYPE(blink::features::kLanguageDetectionAPI)}, +@@ -11123,7 +11153,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(switches::kForceSupervisedSigninWithCapabilities)}, + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"supervised-profile-hide-guest", flag_descriptions::kSupervisedProfileHideGuestName, flag_descriptions::kSupervisedProfileHideGuestDescription, -@@ -11882,7 +11911,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11393,7 +11423,7 @@ const FeatureEntry kFeatureEntries[] = { segmentation_platform::features::kSegmentationSurveyPage)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -317,7 +300,7 @@ {"autofill-enable-buy-now-pay-later-for-affirm", flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName, flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription, -@@ -12017,7 +12046,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11522,7 +11552,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)}, @@ -325,4 +308,13 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"translation-api", flag_descriptions::kTranslationAPIName, flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux, - FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kEnableTranslationAPI, + FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kTranslationAPI, +@@ -11548,7 +11578,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + password_manager::features::kPasswordFormClientsideClassifier)}, + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"contextual-cueing", flag_descriptions::kContextualCueingName, + flag_descriptions::kContextualCueingDescription, + kOsLinux | kOsMac | kOsWin, diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc index 63a1e88a39e4..620d5faa9a84 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.cc +++ b/www/iridium/files/patch-chrome_browser_browser__features.cc @@ -1,8 +1,8 @@ ---- chrome/browser/browser_features.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/browser_features.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/browser_features.cc -@@ -71,7 +71,7 @@ BASE_FEATURE(kClosedTabCache, - "ClosedTabCache", +@@ -71,7 +71,7 @@ BASE_FEATURE(kCertVerificationNetworkTime, base::FEATURE_DISABLED_BY_DEFAULT); + #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -268,7 +268,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -228,7 +228,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, "SandboxExternalProtocolBlockedWarning", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-chrome_browser_browser__features.h b/www/iridium/files/patch-chrome_browser_browser__features.h index cc93a1229c5c..33278a451e18 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.h +++ b/www/iridium/files/patch-chrome_browser_browser__features.h @@ -1,15 +1,15 @@ ---- chrome/browser/browser_features.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/browser_features.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/browser_features.h -@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore +@@ -37,7 +37,7 @@ BASE_DECLARE_FEATURE(kBookmarkTriggerForPrerender2); + BASE_DECLARE_FEATURE(kCertificateTransparencyAskBeforeEnabling); BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); - BASE_DECLARE_FEATURE(kClosedTabCache); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kDbusSecretPortal); #endif -@@ -117,7 +117,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed +@@ -102,7 +102,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked); BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning); 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 5d3b0764dfe7..55f75ca30f7b 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,15 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/browser_process_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/browser_process_impl.cc -@@ -236,7 +236,7 @@ - #include "chrome/browser/ui/profiles/profile_picker.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck - #endif - -@@ -257,7 +257,7 @@ +@@ -254,7 +254,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -18,7 +9,7 @@ #include "chrome/browser/browser_features.h" #include "components/os_crypt/async/browser/secret_portal_key_provider.h" #endif -@@ -1125,7 +1125,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim +@@ -1121,7 +1121,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim GoogleUpdateSettings::GetCollectStatsConsent()); registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); @@ -27,16 +18,7 @@ os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); #endif } -@@ -1308,7 +1308,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { - - ApplyMetricsReportingPolicy(); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - ChromeJsErrorReportProcessor::Create(); - #endif - -@@ -1398,7 +1398,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1387,7 +1387,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { features::kUseAppBoundEncryptionProviderForEncryption)))); #endif // BUILDFLAG(IS_WIN) @@ -45,7 +27,7 @@ if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) { providers.emplace_back( /*precedence=*/10u, -@@ -1648,7 +1648,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1637,7 +1637,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. 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 276842ef74a6..6c8a4608d949 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-12-22 12:24:29 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -129,12 +129,12 @@ +@@ -126,12 +126,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -15,7 +15,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" -@@ -224,7 +224,7 @@ +@@ -220,7 +220,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -24,7 +24,7 @@ #include "chrome/browser/screen_ai/screen_ai_service_router.h" #include "chrome/browser/screen_ai/screen_ai_service_router_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" -@@ -234,7 +234,7 @@ +@@ -230,7 +230,7 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) @@ -33,7 +33,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -865,7 +865,7 @@ void BindMediaFoundationPreferences( +@@ -736,7 +736,7 @@ void BindMediaFoundationPreferences( #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -42,7 +42,7 @@ void BindScreenAIAnnotator( content::RenderFrameHost* frame_host, mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) { -@@ -1078,7 +1078,7 @@ void PopulateChromeFrameBinders( +@@ -883,7 +883,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -51,8 +51,8 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1168,7 +1168,7 @@ void PopulateChromeWebUIFrameBinders( - DataSharingInternalsUI>(map); +@@ -977,7 +977,7 @@ void PopulateChromeWebUIFrameBinders( + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1179,7 +1179,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -988,7 +988,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -69,7 +69,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); -@@ -1278,14 +1278,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -1075,14 +1075,14 @@ void PopulateChromeWebUIFrameBinders( page_image_service::mojom::PageImageServiceHandler, HistoryUI, HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); @@ -86,7 +86,7 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1794,7 +1794,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1609,7 +1609,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 41064edabe07..37db49dfc73b 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -249,15 +249,15 @@ +@@ -250,15 +250,15 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -62,7 +62,7 @@ // 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. -@@ -1114,7 +1114,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1120,7 +1120,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -71,7 +71,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1162,7 +1162,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1168,7 +1168,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) || \ @@ -80,7 +80,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1358,7 +1358,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1364,7 +1364,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -89,7 +89,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1407,7 +1407,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1413,7 +1413,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1516,7 +1516,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1522,7 +1522,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. 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 07970433da8f..d6aa851c98e5 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,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/chrome_browser_main_linux.cc @@ -25,7 +25,7 @@ #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif -@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -70,7 +70,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag #endif // BUILDFLAG(IS_CHROMEOS) #if !BUILDFLAG(IS_CHROMEOS) @@ -19,7 +19,7 @@ // 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 -@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); } @@ -28,8 +28,8 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); -@@ -136,7 +138,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { - #endif // (defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)) +@@ -134,7 +136,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { + #endif // BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { -#if BUILDFLAG(IS_CHROMEOS) 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 index 85d0cc0f5b1b..1efda4097a61 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.h.orig 2024-06-25 12:08:48 UTC +--- chrome/browser/chrome_browser_main_linux.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/chrome_browser_main_linux.h -@@ -30,7 +30,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows +@@ -31,7 +31,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows // ChromeBrowserMainPartsPosix overrides. void PostCreateMainMessageLoop() override; 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 f5113c8b8dbe..f1e22cd98c61 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,21 +1,20 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -498,7 +498,7 @@ +@@ -504,7 +504,7 @@ + #include "components/user_manager/user_manager.h" + #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" - // 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) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || 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) -@@ -615,12 +615,12 @@ +@@ -616,11 +616,11 @@ + #include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom.h" + #endif // !BUILDFLAG(IS_ANDROID) - // 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) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif @@ -37,13 +36,13 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -655,7 +655,7 @@ - #include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h" + // BUILDFLAG(IS_CHROMEOS) +@@ -649,7 +649,7 @@ + #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -51,35 +50,35 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1572,7 +1572,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - #if BUILDFLAG(IS_CHROMEOS) - registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); +@@ -1547,7 +1547,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre + registry->RegisterBooleanPref(prefs::kDeviceNativeClientForceAllowedCache, + false); #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) -@@ -1774,7 +1774,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( +@@ -1752,7 +1752,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo + #elif BUILDFLAG(IS_CHROMEOS) + main_parts = std::make_unique<ash::ChromeBrowserMainPartsAsh>( is_integration_test, &startup_data_); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1808,7 +1808,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); - // 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) +@@ -1781,7 +1781,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo + // Construct additional browser parts. Stages are called in the order in + // which they are added. + #if defined(TOOLKIT_VIEWS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1829,7 +1829,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo - main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); +@@ -1798,7 +1798,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo + main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsAsh>()); #endif -#if BUILDFLAG(IS_LINUX) @@ -87,7 +86,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1848,7 +1848,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1817,7 +1817,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -96,7 +95,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2721,7 +2721,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2694,7 +2694,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -106,7 +105,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2730,7 +2732,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2703,7 +2705,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) @@ -115,16 +114,16 @@ pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -3095,7 +3097,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3049,7 +3051,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) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !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)) { -@@ -4946,7 +4948,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4897,7 +4899,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -133,25 +132,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5067,7 +5069,7 @@ std::wstring ChromeContentBrowserClient::GetAppContain - case sandbox::mojom::Sandbox::kPrintCompositor: - case sandbox::mojom::Sandbox::kAudio: - case sandbox::mojom::Sandbox::kScreenAI: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - case sandbox::mojom::Sandbox::kVideoEffects: - #endif - case sandbox::mojom::Sandbox::kSpeechRecognition: -@@ -5172,7 +5174,7 @@ bool ChromeContentBrowserClient::PreSpawnChild( - #if !BUILDFLAG(IS_ANDROID) - case sandbox::mojom::Sandbox::kScreenAI: - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - case sandbox::mojom::Sandbox::kVideoEffects: - #endif - case sandbox::mojom::Sandbox::kAudio: -@@ -5531,7 +5533,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5409,7 +5411,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -160,16 +141,16 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5548,7 +5550,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5426,7 +5428,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5587,7 +5589,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5465,7 +5467,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -178,7 +159,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7552,7 +7554,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7374,7 +7376,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 79ace056a3e6..31cb6c2d6740 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,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -531,7 +531,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -545,7 +545,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc b/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc new file mode 100644 index 000000000000..271774d9906c --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_collaboration_messaging_messaging__backend__service__factory.cc @@ -0,0 +1,11 @@ +--- chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/collaboration/messaging/messaging_backend_service_factory.cc +@@ -83,7 +83,7 @@ MessagingBackendServiceFactory::BuildServiceInstanceFo + // This configuration object allows us to control platform specific behavior. + MessagingBackendConfiguration configuration; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + configuration.clear_chip_on_tab_selection = false; + #endif + diff --git a/www/iridium/files/patch-chrome_browser_component__updater_registration.cc b/www/iridium/files/patch-chrome_browser_component__updater_registration.cc index d9e5fad4966c..9b7e4d021560 100644 --- a/www/iridium/files/patch-chrome_browser_component__updater_registration.cc +++ b/www/iridium/files/patch-chrome_browser_component__updater_registration.cc @@ -1,20 +1,20 @@ ---- chrome/browser/component_updater/registration.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/component_updater/registration.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/component_updater/registration.cc -@@ -82,7 +82,7 @@ - #include "media/base/media_switches.h" - #endif // !BUILDFLAG(IS_ANDROID) +@@ -101,7 +101,7 @@ + #endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) --#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/component_updater/translate_kit_component_installer.h" - #include "chrome/browser/component_updater/translate_kit_language_pack_component_installer.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -232,7 +232,7 @@ void RegisterComponentsForUpdate() { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/component_updater/installer_policies/amount_extraction_heuristic_regexes_component_installer.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -251,7 +251,7 @@ void RegisterComponentsForUpdate() { + RegisterCookieReadinessListComponent(cus); - RegisterPlusAddressBlocklistComponent(cus); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/364795294): Support other platforms. - RegisterTranslateKitComponent(cus, g_browser_process->local_state(), - /*force_install=*/false, + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + RegisterAmountExtractionHeuristicRegexesComponent(cus); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) 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 8d96d239eecf..3cf77069e388 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc -@@ -41,7 +41,7 @@ +@@ -46,7 +46,7 @@ #include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" -@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: +@@ -79,7 +79,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: const char ImageLoaderComponentName[] = "WidevineCdm"; #endif @@ -18,7 +18,7 @@ // 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. -@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version +@@ -107,7 +107,7 @@ void RegisterWidevineCdmWithChrome(const base::Version } #endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ // 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 +@@ -401,7 +401,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 b2641128b943..57a61b5a99fc 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,4 +1,4 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2024-08-01 05:47:53 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2025-02-22 18:06:53 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>( @@ -8,4 +8,4 @@ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); #else - NOTREACHED_IN_MIGRATION(); + NOTREACHED(); 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 3a8c5a170a20..7112d16cad41 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,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1851,7 +1851,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1842,7 +1842,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1994,7 +1994,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1985,7 +1985,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,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -2076,7 +2076,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -2067,7 +2067,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 c93633280735..a939fa5059b5 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/download/download_commands.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/download/download_commands.cc @@ -26,7 +26,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -166,7 +166,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -165,7 +165,7 @@ void DownloadCommands::ExecuteCommand(Command command) } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 3c41ebeb35fb..1913114ae72b 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,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/download/download_item_model.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/download/download_item_model.cc @@ -760,7 +760,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1195,7 +1195,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1194,7 +1194,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 08ea27fbeb6d..d8380728d68f 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-11-04 08:56:03 UTC +--- chrome/browser/download/download_prefs.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/functional/bind.h" -@@ -60,6 +61,10 @@ +@@ -58,6 +59,10 @@ #include "chrome/browser/flags/android/chrome_feature_list.h" #endif @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -70,7 +75,7 @@ namespace { +@@ -68,7 +73,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; -@@ -176,7 +181,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -174,7 +179,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 -@@ -300,7 +305,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -299,7 +304,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) -@@ -467,7 +472,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -466,7 +471,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; -@@ -493,7 +498,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -492,7 +497,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(); -@@ -530,7 +535,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -529,7 +534,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; -@@ -682,7 +687,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -611,7 +616,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_download_download__prefs.h b/www/iridium/files/patch-chrome_browser_download_download__prefs.h index 28b5be602d9a..6a282ccd1ed7 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/download/download_prefs.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/download/download_prefs.h -@@ -115,7 +115,7 @@ class DownloadPrefs { +@@ -107,7 +107,7 @@ class DownloadPrefs { void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -179,7 +179,7 @@ class DownloadPrefs { +@@ -171,7 +171,7 @@ class DownloadPrefs { std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index 0e479acdb577..408f6de352a8 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-12-22 12:24:29 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -510,7 +510,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -509,7 +509,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc index c6e5c2ea448e..f68e1dc47821 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2024-08-01 05:47:53 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc @@ -13,7 +13,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h" @@ -17,4 +17,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<LinuxKeyPersistenceDelegate>(); #else - NOTREACHED_IN_MIGRATION(); + NOTREACHED(); 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 37a9cca5ed9c..74a0041095e9 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-12-22 12:24:29 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc @@ -58,7 +58,7 @@ #include "base/strings/utf_string_conversions.h" @@ -9,16 +9,7 @@ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/signals_aggregator.h" -@@ -143,7 +143,7 @@ void UploadSecurityEventReport(base::Value::Dict event - std::move(upload_callback)); - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void PopulateSignals(base::Value::Dict event, - policy::CloudPolicyClient* client, - std::string name, -@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -181,7 +181,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -27,21 +18,21 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp - if (include_profile_user_name) { - event.Set(kKeyProfileUserName, GetProfileUserName()); - } --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Profile* profile = Profile::FromBrowserContext(context_); - device_signals::SignalsAggregator* signals_aggregator = - enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile); -@@ -503,7 +503,7 @@ std::string RealtimeReportingClient::GetProfileUserNam - std::string username = +@@ -217,7 +217,7 @@ std::string RealtimeReportingClient::GetProfileUserNam + username_ = identity_manager_ ? GetProfileEmail(identity_manager_) : std::string(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (username.empty()) { - username = Profile::FromBrowserContext(context_)->GetPrefs()->GetString( + if (username_.empty()) { + username_ = Profile::FromBrowserContext(context_)->GetPrefs()->GetString( enterprise_signin::prefs::kProfileUserEmail); +@@ -275,7 +275,7 @@ std::string RealtimeReportingClient::GetBrowserClientI + return client_id; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet) + void RealtimeReportingClient::MaybeCollectDeviceSignalsAndReportEvent( + base::Value::Dict event, + policy::CloudPolicyClient* client, diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h index ff81fb15a772..15a8a1ad774d 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" @@ -9,7 +9,16 @@ #include "components/device_signals/core/browser/signals_types.h" #endif -@@ -165,7 +165,7 @@ class RealtimeReportingClient : public KeyedService, +@@ -112,7 +112,7 @@ class RealtimeReportingClient : public RealtimeReporti + const std::string& dm_token) override; + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(notyet) + void MaybeCollectDeviceSignalsAndReportEvent( + base::Value::Dict event, + policy::CloudPolicyClient* client, +@@ -151,7 +151,7 @@ class RealtimeReportingClient : public RealtimeReporti base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; }; 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 deleted file mode 100644 index f3a85684ef03..000000000000 --- a/www/iridium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 -@@ -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_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" -@@ -94,7 +94,7 @@ std::string ProfileIdDelegateImpl::GetDeviceId() { - } - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Gets the device ID from the BrowserDMTokenStorage. - std::string ProfileIdDelegateImpl::GetId() { - std::string device_id = diff --git a/www/iridium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc b/www/iridium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc new file mode 100644 index 000000000000..33331bf2a364 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_signin_interstitials_managed__profile__required__page.cc @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/enterprise/signin/interstitials/managed_profile_required_page.cc +@@ -92,7 +92,7 @@ void ManagedProfileRequiredPage::CommandReceived(const + + switch (cmd) { + case security_interstitials::CMD_DONT_PROCEED: +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (ManagedProfileRequiredNavigationThrottle::IsBlockingNavigations( + web_contents()->GetBrowserContext())) { + ManagedProfileRequiredNavigationThrottle::ShowBlockedWindow( diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index 6281dbb24c63..8974972a3f32 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,13 +1,13 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1439,6 +1439,10 @@ source_set("extensions") { - deps += [ "//chrome/services/printing/public/mojom" ] - } +@@ -1418,6 +1418,10 @@ source_set("extensions") { + deps += [ "//chrome/services/printing/public/mojom" ] + } -+ if (is_bsd) { -+ sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ] -+ } ++ if (is_bsd) { ++ sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ] ++ } + - if (enable_pdf) { - deps += [ - "//chrome/browser/pdf", + if (enable_pdf) { + deps += [ + "//chrome/browser/pdf", 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 20481372d2f3..2dadebad5de4 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-12-22 12:24:29 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -42,7 +42,7 @@ +@@ -51,7 +51,7 @@ #include "pdf/buildflags.h" - #include "printing/buildflags/buildflags.h" + #endif // BUILDFLAG(ENABLE_EXTENSIONS) -#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 -@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -123,7 +123,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_enterprise__reporting__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index d41b5049ca76..4d2bbc7ba044 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,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include "components/reporting/util/statusor.h" #endif 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 index e3c782ac3c08..16a6c3e98b34 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -417,7 +417,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel +@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel apps::LaunchContainer launch_container = GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); Profile* profile = Profile::FromBrowserContext(context); 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 ce05cfce666c..e97ddb589e48 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-12-22 12:24:29 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -652,7 +652,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -645,7 +645,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 e0ce021ce089..64976b973f26 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,4 +1,4 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc @@ -288,7 +288,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor } else if (strcmp(os, "linux") == 0) { @@ -9,5 +9,5 @@ + } else if (strcmp(os, "freebsd") == 0) { + info->os = extensions::api::runtime::PlatformOs::kLinux; } else { - NOTREACHED_IN_MIGRATION() << "Platform not supported: " << os; - return false; + NOTREACHED() << "Platform not supported: " << os; + } 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 97ee80d4b550..017806a9134c 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,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -192,7 +192,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] = settings_api::PrefType::kBoolean; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = settings_api::PrefType::kBoolean; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -210,7 +210,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; @@ -18,7 +18,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -218,7 +218,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -222,7 +222,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; 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 3ad15773d21c..c6d161967fb8 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,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -896,7 +896,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -919,7 +919,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // created as minimized. // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. // TODO(crbug.com/40254339): Find a fix for wayland as well. 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 acdd1d4bbc7d..51de79b8f9c6 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,6 +1,6 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -914,7 +914,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -913,7 +913,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/iridium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc b/www/iridium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc new file mode 100644 index 000000000000..b1c7830564dc --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_component__extensions__allowlist_allowlist.cc @@ -0,0 +1,20 @@ +--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc +@@ -48,7 +48,7 @@ bool IsComponentExtensionAllowlisted(const std::string + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + #endif // BUILDFLAG(IS_CHROMEOS) + extension_misc::kReadingModeGDocsHelperExtensionId, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extension_misc::kTTSEngineExtensionId, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + }); +@@ -84,7 +84,7 @@ bool IsComponentExtensionAllowlisted(int manifest_reso + case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST: + case IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST_MV3: + case IDR_READING_MODE_GDOCS_HELPER_MANIFEST: +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case IDR_TTS_ENGINE_MANIFEST: + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + case IDR_WEBSTORE_MANIFEST: 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 1c80d920d6a9..928ae17f541c 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,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -792,7 +792,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -790,7 +790,7 @@ void ExternalProviderImpl::CreateExternalProviders( #endif // BUILDFLAG(IS_CHROMEOS) if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -820,7 +820,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -818,7 +818,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 4a1d5abda6d6..b07e8dcdac89 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-12-22 12:24:29 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -336,7 +336,7 @@ const struct { +@@ -352,7 +352,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index 2f3082da5662..2e4fa22631f8 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,7 +1,7 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/flag_descriptions.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/flag_descriptions.cc -@@ -475,7 +475,7 @@ const char kIsolatedSandboxedIframesDescription[] = - "grouping when enabled is per-site."; +@@ -492,7 +492,7 @@ const char kAutofillDisableLocalCardMigrationDescripti + "from checkout flows and from the payment methods settings page."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -9,8 +9,8 @@ const char kAutofillEnableAmountExtractionDesktopName[] = "Enable checkout amount extraction on Chrome desktop"; const char kAutofillEnableAmountExtractionDesktopDescription[] = -@@ -490,7 +490,7 @@ const char kAutofillEnableAndroidNKeyForFidoAuthentica - "authentication when autofilling server credit cards."; +@@ -501,7 +501,7 @@ const char kAutofillEnableAmountExtractionDesktopDescr + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ const char kAutofillEnableBuyNowPayLaterForAffirmName[] = "Enable buy now pay later on Autofill for Affirm"; const char kAutofillEnableBuyNowPayLaterForAffirmDescription[] = -@@ -997,7 +997,7 @@ const char kDevicePostureDescription[] = +@@ -961,7 +961,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -27,25 +27,34 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -3515,7 +3515,7 @@ const char kShowAutofillTypePredictionsDescription[] = - "text."; +@@ -1038,7 +1038,7 @@ const char kCompressionDictionaryTransportRequireKnown + "when the connection is using a well known root cert or when the server is " + "a localhost."; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const char kContextualCueingName[] = "Contextual cueing"; + const char kContextualCueingDescription[] = + "Enables the contextual cueing system to support showing actions"; +@@ -2222,7 +2222,7 @@ const char kContextualPageActionsShareModelDescription + "Enables share model data collection."; #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[] = -@@ -3547,7 +3547,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] + const char kEnableSearchAggregatorPolicyName[] = + "Enable EnterpriseSearchAggregatorSettings policy"; + const char kEnableSearchAggregatorPolicyDescription[] = +@@ -3541,7 +3541,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."; -@@ -3763,7 +3763,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ + const char kPwaNavigationCapturingName[] = "Desktop PWA Link Capturing"; + const char kPwaNavigationCapturingDescription[] = + "Enables opening links from Chrome in an installed PWA. Currently under " +@@ -3785,7 +3785,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ "Force the Translate Triggering on English pages experiment to be enabled " "with the selected language model active."; @@ -53,17 +62,17 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kTranslationAPIName[] = "Experimental translation API"; const char kTranslationAPIDescription[] = - "Eables the on-device language translation API. " -@@ -7824,7 +7824,7 @@ const char kBlinkExtensionDiagnosticsDescription[] = - "Enable the experimental Diagnostics Blink Extension."; - #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) + "Enables the on-device language translation API. " +@@ -7491,7 +7491,7 @@ const char kTetheringExperimentalFunctionalityDescript + + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -8058,7 +8058,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b +@@ -7721,7 +7721,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b // Linux ----------------------------------------------------------------------- @@ -72,7 +81,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -8098,6 +8098,18 @@ const char kWaylandUiScalingDescription[] = +@@ -7767,6 +7767,18 @@ const char kWaylandUiScalingDescription[] = "Enable experimental support for text scaling in the Wayland backend " "backed by full UI scaling. Requires #wayland-per-window-scaling to be " "enabled too."; @@ -91,8 +100,8 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -8110,7 +8122,7 @@ const char kZeroCopyVideoCaptureDescription[] = - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -7779,7 +7791,7 @@ const char kZeroCopyVideoCaptureDescription[] = + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -100,7 +109,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -8127,7 +8139,7 @@ const char kTaskManagerDesktopRefreshDescription[] = +@@ -7805,7 +7817,7 @@ const char kTaskManagerDesktopRefreshDescription[] = "Enables a refreshed design for the Task Manager on Desktop platforms."; #endif // BUILDFLAG(IS_ANDROID) @@ -109,7 +118,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -8159,7 +8171,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7837,7 +7849,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -118,7 +127,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -8314,7 +8326,7 @@ const char kElementCaptureDescription[] = +@@ -7987,7 +7999,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -127,7 +136,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8386,7 +8398,7 @@ const char kComposeUpfrontInputModesDescription[] = +@@ -8043,7 +8055,7 @@ const char kComposeUpfrontInputModesDescription[] = "Enables upfront input modes in the Compose dialog"; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -136,9 +145,9 @@ const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8489,7 +8501,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = - "Enable the os settings for overlay scrollbars on ChromeOS."; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -8178,7 +8190,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = + "Enable the OS settings for overlay scrollbars on ChromeOS."; + #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) diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index f496759fc5b0..6fe5e2c9b413 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,7 +1,7 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/flag_descriptions.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/flag_descriptions.h -@@ -293,7 +293,7 @@ extern const char kImprovedSigninUIOnDesktopName[]; - extern const char kImprovedSigninUIOnDesktopDescription[]; +@@ -310,13 +310,13 @@ extern const char kAutofillDisableLocalCardMigrationNa + extern const char kAutofillDisableLocalCardMigrationDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -9,8 +9,6 @@ extern const char kAutofillEnableAmountExtractionDesktopName[]; extern const char kAutofillEnableAmountExtractionDesktopDescription[]; #endif -@@ -302,7 +302,7 @@ extern const char kAutofillEnableAndroidNKeyForFidoAut - extern const char kAutofillEnableAndroidNKeyForFidoAuthenticationDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -18,7 +16,16 @@ extern const char kAutofillEnableBuyNowPayLaterForAffirmName[]; extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[]; -@@ -737,7 +737,7 @@ extern const char kDevicePostureName[]; +@@ -558,7 +558,7 @@ extern const char kCompactModeId[]; + extern const char kCompactModeName[]; + extern const char kCompactModeDescription[]; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + extern const char kContextualCueingName[]; + extern const char kContextualCueingDescription[]; + #endif // #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -741,7 +741,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -27,25 +34,25 @@ extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -1998,7 +1998,7 @@ extern const char kShowAutofillTypePredictionsName[]; - extern const char kShowAutofillTypePredictionsDescription[]; +@@ -1250,7 +1250,7 @@ extern const char kContextualPageActionsShareModelName + extern const char kContextualPageActionsShareModelDescription[]; #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[]; - -@@ -2020,7 +2020,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] + extern const char kEnableSearchAggregatorPolicyName[]; + extern const char kEnableSearchAggregatorPolicyDescription[]; + #endif +@@ -2036,7 +2036,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[]; - -@@ -2182,7 +2182,7 @@ extern const char kTouchTextEditingRedesignDescription + extern const char kPwaNavigationCapturingName[]; + extern const char kPwaNavigationCapturingDescription[]; + #endif +@@ -2202,7 +2202,7 @@ extern const char kTouchTextEditingRedesignDescription extern const char kTranslateForceTriggerOnEnglishName[]; extern const char kTranslateForceTriggerOnEnglishDescription[]; @@ -54,16 +61,16 @@ extern const char kTranslationAPIName[]; extern const char kTranslationAPIDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -4514,7 +4514,7 @@ extern const char kBlinkExtensionDiagnosticsName[]; - extern const char kBlinkExtensionDiagnosticsDescription[]; - #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -4373,7 +4373,7 @@ extern const char kTetheringExperimentalFunctionalityD + + #endif // #if BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4652,7 +4652,7 @@ extern const char kEnableArmHwdrmDescription[]; +@@ -4508,7 +4508,7 @@ extern const char kEnableArmHwdrmDescription[]; // Linux --------------------------------------------------------------------- @@ -72,7 +79,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4677,6 +4677,9 @@ extern const char kWaylandTextInputV3Description[]; +@@ -4536,6 +4536,9 @@ extern const char kWaylandTextInputV3Description[]; extern const char kWaylandUiScalingName[]; extern const char kWaylandUiScalingDescription[]; @@ -82,7 +89,7 @@ #endif // BUILDFLAG(IS_LINUX) // Random platform combinations ----------------------------------------------- -@@ -4696,7 +4699,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4555,7 +4558,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -91,8 +98,8 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4718,7 +4721,7 @@ extern const char kScreenlockReauthPromoCardDescriptio - // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -4571,7 +4574,7 @@ extern const char kScreenlockReauthCardDescription[]; + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -100,7 +107,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4732,7 +4735,7 @@ extern const char kTaskManagerDesktopRefreshName[]; +@@ -4585,7 +4588,7 @@ extern const char kTaskManagerDesktopRefreshName[]; extern const char kTaskManagerDesktopRefreshDescription[]; #endif // BUILDFLAG(IS_ANDROID) @@ -109,7 +116,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4829,7 +4832,7 @@ extern const char kElementCaptureDescription[]; +@@ -4682,7 +4685,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -118,7 +125,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4880,7 +4883,7 @@ extern const char kComposeUpfrontInputModesName[]; +@@ -4724,7 +4727,7 @@ extern const char kComposeUpfrontInputModesName[]; extern const char kComposeUpfrontInputModesDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -127,9 +134,9 @@ extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -4946,7 +4949,7 @@ extern const char kOverlayScrollbarsOSSettingsName[]; - extern const char kOverlayScrollbarsOSSettingsDescription[]; - #endif +@@ -4805,7 +4808,7 @@ extern const char kEnablePolicyPromotionBannerName[]; + extern const char kEnablePolicyPromotionBannerDescription[]; + #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) diff --git a/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc index b6b58aaf6632..a347de331a30 100644 --- a/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/gcm/gcm_profile_service_factory.cc @@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle // static @@ -9,8 +9,8 @@ // On desktop, incognito profiles are checked with IsIncognitoProfile(). // It's possible for non-incognito profiles to also be off-the-record. bool is_profile_supported = -@@ -132,7 +132,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() - KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( +@@ -132,7 +132,7 @@ std::unique_ptr<KeyedService> + GCMProfileServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc index be0f42e81283..9997aa8703de 100644 --- a/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc @@ -16,7 +16,7 @@ namespace instance_id { // static @@ -9,8 +9,8 @@ // On desktop, the guest profile is actually the primary OTR profile of // the "regular" guest profile. The regular guest profile is never used // directly by users. Also, user are not able to create child OTR profiles -@@ -64,7 +64,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer - KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor( +@@ -65,7 +65,7 @@ std::unique_ptr<KeyedService> + InstanceIDProfileServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc b/www/iridium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc new file mode 100644 index 000000000000..8708fe8fa07b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_glic_launcher_glic__status__icon.cc @@ -0,0 +1,11 @@ +--- chrome/browser/glic/launcher/glic_status_icon.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/glic/launcher/glic_status_icon.cc +@@ -30,7 +30,7 @@ GlicStatusIcon::GlicStatusIcon(GlicController* control + // TODO(crbug.com/382287104): Use correct icon. + // TODO(crbug.com/386839488): Chose color based on system theme. + gfx::ImageSkia status_tray_icon = gfx::CreateVectorIcon(kGlicButtonIcon, +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + SK_ColorWHITE + #else + SK_ColorBLACK diff --git a/www/iridium/files/patch-chrome_browser_global__features.cc b/www/iridium/files/patch-chrome_browser_global__features.cc index 3e627f80f09b..5f22806fd0c1 100644 --- a/www/iridium/files/patch-chrome_browser_global__features.cc +++ b/www/iridium/files/patch-chrome_browser_global__features.cc @@ -1,24 +1,24 @@ ---- chrome/browser/global_features.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/global_features.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/global_features.cc -@@ -10,7 +10,7 @@ - #include "build/build_config.h" - #include "chrome/browser/permissions/system/platform_handle.h" +@@ -21,7 +21,7 @@ + #include "chrome/browser/glic/launcher/glic_background_mode_manager.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) // This causes a gn error on Android builds, because gn does not understand // buildflags, so we include it only on platforms where it is used. - #include "components/user_education/common/user_education_features.h" // nogncheck -@@ -49,7 +49,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( + #include "chrome/browser/ui/webui/whats_new/whats_new_registrar.h" +@@ -60,7 +60,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( void GlobalFeatures::Init() { system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (user_education::features::IsWhatsNewV2()) { - whats_new_registry_ = CreateWhatsNewRegistry(); - } -@@ -61,7 +61,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( + whats_new_registry_ = CreateWhatsNewRegistry(); + #endif + +@@ -79,7 +79,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( return system_permission_settings::PlatformHandle::Create(); } diff --git a/www/iridium/files/patch-chrome_browser_global__features.h b/www/iridium/files/patch-chrome_browser_global__features.h index 8e5c757b08cf..7a8e314c61fe 100644 --- a/www/iridium/files/patch-chrome_browser_global__features.h +++ b/www/iridium/files/patch-chrome_browser_global__features.h @@ -1,15 +1,15 @@ ---- chrome/browser/global_features.h.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/global_features.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/global_features.h -@@ -14,7 +14,7 @@ namespace system_permission_settings { +@@ -14,7 +14,7 @@ + namespace system_permission_settings { class PlatformHandle; } // namespace system_permission_settings - namespace whats_new { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + namespace whats_new { class WhatsNewRegistry; - #endif } // namespace whats_new -@@ -45,7 +45,7 @@ class GlobalFeatures { +@@ -52,7 +52,7 @@ class GlobalFeatures { system_permissions_platform_handle() { return system_permissions_platform_handle_.get(); } @@ -18,7 +18,7 @@ whats_new::WhatsNewRegistry* whats_new_registry() { return whats_new_registry_.get(); } -@@ -60,7 +60,7 @@ class GlobalFeatures { +@@ -77,7 +77,7 @@ class GlobalFeatures { virtual std::unique_ptr<system_permission_settings::PlatformHandle> CreateSystemPermissionsPlatformHandle(); @@ -27,7 +27,7 @@ virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry(); #endif -@@ -70,7 +70,7 @@ class GlobalFeatures { +@@ -87,7 +87,7 @@ class GlobalFeatures { std::unique_ptr<system_permission_settings::PlatformHandle> system_permissions_platform_handle_; @@ -35,4 +35,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<whats_new::WhatsNewRegistry> whats_new_registry_; #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 c7f5ee22de45..a94d8c358456 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 2024-08-27 06:28:16 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -585,7 +585,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_router_discovery_discovery__network__list__wifi__linux.cc b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc index 944eda12c38c..90c5895a8b16 100644 --- a/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc +++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc @@ -1,18 +1,18 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc -@@ -9,7 +9,11 @@ - #include <sys/socket.h> - #include <sys/types.h> +@@ -4,7 +4,11 @@ + + #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h" +#include "build/build_config.h" + +#if !BUILDFLAG(IS_BSD) #include <linux/wireless.h> +#endif - - #include "base/check.h" - #include "base/files/scoped_file.h" -@@ -20,6 +24,7 @@ namespace media_router { + #include <string.h> + #include <sys/ioctl.h> + #include <sys/socket.h> +@@ -19,6 +23,7 @@ namespace media_router { bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { DCHECK(ssid_out); diff --git a/www/iridium/files/patch-chrome_browser_memory__details.cc b/www/iridium/files/patch-chrome_browser_memory__details.cc index 9bd94ca5db71..c769a88fac1b 100644 --- a/www/iridium/files/patch-chrome_browser_memory__details.cc +++ b/www/iridium/files/patch-chrome_browser_memory__details.cc @@ -1,14 +1,5 @@ ---- chrome/browser/memory_details.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/memory_details.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/memory_details.cc -@@ -38,7 +38,7 @@ - #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" - #include "ui/base/l10n/l10n_util.h" - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) - #include "content/public/browser/zygote_host/zygote_host_linux.h" - #endif - @@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { }); } 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 9cd3d054c395..91b7ea6ab584 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,18 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -88,8 +88,10 @@ - - // 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)) -+#if !BUILDFLAG(IS_BSD) - #include <gnu/libc-version.h> -+#endif - - #include "base/linux_util.h" - #include "base/strings/string_split.h" -@@ -113,7 +115,7 @@ +@@ -117,7 +117,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +9,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -122,7 +124,7 @@ +@@ -126,7 +126,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +18,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -870,7 +872,7 @@ void RecordStartupMetrics() { +@@ -896,7 +896,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,8 +27,8 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1182,11 +1184,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt - } +@@ -1211,11 +1211,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt + std::make_unique<web_app::SamplingMetricsProvider>(); #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) 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 b6e2bd382fc6..e102cc83118e 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,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2024-08-01 05:47:53 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h @@ -29,7 +29,7 @@ class PowerMetricsReporter; class ProcessMonitor; @@ -9,8 +9,8 @@ class PressureMetricsReporter; #endif // BUILDFLAG(IS_LINUX) -@@ -119,7 +119,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro - performance_intervention_metrics_reporter_; +@@ -126,7 +126,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro + std::unique_ptr<web_app::SamplingMetricsProvider> web_app_metrics_provider_; #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) 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 e03c2deacdfd..c7c167bead04 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-12-22 12:24:29 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -196,11 +196,11 @@ +@@ -197,11 +197,11 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -14,7 +14,7 @@ #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" #endif -@@ -214,7 +214,7 @@ +@@ -215,7 +215,7 @@ #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" #endif @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/bluetooth_metrics_provider.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -536,7 +536,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -538,7 +538,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -32,8 +32,8 @@ metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -708,7 +708,7 @@ void ChromeMetricsServiceClient::Initialize() { - RegisterUKMProviders(); +@@ -729,7 +729,7 @@ void ChromeMetricsServiceClient::Initialize() { + std::make_unique<metrics::dwa::DwaService>(this, local_state); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,7 +41,7 @@ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -759,7 +759,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -787,7 +787,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -50,7 +50,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -846,7 +846,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -874,7 +874,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) || \ @@ -59,7 +59,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || -@@ -954,7 +954,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -979,7 +979,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -68,7 +68,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1141,7 +1141,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1166,7 +1166,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) || \ @@ -77,7 +77,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1475,7 +1475,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1515,7 +1515,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); 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 78a8fc95194b..c72b8187e6ca 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,4 +1,4 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/metrics/power/process_monitor.cc @@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet process_metrics.GetPlatformIndependentCPUUsage()); @@ -18,7 +18,7 @@ metrics->idle_wakeups *= factor; #endif -@@ -158,7 +158,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc index 0fad01becdbb..18e816193bc2 100644 --- a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -142,7 +142,7 @@ +@@ -145,7 +145,7 @@ #include "chromeos/startup/browser_params_proxy.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -269,7 +269,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet +@@ -272,7 +272,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } @@ -18,7 +18,7 @@ std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( Profile* profile, std::unique_ptr<net::ClientCertStore> platform_store) { -@@ -1141,7 +1141,7 @@ ProfileNetworkContextService::CreateClientCertStore() +@@ -1224,7 +1224,7 @@ ProfileNetworkContextService::CreateClientCertStore() store = std::make_unique<ClientCertStoreLacros>( std::move(certificate_provider), cert_db_initializer, std::move(store)); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc new file mode 100644 index 000000000000..0f71a38fe5c0 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_net_profile__network__context__service__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/net/profile_network_context_service_factory.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/net/profile_network_context_service_factory.cc +@@ -23,7 +23,7 @@ + #include "chrome/browser/net/server_certificate_database_service_factory.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 "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" + #endif + +@@ -66,7 +66,7 @@ ProfileNetworkContextServiceFactory::ProfileNetworkCon + #if BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + DependsOn(net::ServerCertificateDatabaseServiceFactory::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) + DependsOn(client_certificates::CertificateProvisioningServiceFactory:: + GetInstance()); + #endif 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 06e20ade9c65..6fd76a18483c 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,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -102,7 +102,7 @@ @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -517,7 +517,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -531,7 +531,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -575,7 +575,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -589,7 +589,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) -@@ -589,7 +589,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -603,7 +603,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,7 +104,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -660,7 +660,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -674,7 +674,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -113,7 +113,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -685,11 +685,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -699,11 +699,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -127,7 +127,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -742,7 +742,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -756,7 +756,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -136,7 +136,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -965,7 +965,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -975,7 +975,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc index e0296e418187..0d5af2ed56a2 100644 --- a/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc +++ b/www/iridium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "services/network/public/cpp/resource_request.h" namespace { 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 7e8b14545a9c..5b21a81257ba 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,4 +1,4 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2024-06-25 12:08:48 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -32,7 +32,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" #endif -@@ -65,7 +65,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer +@@ -57,7 +57,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer // static void NotificationDisplayServiceImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -18,7 +18,7 @@ registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif } -@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -73,7 +73,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer std::make_unique<PersistentNotificationHandler>()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -27,7 +27,7 @@ AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, std::make_unique<send_tab_to_self::DesktopNotificationHandler>( -@@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 index 182d145e1c86..670fca6be288 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -601,7 +601,7 @@ void ChromePasswordManagerClient:: +@@ -629,7 +629,7 @@ void ChromePasswordManagerClient:: bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( device_reauth::DeviceAuthenticator* authenticator) { #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -846,7 +846,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -894,7 +894,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) PasswordsClientUIDelegate* manage_passwords_ui_controller = PasswordsClientUIDelegateFromWebContents(web_contents()); - manage_passwords_ui_controller->OnKeychainError(); + if (manage_passwords_ui_controller) { 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 7342e609e27a..8a38b293260e 100644 --- a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2024-06-25 12:08:48 UTC +--- chrome/browser/platform_util_linux.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/platform_util_linux.cc -@@ -300,7 +300,9 @@ void OnLaunchOptionsCreated(const std::string& command +@@ -222,7 +222,9 @@ void OnLaunchOptionsCreated(const std::string& command argv.push_back(command); argv.push_back(arg); options.current_directory = working_directory; 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 38ee8fdf5e9a..a14445ff04f9 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-11-04 08:56:03 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -53,7 +53,7 @@ +@@ -60,7 +60,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) -@@ -62,7 +62,7 @@ +@@ -69,7 +69,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) -@@ -93,7 +93,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -109,7 +109,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>(); -@@ -265,7 +265,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -280,7 +280,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 b028268fd299..f6af0837a928 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-12-22 12:24:29 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -247,19 +247,19 @@ +@@ -253,19 +253,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -23,7 +23,7 @@ #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_ANDROID) -@@ -273,13 +273,13 @@ +@@ -279,13 +279,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,10 +36,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/search_engines/enterprise/search_aggregator_policy_handler.h" #include "components/search_engines/enterprise/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_CHROMEOS) -@@ -565,7 +565,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -580,7 +580,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kDefaultDirectSocketsSetting, prefs::kManagedDefaultDirectSocketsSetting, base::Value::Type::INTEGER }, @@ -48,7 +48,7 @@ { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -910,7 +910,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -57,7 +57,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -919,7 +919,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -948,7 +948,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -66,8 +66,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1753,7 +1753,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1788,7 +1788,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::INTEGER}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -75,7 +75,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1812,7 +1812,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1847,7 +1847,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -84,7 +84,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1838,12 +1838,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1873,12 +1873,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -99,16 +99,16 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1851,7 +1851,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kProfileSeparationDomainExceptionList, - base::Value::Type::LIST }, +@@ -1889,7 +1889,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kLiveTranslateEnabled, + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1863,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -117,7 +117,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1964,7 +1964,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2002,7 +2002,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -126,7 +126,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2075,7 +2075,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2107,7 +2107,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -135,7 +135,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2154,7 +2154,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2181,7 +2181,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +144,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2183,7 +2183,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2210,7 +2210,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -153,7 +153,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2250,7 +2250,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -162,7 +162,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2252,7 +2252,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2276,7 +2276,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, @@ -171,7 +171,7 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2394,7 +2394,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2432,7 +2432,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -180,16 +180,16 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2410,7 +2410,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2448,7 +2448,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<SiteSearchPolicyHandler>(chrome_schema)); - -@@ -2623,7 +2623,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + std::make_unique<SearchAggregatorPolicyHandler>(chrome_schema)); + handlers->AddHandler( +@@ -2655,7 +2655,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -198,16 +198,16 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2676,7 +2676,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2708,7 +2708,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + handlers->AddHandler(std::make_unique<GuestModePolicyHandler>()); handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); - handlers->AddHandler( -@@ -2767,7 +2767,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2800,7 +2800,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) || \ @@ -216,7 +216,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -3139,7 +3139,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3167,7 +3167,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -225,7 +225,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -3147,7 +3147,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3175,7 +3175,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -234,7 +234,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3165,7 +3165,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3193,7 +3193,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -243,7 +243,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3188,7 +3188,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3216,7 +3216,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -252,7 +252,7 @@ handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -3212,7 +3212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3234,7 +3234,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails> gen_ai_default_policies; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 d9b2f1bc01f2..d6e90dd32096 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-12-22 12:24:29 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -313,7 +313,7 @@ +@@ -315,7 +315,7 @@ #include "components/user_notes/user_notes_prefs.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -488,18 +488,18 @@ +@@ -485,18 +485,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -534,7 +534,7 @@ +@@ -531,7 +531,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -40,16 +40,16 @@ #include "ui/color/system_theme.h" #endif -@@ -1753,7 +1753,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1819,7 +1819,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) on_device_translation::RegisterLocalStatePrefs(registry); - #endif // BUILDFLAG(IS_ANDROID) + #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1929,7 +1929,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1990,7 +1990,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -58,7 +58,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2286,12 +2286,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2354,12 +2354,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if 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 d9054d3cc802..9fc1d074224a 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 2024-12-22 12:24:29 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -199,7 +199,7 @@ const char* const kPersistentPrefNames[] = { +@@ -209,7 +209,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 435c97ef2578..123c17dfa015 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,4 +1,4 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/printing/print_backend_service_manager.cc @@ -36,7 +36,7 @@ #include "printing/printing_context.h" @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -884,7 +884,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -883,7 +883,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()); -@@ -1061,7 +1061,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1060,7 +1060,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: 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 6622a91875cf..3272db55783f 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,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -349,7 +349,7 @@ +@@ -346,7 +346,7 @@ #include "chrome/browser/profiles/gaia_info_update_service_factory.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -429,18 +429,18 @@ +@@ -436,18 +436,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,16 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" -@@ -700,7 +700,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -559,7 +559,7 @@ + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + + #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/collaboration_messaging_observer_factory.h" + #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || +@@ -730,7 +730,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,7 +49,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -809,7 +809,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -834,7 +834,7 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,7 +58,7 @@ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -@@ -817,25 +817,25 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -842,25 +842,25 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif @@ -80,7 +89,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -958,7 +958,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -988,7 +988,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_ANDROID) MerchantViewerDataManagerFactory::GetInstance(); #endif @@ -89,7 +98,7 @@ metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif NavigationPredictorKeyedServiceFactory::GetInstance(); -@@ -1060,7 +1060,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1100,7 +1100,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -98,7 +107,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1108,7 +1108,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1147,7 +1147,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -107,7 +116,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1127,7 +1127,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1166,7 +1166,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); @@ -116,3 +125,12 @@ reporting::ManualTestHeartbeatEventFactory::GetInstance(); #endif #if !BUILDFLAG(IS_ANDROID) +@@ -1355,7 +1355,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + WebDataServiceFactory::GetInstance(); + webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance(); + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (tab_groups::SavedTabGroupUtils::SupportsSharedTabGroups()) { + tab_groups::CollaborationMessagingObserverFactory::GetInstance(); + } 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 9880d2e084a9..550afacc9551 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-12-22 12:24:29 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -263,6 +263,10 @@ +@@ -267,6 +267,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -573,7 +577,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async +@@ -591,7 +595,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async policy_provider = GetUserCloudPolicyManagerAsh(); #else // !BUILDFLAG(IS_CHROMEOS) { @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -886,7 +890,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -887,7 +891,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { 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 937692d3e701..fbfa615b96b3 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 2024-06-25 12:08:48 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -39,7 +39,7 @@ +@@ -40,7 +40,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" -@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -176,7 +176,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()) { -@@ -177,7 +177,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -199,7 +199,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_safe__browsing_chrome__password__protection__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc index d0f30bfb4f31..89504580acce 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/safe_browsing/chrome_password_protection_service.cc -@@ -1250,7 +1250,7 @@ std::string ChromePasswordProtectionService::GetOrgani +@@ -1251,7 +1251,7 @@ std::string ChromePasswordProtectionService::GetOrgani ReusedPasswordAccountType password_type) const { if (base::FeatureList::IsEnabled( safe_browsing::kEnterprisePasswordReuseUiRefresh)) { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return GetPrefs()->GetString(prefs::kEnterpriseCustomLabel); + return GetPrefs()->GetString(prefs::kEnterpriseCustomLabelForProfile); #else return std::string(); 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 eea014b36055..dcc6604867d9 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,6 +1,6 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #include "net/base/url_util.h" #include "third_party/abseil-cpp/absl/types/variant.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -436,7 +436,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -451,7 +451,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_incident__reporting_incident__reporting__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index f3556472b8fa..abee2141af83 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -699,7 +699,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -697,7 +697,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_safe__browsing__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_safe__browsing__service.cc new file mode 100644 index 000000000000..01772767e97a --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_safe__browsing__service.cc @@ -0,0 +1,20 @@ +--- chrome/browser/safe_browsing/safe_browsing_service.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/safe_browsing/safe_browsing_service.cc +@@ -83,7 +83,7 @@ + #endif + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/browser_window/public/browser_window_features.h" + #include "chrome/browser/ui/toasts/api/toast_id.h" +@@ -572,7 +572,7 @@ void SafeBrowsingServiceImpl::EnhancedProtectionPrefCh + void SafeBrowsingServiceImpl::MaybeShowEnhancedProtectionSettingChangeToast( + Profile* profile) { + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (!base::FeatureList::IsEnabled(safe_browsing::kEsbAsASyncedSetting) || + !profile) { + return; diff --git a/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc b/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc index 63d5d863577a..b817916321a5 100644 --- a/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/iridium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/sessions/session_restore.cc @@ -102,7 +102,7 @@ #include "chrome/browser/web_applications/web_app_registrar.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1093,7 +1093,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1138,7 +1138,7 @@ class SessionRestoreImpl : public BrowserListObserver bool is_first_tab = true; for (const auto& startup_tab : startup_tabs) { const GURL& url = startup_tab.url; diff --git a/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.cc b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.cc new file mode 100644 index 000000000000..6ba598075c09 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.cc @@ -0,0 +1,38 @@ +--- chrome/browser/signin/accounts_policy_manager.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/signin/accounts_policy_manager.cc +@@ -40,7 +40,7 @@ + #include "chrome/browser/ui/webui/profile_helper.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 "components/policy/core/common/features.h" + #include "components/signin/public/identity_manager/accounts_mutator.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -208,7 +208,7 @@ void AccountsPolicyManager::Initialize() { + &AccountsPolicyManager::OnGoogleServicesUsernamePatternChanged, + weak_pointer_factory_.GetWeakPtr())); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_); + identity_manager_observation_.Observe(identity_manager); + profile_pref_change_registrar_.Init(profile_->GetPrefs()); +@@ -223,7 +223,7 @@ void AccountsPolicyManager::Initialize() { + } + + void AccountsPolicyManager::Shutdown() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + profile_pref_change_registrar_.RemoveAll(); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + local_state_pref_registrar_.RemoveAll(); +@@ -340,7 +340,7 @@ void AccountsPolicyManager::OnUserConfirmedProfileDele + } + #endif // defined(TOOLKIT_VIEWS) && !BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void AccountsPolicyManager::OnRefreshTokensLoaded() { + RemoveUnallowedAccounts(); + identity_manager_observation_.Reset(); diff --git a/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.h b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.h new file mode 100644 index 000000000000..5fbd55baca13 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_signin_accounts__policy__manager.h @@ -0,0 +1,29 @@ +--- chrome/browser/signin/accounts_policy_manager.h.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/signin/accounts_policy_manager.h +@@ -13,7 +13,7 @@ + #include "components/signin/public/base/signin_metrics.h" + #include "components/signin/public/identity_manager/identity_manager.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 "base/scoped_observation.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -64,7 +64,7 @@ class AccountsPolicyManager : public KeyedService, + } + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void RemoveUnallowedAccounts(); + + // IdentityManager::Observer implementation. +@@ -85,7 +85,7 @@ class AccountsPolicyManager : public KeyedService, + bool hide_ui_for_testing_ = false; + #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::ScopedObservation<signin::IdentityManager, + signin::IdentityManager::Observer> + identity_manager_observation_{this}; 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 380be1caf5d9..8417220fc817 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 2024-08-01 05:47:53 UTC +--- chrome/browser/signin/signin_util.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/signin/signin_util.cc -@@ -81,7 +81,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour +@@ -82,7 +82,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour CookiesMover::~CookiesMover() = default; void CookiesMover::StartMovingCookies() { diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc index 7beb08bc7c84..f42d62b8b53d 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc -@@ -219,7 +219,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu +@@ -218,7 +218,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu case SupervisedUserNavigationThrottle::kCancelWithInterstitial: { CHECK(navigation_handle()); // LINT.IfChange(cancel_with_interstitial) diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc index c251d8adf0ea..691e86c4f2ef 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/supervised_user_browser_utils.cc @@ -40,7 +40,7 @@ #include "chrome/browser/ash/profiles/profile_helper.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" -@@ -158,7 +158,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool +@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool #endif } 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 index d61619236b54..d40f0143cb3e 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc -@@ -194,7 +194,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte +@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte return; } } @@ -8,4 +8,4 @@ +#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()) { + if (supervised_user:: 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 index 0d9c5dcb954a..18c2f18b2f5e 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc -@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager:: +@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { SetActiveForSupervisedUsers(); UpdateManagementPolicyRegistration(); @@ -9,7 +9,7 @@ MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -475,7 +475,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -471,7 +471,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } 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 index 41705b042687..7a12c8e7af43 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2024-08-01 05:47:53 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.h -@@ -154,7 +154,7 @@ class SupervisedUserExtensionsManager : public Extensi +@@ -153,7 +153,7 @@ class SupervisedUserExtensionsManager : public Extensi // launched. bool ShouldBlockExtension(const std::string& extension_id) const; diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc index 338b29bee4e9..1fd322a8e35a 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc -@@ -32,7 +32,7 @@ +@@ -34,12 +34,12 @@ #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "ui/android/view_android.h" @@ -9,7 +9,13 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -@@ -148,7 +148,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + namespace { + bool IsYouTubeInfrastructureSubframe(content::NavigationHandle* handle) { + if (handle->GetNavigatingFrameType() != content::FrameType::kSubframe) { +@@ -162,7 +162,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc return content::NavigationThrottle::DEFER; } diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc index 5314f300b12c..3febda052a77 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc @@ -14,7 +14,7 @@ #include "components/supervised_user/core/browser/supervised_user_service.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h" #endif -@@ -61,7 +61,7 @@ KeyedService* SupervisedUserMetricsServiceFactory::Bui +@@ -62,7 +62,7 @@ SupervisedUserMetricsServiceFactory::BuildServiceInsta std::unique_ptr<supervised_user::SupervisedUserMetricsService :: SupervisedUserMetricsServiceExtensionDelegate> extensions_metrics_delegate = nullptr; diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc index 40343fc57eec..f7c613f2d9d6 100644 --- a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc +++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc -@@ -213,7 +213,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR +@@ -208,7 +208,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR case kCancelWithInterstitial: { CHECK(navigation_handle()); // LINT.IfChange(cancel_with_interstitial) @@ -9,7 +9,7 @@ if (supervised_user::ShouldShowReAuthInterstitial(*navigation_handle(), is_main_frame)) { // Show the re-authentication interstitial if the user signed out of -@@ -244,7 +244,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR +@@ -239,7 +239,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR } namespace supervised_user { diff --git a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc index 0e62fde86f15..73b507d01fe7 100644 --- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc +++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__controller__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_controller_builder.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/sync/chrome_sync_controller_builder.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/sync/chrome_sync_controller_builder.cc -@@ -324,7 +324,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService +@@ -273,7 +273,7 @@ ChromeSyncControllerBuilder::Build(syncer::SyncService #if BUILDFLAG(ENABLE_SPELLCHECK) // Chrome prefers OS provided spell checkers where they exist. So only sync // the custom dictionary on platforms that typically don't provide one. diff --git a/www/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 8d90b9a8299a..445eb190342f 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/sync/device_info_sync_client_impl.cc -@@ -41,7 +41,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD +@@ -43,7 +43,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD // included in lacros-chrome once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ 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 68c4269fc945..d80d2e29de6f 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,7 +1,7 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -109,7 +109,7 @@ - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -110,7 +110,7 @@ + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" -@@ -157,7 +157,7 @@ syncer::DataTypeSet GetDisabledCommonDataTypes() { +@@ -137,7 +137,7 @@ namespace { tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) { CHECK(profile); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,16 +18,16 @@ tab_groups::TabGroupSyncService* service = tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile); CHECK(service); -@@ -395,7 +395,7 @@ std::unique_ptr<KeyedService> BuildSyncService( - // 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)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +@@ -379,7 +379,7 @@ std::unique_ptr<KeyedService> BuildSyncService( + bool local_sync_backend_enabled = false; + // Only check the local sync backend pref on the supported platforms of + // Windows, Mac and Linux. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled); -@@ -531,7 +531,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -514,7 +514,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc b/www/iridium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc index 7c2c4729d299..162756e1939c 100644 --- a/www/iridium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc -@@ -31,7 +31,7 @@ +@@ -36,7 +36,7 @@ #include "components/sync_device_info/device_info_sync_service.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_desktop.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -89,7 +89,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro +@@ -102,7 +102,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro std::unique_ptr<TabGroupSyncDelegate> delegate; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 561a7395b432..4c3df2a8849f 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -41,7 +41,7 @@ const int kBackgroundRefreshTypesMask = #if BUILDFLAG(IS_WIN) @@ -27,7 +27,7 @@ base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -325,7 +325,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -324,7 +324,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #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 1afc9938f0dc..a572fea66d1c 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,4 +1,4 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -46,7 +46,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, @@ -36,7 +36,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { blocking_pool_runner_->PostTaskAndReplyWithResult( -@@ -150,7 +150,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -153,7 +153,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 47b909ae01e0..738425a2d4cf 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 2024-08-27 06:28:16 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -219,7 +219,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -226,7 +226,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 7ce8493e4f16..e0203a382934 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/iridium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -47,7 +47,7 @@ enum RefreshType { +@@ -50,7 +50,7 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc index b8a9e998100f..8b9d93c7003d 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2022-12-01 10:35:46 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/themes/theme_helper.cc -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ #include "ui/gfx/image/image.h" #include "ui/native_theme/native_theme.h" 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 73a5efce0540..e55c633797e4 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/themes/theme_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/themes/theme_service.cc @@ -70,7 +70,7 @@ #include "extensions/browser/extension_registry_observer.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -328,7 +328,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -330,7 +330,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 23e6ae3a3416..bcfc2f03be68 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,4 +1,4 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -27,11 +27,11 @@ @@ -14,16 +14,16 @@ #include "ui/linux/linux_ui_factory.h" #endif -@@ -106,7 +106,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; - - KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( +@@ -109,7 +109,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; + std::unique_ptr<KeyedService> + ThemeServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* profile) const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) using ThemeService = ThemeServiceAuraLinux; #endif -@@ -120,9 +120,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -123,9 +123,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 367e9434a2f9..a41437b6a2e7 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-12-22 12:24:29 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -513,7 +513,7 @@ +@@ -506,7 +506,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 index e0ed9472de6c..ba3d12fe0c8a 100644 --- 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 @@ -1,20 +1,20 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc @@ -49,7 +49,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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) scoped_observation_.Observe(BrowserList::GetInstance()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) } @@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } --#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 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 index 495ac0fd05b3..8690567d48e9 100644 --- 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 @@ -1,11 +1,11 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2024-08-01 05:47:53 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig 2025-02-22 18:06:53 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/scoped_observation.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list_observer.h" @@ -13,26 +13,26 @@ // 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) public BrowserListObserver, - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // BrowserListObserver: void OnBrowserSetLastActive(Browser* browser) override; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) @@ -136,7 +136,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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::ScopedObservation<BrowserList, BrowserListObserver> scoped_observation_{ this}; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h index 548bdc6c6fd3..1a8ad46bb8cc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser.h +++ b/www/iridium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/browser.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/browser.h -@@ -302,7 +302,7 @@ class Browser : public TabStripModelObserver, +@@ -301,7 +301,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif 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 56bb07058fa9..1c00da0de56b 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-12-22 12:24:29 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -127,7 +127,7 @@ +@@ -126,7 +126,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 -@@ -136,7 +136,7 @@ +@@ -135,7 +135,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h" #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -317,7 +317,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -323,7 +323,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -27,7 +27,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -572,7 +572,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -580,7 +580,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -584,7 +584,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -592,7 +592,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -45,16 +45,25 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -788,7 +788,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -798,7 +798,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 { -@@ -1267,12 +1267,12 @@ void BrowserCommandController::InitCommandState() { + chrome::CreateDesktopShortcutForActiveWebContents(browser_); + #else + web_app::CreateWebAppFromCurrentWebContents( +@@ -970,7 +970,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + case IDC_CHROME_WHATS_NEW: + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ +- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) ++ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + ShowChromeWhatsNew(browser_); + break; + #else +@@ -1285,12 +1285,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -69,12 +78,12 @@ bool use_system_title_bar = true; #if BUILDFLAG(IS_OZONE) use_system_title_bar = ui::OzonePlatform::GetInstance() -@@ -1603,7 +1603,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1634,7 +1634,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { - command_updater_.UpdateCommandEnabled( - IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_)); + command_updater_.UpdateCommandEnabled( + IDC_CREATE_SHORTCUT, shortcuts::CanCreateDesktopShortcut(browser_)); + #else diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc b/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc index f8dde35ed038..b99b6a2a370b 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -2035,7 +2035,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2033,7 +2033,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { 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 index 29029400672e..f5644cbef105 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/browser_ui_prefs.cc @@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); @@ -6,15 +6,15 @@ base::Time()); -#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::kEnterpriseCustomLabel, std::string()); - registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -182,7 +182,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry + registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForBrowser, + std::string()); + registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForBrowser, +@@ -185,7 +185,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()); - registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForProfile, + std::string()); + registry->RegisterStringPref(prefs::kEnterpriseCustomLabelForProfile, 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 c70025bf891b..8750ec307246 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -87,7 +87,7 @@ +@@ -88,7 +88,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -380,7 +380,7 @@ void ShowChromeTips(Browser* browser) { +@@ -383,7 +383,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } @@ -18,7 +18,7 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -726,7 +726,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -735,7 +735,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif // BUILDFLAG(IS_CHROMEOS_ASH) } 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 132bda7692d3..14e479fdc8e5 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/chrome_pages.h @@ -39,7 +39,7 @@ namespace signin { enum class ConsentLevel; @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -176,7 +176,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -175,7 +175,7 @@ void ShowShortcutCustomizationApp(Profile* profile, const std::string& category); #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc b/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc index 7e55d17769ed..358c3f9c1523 100644 --- a/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/managed_ui.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/managed_ui.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/managed_ui.cc -@@ -439,7 +439,7 @@ std::optional<std::string> GetDeviceManagerIdentity() +@@ -442,7 +442,7 @@ std::optional<std::string> GetDeviceManagerIdentity() g_browser_process->platform_part()->browser_policy_connector_ash(); return connector->GetEnterpriseDomainManager(); #else @@ -9,9 +9,9 @@ if (base::FeatureList::IsEnabled( features::kEnterpriseManagementDisclaimerUsesCustomLabel)) { std::string custom_management_label = -@@ -476,7 +476,7 @@ std::optional<std::string> GetAccountManagerIdentity(P - policy::EnterpriseManagementAuthority::CLOUD)) +@@ -481,7 +481,7 @@ std::optional<std::string> GetAccountManagerIdentity(P return std::nullopt; + } -#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-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/iridium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index 0a1ef1f6fc5c..95955da56274 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -97,7 +97,7 @@ namespace { +@@ -99,7 +99,7 @@ namespace { using Logger = autofill::SavePasswordProgressLogger; @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -517,7 +517,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -539,7 +539,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc index ec646ce9fa89..7eb0dbffd636 100644 --- a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,9 +1,9 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2023-01-17 19:19:00 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -176,7 +176,7 @@ std::vector<int> SadTab::GetSubMessages() { - // Only show Incognito suggestion if not already in Incognito mode. - if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) +@@ -179,7 +179,7 @@ std::vector<int> SadTab::GetSubMessages() { + if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) { message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); + } -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Note: on macOS, Linux and ChromeOS, the first bullet is either one of 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 a6f5fa724cf8..78801cecf25b 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,11 +1,11 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -105,7 +105,7 @@ const char* const kBadFlags[] = { +@@ -94,7 +94,7 @@ const char* const kBadFlags[] = { + extensions::switches::kExtensionsOnChromeURLs, + #endif - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. // http://crbug.com/327295 switches::kEnableSpeechDispatcher, 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 f4b11008b277..7f0635cf07eb 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 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -139,7 +139,7 @@ +@@ -134,7 +134,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" -@@ -968,7 +968,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -978,7 +978,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())) { -@@ -1069,7 +1069,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1081,7 +1081,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) && -@@ -1284,7 +1284,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1298,7 +1298,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); @@ -35,4 +35,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If Chrome Apps are deprecated and |app_id| is a Chrome App, display the // deprecation UI instead of launching the app. - if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) + if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) { 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 7d77294e140f..7c4d21a6b1fb 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,7 +1,7 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -85,7 +85,7 @@ - #include "chromeos/startup/browser_params_proxy.h" +@@ -77,7 +77,7 @@ + #include "components/app_restore/full_restore_utils.h" #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -225,7 +225,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -208,7 +208,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; @@ -18,7 +18,7 @@ params.startup_id = command_line_->GetSwitchValueASCII("desktop-startup-id"); #endif -@@ -255,7 +255,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -238,7 +238,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( continue; } 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 index ceb0b5d1d629..fbd9e3922523 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_tab_provider.cc.orig 2024-06-25 12:08:48 UTC +--- chrome/browser/ui/startup/startup_tab_provider.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/startup/startup_tab_provider.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "extensions/browser/extension_registry.h" #endif // !BUILDFLAG(IS_ANDROID) @@ -9,12 +9,12 @@ #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) +@@ -101,7 +101,7 @@ bool ValidateUrl(const GURL& url) { + #endif // BUILDFLAG(IS_CHROMEOS) + + bool url_scheme_is_chrome = false; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if 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 0574b8aeda42..9f63dc5b694b 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -240,7 +240,7 @@ +@@ -231,7 +231,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -718,12 +718,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -690,12 +690,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) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc b/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc index 437d8423758a..66e05a635965 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tabs_features.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/tabs/features.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -48,7 +48,7 @@ BASE_FEATURE(kTabStripCollectionStorage, - bool CanShowTabSearchPositionSetting() { +@@ -59,7 +59,7 @@ bool CanShowTabSearchPositionSetting() { + } // Mac and other platforms will always have the tab search position in the // correct location, cros/linux/win git the user the option to change. -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc deleted file mode 100644 index 1cb41d5422cc..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2022-10-05 07:34:01 UTC -+++ chrome/browser/ui/task_manager/task_manager_columns.cc -@@ -93,7 +93,7 @@ const TableColumnData kColumns[] = { - std::size("100000") * kCharWidth, -1, true, false, false}, - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, - std::size("999") * kCharWidth, -1, true, false, false}, - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h new file mode 100644 index 000000000000..0a0e7b957063 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/task_manager/task_manager_columns.h.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/ui/task_manager/task_manager_columns.h +@@ -278,7 +278,7 @@ inline constexpr std::array kColumns = { + .default_visibility = false}, + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + TableColumnData{.id = IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, + .align = ui::TableColumn::RIGHT, + .width = -1, 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 04e7b34c65d6..3306344bc0ac 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,15 +1,15 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -459,7 +459,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r - ? stringifier_->backgrounded_string() - : stringifier_->foregrounded_string(); +@@ -527,7 +527,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r + ? stringifier_->backgrounded_string() + : stringifier_->foregrounded_string(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -626,7 +626,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -690,7 +690,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -811,7 +811,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -891,7 +891,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; 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 d2edfff4668e..e7c01e63390e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,18 +1,27 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/ui_features.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/ui_features.cc -@@ -104,7 +104,7 @@ BASE_FEATURE(kAccessCodeCastUI, - base::FEATURE_ENABLED_BY_DEFAULT); - #endif +@@ -90,7 +90,7 @@ bool IsExtensionMenuInRootAppMenu() { + return base::FeatureList::IsEnabled(kExtensionsMenuInAppMenu); + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -446,7 +446,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, - "StopLoadingAnimationForHiddenWindow", +@@ -264,7 +264,7 @@ BASE_FEATURE(kTabOrganizationAppMenuItem, base::FEATURE_ENABLED_BY_DEFAULT); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kMultiTabOrganization, + "MultiTabOrganization", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -412,7 +412,7 @@ BASE_FEATURE(kViewsJSAppModalDialog, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kUsePortalAccentColor, 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 27b7ea74461f..aa95780d0909 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.h @@ -1,17 +1,17 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/ui_features.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/ui_features.h -@@ -76,7 +76,7 @@ bool IsExtensionMenuInRootAppMenu(); - BASE_DECLARE_FEATURE(kAccessCodeCastUI); - #endif +@@ -68,7 +68,7 @@ extern const base::FeatureParam<bool> kAppMenuChipColo + BASE_DECLARE_FEATURE(kExtensionsMenuInAppMenu); + bool IsExtensionMenuInRootAppMenu(); -#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(kFewerUpdateConfirmations); #endif -@@ -279,7 +279,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); - - BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWindow); +@@ -244,7 +244,7 @@ BASE_DECLARE_FEATURE(kViewsFirstRunDialog); + BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); + #endif -#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_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 70066be5d572..96a49818235d 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,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -68,11 +68,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -14,7 +14,7 @@ {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_PREVIOUS}, -@@ -104,7 +104,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -100,7 +100,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -156,7 +156,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -152,7 +152,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index de392d1af221..5667ea51e1cd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc -@@ -20,7 +20,7 @@ - #include "ui/gfx/image/image_skia.h" +@@ -19,7 +19,7 @@ + #include "ui/menus/simple_menu_model.h" #include "ui/views/widget/widget.h" -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/shell_integration_linux.h" #endif -@@ -55,7 +55,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni +@@ -49,7 +49,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni const AppWindow::CreateParams& create_params, views::Widget::InitParams* init_params, views::Widget* widget) { 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 18a566fc8f75..eeb723c19690 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,4 +1,4 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -39,7 +39,7 @@ #include "ui/wm/core/wm_state.h" @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -135,7 +135,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 6646dfc44232..ef423a07d165 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,16 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -61,11 +61,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -52,7 +52,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; - // 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) - bool WindowManagerProvidesTitleBar(bool maximized) override; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool WindowManagerProvidesTitleBar(bool maximized) override; gfx::ImageSkia* GetDefaultWindowIcon() const override; #endif - 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 index 75aed55a8bc1..335d6b905440 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/compose/compose_dialog_view.cc -@@ -159,7 +159,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit( +@@ -160,7 +160,7 @@ void ComposeDialogView::OnBeforeBubbleWidgetInit( views::Widget::InitParams* params, views::Widget* widget) const { WebUIBubbleDialogView::OnBeforeBubbleWidgetInit(params, widget); 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 436e6b97d4f2..d1637588cd79 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,7 +1,7 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -55,7 +55,7 @@ - #include "components/user_manager/user_manager.h" +@@ -52,7 +52,7 @@ + #include "ui/aura/window.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -90,7 +90,7 @@ class ThemeChangedObserver : public views::WidgetObser +@@ -87,7 +87,7 @@ class ThemeChangedObserver : public views::WidgetObser }; bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -185,7 +185,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -182,7 +182,7 @@ void BrowserFrame::InitBrowserFrame() { Init(std::move(params)); @@ -27,7 +27,7 @@ SelectNativeTheme(); #else SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi()); -@@ -372,7 +372,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -369,7 +369,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -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() -@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -567,7 +567,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(); -@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -608,7 +608,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 2c3ff3d5e94a..81863218058e 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/browser_frame.h @@ -66,7 +66,7 @@ class BrowserFrame : public views::Widget, public view @@ -9,7 +9,7 @@ // Returns whether the frame is in a tiled state. bool tiled() const { return tiled_; } void set_tiled(bool tiled) { tiled_ = tiled; } -@@ -226,7 +226,7 @@ class BrowserFrame : public views::Widget, public view +@@ -227,7 +227,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; 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 790510e57bb4..e4aa28c99535 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_win.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h" #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h" #include "chrome/browser/ui/views/frame/browser_frame_view_linux_native.h" -@@ -33,7 +33,7 @@ namespace { +@@ -32,7 +32,7 @@ namespace { std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { 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 ad4d4fb27c0e..9ed713bcae65 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,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2367,7 +2367,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra - // CrOS cleanup is done. - // 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)) +@@ -2368,7 +2368,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating + } + + void BrowserView::TabDraggingStatusChanged(bool is_dragging) { +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) contents_web_view_->SetFastResize(is_dragging); if (!is_dragging) { // When tab dragging is ended, we need to make sure the web contents get 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 9ca3c23c0e5f..2ce21c855cdf 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 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -54,7 +54,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,16 +9,16 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -559,7 +559,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -572,7 +572,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT + + OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -578,7 +578,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } @@ -27,7 +27,7 @@ bool OpaqueBrowserFrameView::IsTiled() const { return frame()->tiled(); } -@@ -777,7 +777,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -794,7 +794,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 badc704194dd..d5211b3b8d37 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -111,7 +111,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -110,7 +110,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient FrameButtonStyle GetFrameButtonStyle() const override; void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override; bool ShouldDrawRestoredFrameShadow() const override; @@ -9,7 +9,7 @@ bool IsTiled() const override; #endif int WebAppButtonHeight() const override; -@@ -228,7 +228,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -227,7 +227,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; 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 9f2661c7af03..877d09ee5f1a 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,15 +1,15 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h -@@ -10,7 +10,7 @@ +@@ -9,7 +9,7 @@ + #include "build/build_config.h" - #include "build/chromeos_buildflags.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/base/ui_base_types.h" #endif -@@ -93,7 +93,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { +@@ -92,7 +92,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { // Returns true if a client-side shadow should be drawn for restored windows. virtual bool ShouldDrawRestoredFrameShadow() const = 0; 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 6ab1b01f0c89..21132f1d5419 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #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" -@@ -93,7 +93,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -83,7 +83,7 @@ constexpr int kContentSettingIconSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 34; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -188,7 +188,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -178,7 +178,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -590,7 +590,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -584,7 +584,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } @@ -36,16 +36,16 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -812,7 +812,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( - for (ContentSettingImageView* view : content_setting_views_) +@@ -800,7 +800,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); + } -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -896,7 +896,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -880,7 +880,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1188,7 +1188,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1171,7 +1171,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_) { -@@ -1343,7 +1343,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1326,7 +1326,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,16 +72,16 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1361,7 +1361,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1344,7 +1344,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) + #elif !BUILDFLAG(IS_CHROMEOS) return gfx::Insets(kResizeBorder); -@@ -1382,7 +1382,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1365,7 +1365,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } 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 379a674e63fb..ef934896c0c1 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h -@@ -27,7 +27,7 @@ +@@ -28,7 +28,7 @@ #include "ui/views/layout/flex_layout_view.h" #include "ui/views/widget/widget_observer.h" @@ -9,16 +9,7 @@ #include "ui/linux/window_frame_provider.h" #endif -@@ -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) || - // BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -103,7 +103,7 @@ class PictureInPictureBrowserFrameView +@@ -88,7 +88,7 @@ class PictureInPictureBrowserFrameView void Layout(PassKey) override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -27,7 +18,7 @@ gfx::Insets RestoredMirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -195,7 +195,7 @@ class PictureInPictureBrowserFrameView +@@ -180,7 +180,7 @@ class PictureInPictureBrowserFrameView // Returns true if there's an overlay view that's currently shown. bool IsOverlayViewVisible() const; @@ -36,7 +27,7 @@ // Returns whether a client-side shadow should be drawn for the window. bool ShouldDrawFrameShadow() const; -@@ -376,7 +376,7 @@ class PictureInPictureBrowserFrameView +@@ -351,7 +351,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional<SkColor> current_foreground_color_; 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 e503d3f2c53b..b6de94958bed 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,24 +1,24 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -72,7 +72,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM + + void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { - // 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -97,7 +97,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser + model->AddSeparator(ui::NORMAL_SEPARATOR); + model->AddItemWithStringId(IDC_TASK_MANAGER_CONTEXT_MENU, IDS_TASK_MANAGER); } - // 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -171,7 +171,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -164,7 +164,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } 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 837c0df650c5..8a459ecf4f03 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h" #endif @@ -9,8 +9,8 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -36,7 +36,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( - SystemMenuModelDelegate::~SystemMenuModelDelegate() {} +@@ -33,7 +33,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( + SystemMenuModelDelegate::~SystemMenuModelDelegate() = default; bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { -#if BUILDFLAG(IS_LINUX) @@ -18,12 +18,12 @@ if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); -@@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -53,7 +53,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c + } + bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool is_maximized = browser_->window()->IsMaximized(); switch (command_id) { case IDC_MAXIMIZE_WINDOW: 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 688e7676b6c9..4f79f30a4011 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,11 +1,11 @@ ---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -205,7 +205,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr +@@ -231,7 +231,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr + new_tab_button_->GetViewAccessibility().SetName( + l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB)); - // 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) - // The New Tab Button can be middle-clicked on Linux. - new_tab_button_->SetTriggerableEventFlags( - new_tab_button_->GetTriggerableEventFlags() | +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The New Tab Button can be middle-clicked on Linux. + new_tab_button_->SetTriggerableEventFlags( + new_tab_button_->GetTriggerableEventFlags() | 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 f3c47fc767e4..46dab0cf84df 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-11-04 08:56:03 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -408,7 +408,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -419,7 +419,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 index e577d7596aad..4a0abe4d43ef 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -1989,7 +1989,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -2054,7 +2054,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { 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 index acd5f79b2ba1..2d5810e468aa 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc -@@ -40,7 +40,7 @@ +@@ -42,7 +42,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/views/controls/button/button.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -155,7 +155,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -158,7 +158,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create } else if (model_state == password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) { view = new SharedPasswordsNotificationView(web_contents, anchor_view); 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 index 8c5333310d9f..e34d1087c882 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -89,7 +89,7 @@ +@@ -90,7 +90,7 @@ #include "ui/strings/grit/ui_strings.h" #include "ui/views/accessibility/view_accessibility.h" @@ -9,7 +9,16 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -572,7 +572,7 @@ void ProfileMenuView::BuildIdentity() { +@@ -558,7 +558,7 @@ void ProfileMenuView::SetMenuTitleForAccessibility() { + case signin_util::SignedInState::kSignedOut: + case signin_util::SignedInState::kWebOnlySignedIn: { + 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( +@@ -660,7 +660,7 @@ void ProfileMenuView::BuildIdentity() { badge_image_model, menu_title_, menu_subtitle_, management_label); } else { std::string profile_user_display_name, profile_user_email; 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 0c1658a85e29..8aa2551ce275 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-12-22 12:24:29 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -693,7 +693,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( - image_model, management_badge, this, - ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder); +@@ -640,7 +640,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( + ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder, + /*has_dotted_ring=*/false); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc index 5519e31fdbaa..9003affcd821 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/profiles/profile_picker_view.cc -@@ -88,7 +88,7 @@ - #include "chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.h" +@@ -85,7 +85,7 @@ + #include "chrome/browser/global_keyboard_shortcuts_mac.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ #include "chrome/browser/shell_integration_linux.h" #endif -@@ -118,7 +118,7 @@ class ProfilePickerWidget : public views::Widget { +@@ -115,7 +115,7 @@ class ProfilePickerWidget : public views::Widget { views::Widget::InitParams params( views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); params.delegate = profile_picker_view_; 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 f4cf77093bf2..a9adf3215fe9 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,47 +1,47 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -57,7 +57,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) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780; -@@ -179,7 +179,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -180,7 +180,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom + } + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -338,7 +338,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -339,7 +339,7 @@ SigninViewControllerDelegateViews::SigninViewControlle + SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone)); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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) { -@@ -427,7 +427,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -429,7 +429,7 @@ void SigninViewControllerDelegateViews::DisplayModal() + content_view_->RequestFocus(); } - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -504,7 +504,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -505,7 +505,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati + } + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // static SigninViewControllerDelegate* 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 8f4d26ce02c4..7497e3f09c51 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,20 +1,20 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -74,7 +74,7 @@ class SigninViewControllerDelegateViews + bool show_supervised_user_iph = false); + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -139,7 +139,7 @@ class SigninViewControllerDelegateViews +@@ -138,7 +138,7 @@ class SigninViewControllerDelegateViews + std::optional<int> dialog_width, InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Deletes the ephemeral profile when cancelling the local profile creation // dialog. void DeleteProfileOnCancel(); 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 50c5a0081328..2a6fd78d697b 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,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -626,7 +626,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -633,7 +633,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } 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 30effc7109a0..051d1a12585c 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-12-22 12:24:29 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -215,7 +215,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -213,7 +213,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -13,35 +13,35 @@ // 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) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1021,7 +1021,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -990,7 +990,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon + SetCapture(target_context); + } - // 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) ++#if !BUILDFLAG(IS_LINUX) && !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. -@@ -2085,7 +2085,7 @@ void TabDragController::CompleteDrag() { - } +@@ -2058,7 +2058,7 @@ void TabDragController::CompleteDrag() { + } - // If source window was maximized - maximize the new window as well. + // If source window was maximized - maximize the new window as well. -#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) +#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - // 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 -@@ -2534,7 +2534,7 @@ TabDragController::Liveness TabDragController::GetLoca + // 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 +@@ -2532,7 +2532,7 @@ TabDragController::Liveness TabDragController::GetLoca + } } - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Exclude windows which are pending deletion via Browser::TabStripEmpty(). // These windows can be returned in the Linux Aura port because the browser // window which was used for dragging is not hidden once all of its tabs are 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 52af6f9e464f..1dc2a2db3897 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,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -376,7 +376,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -378,7 +378,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc new file mode 100644 index 000000000000..f3350811a637 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__strip__combo__button.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/tabs/tab_strip_combo_button.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/ui/views/tabs/tab_strip_combo_button.cc +@@ -84,7 +84,7 @@ TabStripComboButton::TabStripComboButton(BrowserWindow + base::BindRepeating(&TabStripComboButton::OnNewTabButtonStateChanged, + base::Unretained(this)))); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The New Tab Button can be middle-clicked on Linux. + new_tab_button->SetTriggerableEventFlags( + new_tab_button->GetTriggerableEventFlags() | ui::EF_MIDDLE_MOUSE_BUTTON); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index 04ebc674cb69..5a6dd0ad2282 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -550,7 +550,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con +@@ -552,7 +552,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con if (!IsHoverAnimationActive()) { return base_opacity; } diff --git a/www/iridium/files/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc new file mode 100644 index 000000000000..4ae16cbd0fcf --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_task__manager__search__bar__view.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/task_manager_search_bar_view.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/ui/views/task_manager_search_bar_view.cc +@@ -27,7 +27,7 @@ TaskManagerSearchBarView::TaskManagerSearchBarView( + const gfx::Insets& margins, + Delegate& delegate) + : delegate_(delegate) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + , + textfield_placeholder_color_id_(kColorTaskManagerSearchBarPlaceholderText) + #endif 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 index b1b49b7421d8..bce75a7a091c 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -845,7 +845,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -893,7 +893,7 @@ void MaybeRegisterChromeFeaturePromos( "defaulted to saved for the first time."))); } @@ -9,7 +9,7 @@ // kIPHSupervisedUserProfileSigninFeature registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( -@@ -1085,7 +1085,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1134,7 +1134,7 @@ void MaybeRegisterChromeFeaturePromos( "Triggered to inform users of the availability of the " "new translate screen feature on the Lens Overlay."))); 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 4fecb2d34712..afae9e12f63b 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,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -516,7 +516,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -504,7 +504,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2109,7 +2109,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2051,7 +2051,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3452,7 +3452,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3371,7 +3371,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())); @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3467,7 +3467,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3386,7 +3386,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -36,7 +36,7 @@ ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3477,7 +3477,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3396,7 +3396,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3493,7 +3493,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3412,7 +3412,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4310,7 +4310,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4232,7 +4232,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override().GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4510,7 +4510,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4432,7 +4432,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override().IsShortcutCreated(profile, id, name); -@@ -4554,7 +4554,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4476,7 +4476,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } 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 d3c8718ec6a8..c8f028ad663b 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/web_applications/web_app_dialogs.h -@@ -22,7 +22,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gfx/native_widget_types.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || 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 index 360fe4ddca8a..6bc69902e9aa 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc -@@ -583,7 +583,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun +@@ -518,7 +518,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun Browser* browser, Profile* profile, const std::string& app_id) { @@ -9,12 +9,12 @@ WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); CHECK(provider); -@@ -809,7 +809,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( +@@ -747,7 +747,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, + + const base::Feature& GetPromoFeatureEngagementFromBrowser( + const Browser* browser) { 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 index 772e19abdcc7..78ec2605623e 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h -@@ -227,7 +227,7 @@ class WebAppUiManagerImpl : public BrowserListObserver +@@ -224,7 +224,7 @@ class WebAppUiManagerImpl : public BrowserListObserver UninstallCompleteCallback uninstall_complete_callback, webapps::UninstallResultCode uninstall_code); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.cc index df6ee224b988..b3cecea054a9 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_about_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/about_ui.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/webui/about/about_ui.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/about/about_ui.cc -@@ -596,7 +596,7 @@ std::string ChromeURLs(content::BrowserContext* browse +@@ -500,7 +500,7 @@ std::string ChromeURLs(content::BrowserContext* browse return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -629,7 +629,7 @@ TermsUIConfig::TermsUIConfig() +@@ -542,7 +542,7 @@ TermsUIConfig::TermsUIConfig() : AboutUIConfigBase(chrome::kChromeUITermsHost) {} #endif @@ -18,7 +18,7 @@ LinuxProxyConfigUI::LinuxProxyConfigUI() : AboutUIConfigBase(chrome::kChromeUILinuxProxyConfigHost) {} #endif -@@ -681,7 +681,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -594,7 +594,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h index 41e723ab0ead..81fb2a04ddb3 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h +++ b/www/iridium/files/patch-chrome_browser_ui_webui_about_about__ui.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about/about_ui.h.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/ui/webui/about/about_ui.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/about/about_ui.h -@@ -50,7 +50,7 @@ class TermsUIConfig : public AboutUIConfigBase { +@@ -55,7 +55,7 @@ class TermsUIConfig : public AboutUIConfigBase { }; #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc index 6c47ef2cfdc9..f9fd13b260dd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc -@@ -162,7 +162,7 @@ CertificateManagerPageHandler::GetCertSource( - "distrusted_certs", - cert_verifier::mojom::CertificateTrust::kDistrusted); +@@ -216,7 +216,7 @@ CertificateManagerPageHandler::GetCertSource( + CERTIFICATE_TRUST_TYPE_DISTRUSTED, + profile_, &remote_client_); break; -#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-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index e2c47c4434ea..2c79af42062c 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc -@@ -51,7 +51,7 @@ +@@ -54,7 +54,7 @@ #include "net/ssl/client_cert_store_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,16 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -195,7 +195,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC +@@ -177,7 +177,7 @@ class ClientCertStoreFactoryMac : public ClientCertSto + }; + #endif + +-#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + std::unique_ptr<ClientCertStoreLoader> CreatePlatformClientCertLoader( + Profile* profile) { + #if BUILDFLAG(IS_WIN) +@@ -192,7 +192,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC } #endif @@ -18,7 +27,25 @@ // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -1056,7 +1056,7 @@ CreatePlatformClientCertSource( +@@ -350,7 +350,7 @@ class ClientCertSource : public CertificateManagerPage + std::optional<net::CertificateList> certs_; + }; + +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // ChromeOS currently can use either Kcer or NSS for listing client certs, and + // Linux uses NSS only. This interface provides an abstraction to hide that + // from WritableClientCertSource. Currently this class only handles reading +@@ -1057,7 +1057,7 @@ CreatePlatformClientCertSource( + mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>* + remote_client, + Profile* profile) { +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return std::make_unique<WritableClientCertSource>(remote_client, profile); + #else + return std::make_unique<ClientCertSource>( +@@ -1065,7 +1065,7 @@ CreatePlatformClientCertSource( #endif } @@ -27,3 +54,12 @@ std::unique_ptr<CertificateManagerPageHandler::CertSource> CreateProvisionedClientCertSource(Profile* profile) { return std::make_unique<ClientCertSource>( +@@ -1116,7 +1116,7 @@ bool ClientCertManagementAccessControls::IsChangeAllow + + return client_cert_policy_ == ClientCertificateManagementPermission::kAll; + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ClientCertManagementAccessControls::ClientCertManagementAccessControls( + Profile* profile) {} + diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h index 7e798df6e704..1c958a0368f6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h +++ b/www/iridium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h @@ -19,7 +19,7 @@ CreatePlatformClientCertSource( remote_client, @@ -9,3 +9,12 @@ std::unique_ptr<CertificateManagerPageHandler::CertSource> CreateProvisionedClientCertSource(Profile* profile); #endif +@@ -29,7 +29,7 @@ std::unique_ptr<CertificateManagerPageHandler::CertSou + CreateExtensionsClientCertSource(Profile* profile); + #endif + +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class ClientCertManagementAccessControls { + public: + enum KeyStorage { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc index 0253da8cbba0..8df290becf38 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -1,14 +1,9 @@ ---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -135,30 +135,30 @@ +@@ -140,26 +140,26 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -#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" @@ -36,7 +31,7 @@ #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -194,7 +194,7 @@ +@@ -190,7 +190,7 @@ #include "chrome/browser/ui/webui/signin/signin_error_ui.h" #endif // !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) @@ -45,25 +40,16 @@ #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -315,14 +315,14 @@ void RegisterChromeWebUIConfigs() { - map.AddWebUIConfig(std::make_unique<WebuiGalleryUIConfig>()); - #endif // BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +@@ -323,7 +323,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || -- // BUILDFLAG(IS_OPENBSD) -+ // BUILDFLAG(IS_BSD) - - #if BUILDFLAG(ENABLE_EXTENSIONS) - map.AddWebUIConfig(std::make_unique<extensions::ExtensionsUIConfig>()); -@@ -344,7 +344,7 @@ void RegisterChromeWebUIConfigs() { + // BUILDFLAG(IS_OPENBSD) +@@ -348,7 +348,7 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>()); #endif // BUILDFLAG(IS_WIN) @@ -72,7 +58,7 @@ map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>()); map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>()); map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>()); -@@ -352,20 +352,20 @@ void RegisterChromeWebUIConfigs() { +@@ -356,20 +356,20 @@ void RegisterChromeWebUIConfigs() { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 91d361f1a425..722ea766f0f6 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-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -130,16 +130,16 @@ +@@ -114,16 +114,16 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -20,17 +20,17 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -465,7 +465,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: - if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) +@@ -404,7 +404,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return NewTabPageUI::GetFaviconResourceBytes(scale_factor); + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) + if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) { return WhatsNewUI::GetFaviconResourceBytes(scale_factor); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -493,7 +493,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: - return ManagementUI::GetFaviconResourceBytes(scale_factor); + } +@@ -438,7 +438,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: + } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc index 7de258b1a1f0..1bedf5d771d6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -74,7 +74,7 @@ +@@ -75,7 +75,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" -@@ -396,7 +396,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa +@@ -400,7 +400,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa kRequestUrl)); } @@ -18,7 +18,7 @@ std::unique_ptr<SupervisedUserVerificationPageForYouTube> CreateSupervisedUserVerificationPageForYouTube( content::WebContents* web_contents, -@@ -613,7 +613,7 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -621,7 +621,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); 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 73bbe00f5a8c..a7d755f09fe9 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,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -185,11 +185,11 @@ void ManagementUI::GetLocalizedStrings( +@@ -173,11 +173,11 @@ void ManagementUI::GetLocalizedStrings( IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS}, #endif // BUILDFLAG(IS_CHROMEOS) 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 index ea834359b26f..b96ee42f7a54 100644 --- 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 @@ -1,8 +1,8 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/management/management_ui_constants.h -@@ -8,14 +8,14 @@ +@@ -7,14 +7,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) 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 dfce9ac2c793..37b6e6a6ed64 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,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -58,7 +58,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #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) -@@ -349,7 +349,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -348,7 +348,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } @@ -18,7 +18,7 @@ auto device_signal_data = GetDeviceSignalGrantedMessage(); if (!device_signal_data.empty()) { report_sources->Append(std::move(device_signal_data)); -@@ -371,7 +371,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -370,7 +370,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } @@ -27,7 +27,7 @@ auto device_signal_data = GetDeviceSignalGrantedMessage(); if (!device_signal_data.empty()) { report_sources->Append(std::move(device_signal_data)); -@@ -561,7 +561,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -550,7 +550,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 24e957fa8dd5..e0e8a9191fab 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,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.h -@@ -31,7 +31,7 @@ namespace policy { +@@ -30,7 +30,7 @@ namespace policy { class PolicyService; } // namespace policy @@ -9,7 +9,7 @@ namespace device_signals { class UserPermissionService; } // namespace device_signals -@@ -72,7 +72,7 @@ class ManagementUIHandler : public content::WebUIMessa +@@ -71,7 +71,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_password__manager_promo__cards__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc index 481ef13b1365..287592567d88 100644 --- 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 @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2025-02-22 18:06:53 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" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h" #endif -@@ -81,7 +81,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge +@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge .get())); #endif 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 index 9132736543f4..ec00f42e46dc 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc -@@ -108,7 +108,7 @@ const char* kMacShareIconResourceName = +@@ -111,7 +111,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) const char* kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share.svg"; @@ -9,7 +9,7 @@ const char* kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share.svg"; #else -@@ -168,7 +168,7 @@ static void DefineChromeRefreshRealboxIcons() { +@@ -171,7 +171,7 @@ static void DefineChromeRefreshRealboxIcons() { #elif BUILDFLAG(IS_WIN) kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share_cr23.svg"; @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -653,7 +653,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -607,7 +607,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } 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 90af9ba86473..4da13061f99f 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 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -148,7 +148,7 @@ +@@ -141,7 +141,7 @@ #include "chrome/browser/ui/chrome_pages.h" #endif --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/display/screen.h" #endif -@@ -167,7 +167,7 @@ +@@ -160,7 +160,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -292,7 +292,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -281,7 +281,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -27,7 +27,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -548,7 +548,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -563,7 +563,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, @@ -36,21 +36,21 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -556,7 +556,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -571,7 +571,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -595,7 +595,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + html_source->AddBoolean("toolbarPinningEnabled", + features::IsToolbarPinningEnabled()); - // 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index e6145b9fbb41..39b269bb8e7c 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc -@@ -209,7 +209,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr - +@@ -198,7 +198,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr + IDS_PROFILE_PICKER_PROFILE_CARD_LABEL, local_profile_name); if (AccountInfo::IsManaged(entry->GetHostedDomain())) { profile_entry.Set("avatarBadge", "cr:domain"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ } else if (base::FeatureList::IsEnabled( supervised_user::kShowKiteForSupervisedUsers) && entry->IsSupervised()) { -@@ -1211,7 +1211,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil +@@ -1066,7 +1066,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil } void ProfilePickerHandler::MaybeUpdateGuestMode() { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc b/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc index 813e49b2dd1c..99f287b6274f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_user__education__internals_user__education__internals__page__handler__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc.orig 2024-12-22 12:24:29 UTC -+++ chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc -@@ -44,7 +44,7 @@ +--- chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/browser/ui/webui/user_education_internals/user_education_internals_page_handler_impl.cc +@@ -45,7 +45,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "net/base/url_util.h" -@@ -84,7 +84,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( +@@ -85,7 +85,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( } whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { @@ -18,7 +18,7 @@ return g_browser_process->GetFeatures()->whats_new_registry(); #else return nullptr; -@@ -767,7 +767,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats +@@ -794,7 +794,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats } void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() { 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 3a4d293fd956..57ba0fa664fb 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 2024-12-22 12:24:29 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -214,7 +214,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -220,7 +220,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index 219402314f99..6f20ecb75de9 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc -@@ -649,7 +649,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu +@@ -626,7 +626,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } 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 aa30cdd31b2f..d52fa37d2109 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 2024-11-04 08:56:03 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc @@ -71,7 +71,7 @@ namespace { @@ -9,7 +9,7 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -251,7 +251,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout +@@ -253,7 +253,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout // TODO(crbug.com/40257107): Implement tests on Linux for using shortcuts_menu // actions. diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index a2318e429572..7349b0085eeb 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2024-02-04 14:46:08 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" @@ -9,10 +9,10 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -70,7 +70,7 @@ struct ShortcutInfo { - std::set<std::string> file_handler_extensions; - std::set<std::string> file_handler_mime_types; - std::set<std::string> protocol_handlers; +@@ -75,7 +75,7 @@ struct ShortcutInfo { + // the installed PWA experience and thus the icons are not designed to be + // displayed on an OS dock. + bool is_diy_app = false; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::set<DesktopActionInfo> actions; 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 fc9c2bbce747..e38ea184cba3 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,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc @@ -45,7 +45,7 @@ #include "third_party/skia/include/core/SkBitmap.h" @@ -16,9 +16,9 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Performs a blocking read of app icons from the disk. - SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager, - const webapps::AppId& app_id, -@@ -265,7 +265,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor + std::optional<SkBitmap> IconManagerReadIconForSize( + WebAppIconManager& icon_manager, +@@ -315,7 +315,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); @@ -27,7 +27,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -313,7 +313,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -362,7 +362,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -327,7 +327,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -376,7 +376,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const webapps::AppId& app_id, const std::string& app_name) { @@ -45,7 +45,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -383,7 +383,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -431,7 +431,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); @@ -54,16 +54,16 @@ base::FilePath user_applications_dir = applications(); bool database_update_called = false; for (const LinuxFileRegistration& command : linux_file_registration_) { -@@ -426,7 +426,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC +@@ -481,7 +481,7 @@ std::optional<SkBitmap> OsIntegrationTestOverrideImpl: return std::nullopt; } - return GetIconTopLeftColorFromShortcutFile(shortcut_path); + return GetIconFromShortcutFile(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 std::nullopt; -@@ -476,7 +476,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort +@@ -547,7 +547,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -72,7 +72,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -501,7 +501,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -572,7 +572,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -81,7 +81,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -694,7 +694,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -764,7 +764,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) @@ -90,7 +90,7 @@ base::FilePath OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -745,7 +745,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -815,7 +815,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri success = chrome_apps_folder_.CreateUniqueTempDirUnderPath( outer_temp_dir_.GetPath()); CHECK(success); @@ -99,7 +99,7 @@ success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); CHECK(success); success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); -@@ -758,7 +758,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -828,7 +828,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri CHECK(success); #endif @@ -108,7 +108,7 @@ auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -830,7 +830,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -900,7 +900,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr EXPECT_TRUE(!startup_.IsValid() || startup_.Delete()); #elif BUILDFLAG(IS_MAC) EXPECT_TRUE(!chrome_apps_folder_.IsValid() || DeleteChromeAppsDir()); 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 169e95fcf3ec..4a871dbfaf34 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,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h @@ -40,7 +40,7 @@ class ShellLinkItem; @@ -18,7 +18,7 @@ bool DeleteDesktopDirOnLinux(); #endif // BUILDFLAG(IS_LINUX) -@@ -241,7 +241,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -250,7 +250,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::FilePath chrome_apps_folder() override; void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) override; @@ -27,7 +27,7 @@ base::FilePath desktop(); base::FilePath startup(); base::FilePath applications(); -@@ -321,7 +321,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -323,7 +323,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::ScopedTempDir chrome_apps_folder_; std::map<base::FilePath, bool> startup_enabled_; 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 index 70bc40e5fa30..a1f35d926213 100644 --- 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 @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/web_app_helpers.cc.orig 2024-06-25 12:08:48 UTC +--- chrome/browser/web_applications/web_app_helpers.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/web_applications/web_app_helpers.cc @@ -145,7 +145,7 @@ bool IsValidWebAppUrl(const GURL& app_url) { return false; @@ -8,4 +8,4 @@ +#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 = + allow_extension_apps = false; 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 2c5f04b78a0b..a4be3a78d312 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,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_install_info.h.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/web_applications/web_app_install_info.h.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/web_applications/web_app_install_info.h -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ #include "url/gurl.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || 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 beb721d45ccc..836b64e426d6 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-12-22 12:24:29 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -1166,7 +1166,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -631,7 +631,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 index 900d3dcbb9f4..76abbfc40df9 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -693,7 +693,7 @@ base::flat_set<std::string> GetGaiaIDs( +@@ -686,7 +686,7 @@ base::flat_set<GaiaId> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return label; #else return std::string("placeholder"); -@@ -703,7 +703,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -696,7 +696,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) || \ diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index 828707d73af9..49b289e7f0d7 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.cc +++ b/www/iridium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/common/chrome_features.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/common/chrome_features.cc -@@ -83,7 +83,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, +@@ -75,7 +75,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -101,7 +101,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -93,7 +93,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -273,7 +273,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -226,7 +226,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -305,7 +305,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -252,7 +252,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -867,7 +867,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -788,7 +788,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -880,7 +880,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -801,7 +801,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 a836268985c6..c821af6370b4 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.h +++ b/www/iridium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2024-12-22 12:24:29 UTC +--- chrome/common/chrome_features.h.orig 2025-02-22 18:06:53 UTC +++ chrome/common/chrome_features.h -@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); +@@ -55,13 +55,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -179,7 +179,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -155,7 +155,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -503,7 +503,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -465,7 +465,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -511,7 +511,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -473,7 +473,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 44ad8d8d8760..a760084652de 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-12-22 12:24:29 UTC +--- chrome/common/chrome_paths.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/common/chrome_paths.cc @@ -30,7 +30,7 @@ #include "base/apple/foundation_util.h" @@ -20,14 +20,14 @@ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); -+ FILE_PATH_LITERAL("/usr/local/share/iridium/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); -+ FILE_PATH_LITERAL("/usr/local/share/iridium/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -219,7 +219,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -221,7 +221,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -36,16 +36,16 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -535,7 +535,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - } +@@ -527,7 +527,7 @@ bool PathProvider(int key, base::FilePath* result) { break; + } + #endif -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) case chrome::DIR_POLICY_FILES: { cur = base::FilePath(policy::kPolicyPath); break; -@@ -546,7 +546,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -538,7 +538,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; -@@ -555,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -547,7 +547,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -593,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -585,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #if BUILDFLAG(ENABLE_EXTENSIONS) && \ @@ -72,27 +72,13 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -605,11 +605,21 @@ bool PathProvider(int key, base::FilePath* result) { - #endif - #else // BUILDFLAG(IS_MAC) +@@ -599,6 +599,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -+#if BUILDFLAG(IS_FREEBSD) cur = base::FilePath( -- FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); -+ FILE_PATH_LITERAL("/usr/local/etc/iridium/native-messaging-hosts")); + FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); ++#elif BUILDFLAG(IS_FREEBSD) ++ cur = base::FilePath(FILE_PATH_LITERAL( ++ "/usr/local/etc/iridium-browser/native-messaging-hosts")); #else cur = base::FilePath( -- FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); -+ FILE_PATH_LITERAL("/etc/iridium/native-messaging-hosts")); -+#endif -+#else -+#if BUILDFLAG(IS_FREEBSD) -+ cur = base::FilePath( -+ FILE_PATH_LITERAL("/usr/local/etc/iridium/native-messaging-hosts")); -+#else -+ cur = base::FilePath( -+ FILE_PATH_LITERAL("/etc/iridium/native-messaging-hosts")); -+#endif - #endif - #endif // !BUILDFLAG(IS_MAC) - break; + FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.h b/www/iridium/files/patch-chrome_common_chrome__paths.h index 42b86424f993..4f99a3caf4ba 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 2024-06-25 12:08:48 UTC +--- chrome/common/chrome_paths.h.orig 2025-02-22 18:06:53 UTC +++ chrome/common/chrome_paths.h -@@ -59,7 +59,7 @@ enum { +@@ -62,7 +62,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 -@@ -67,7 +67,7 @@ enum { +@@ -70,7 +70,7 @@ enum { // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -126,7 +126,7 @@ enum { +@@ -117,7 +117,7 @@ enum { #endif #if BUILDFLAG(ENABLE_EXTENSIONS) && \ diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index c890b74fc58d..5a6f450eab23 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_switches.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/common/chrome_switches.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/common/chrome_switches.cc @@ -892,7 +892,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif @@ -9,8 +9,8 @@ const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. -@@ -902,7 +902,7 @@ const char kGuest[] = "guest"; - const char kForceNtpMobilePromo[] = "force-ntp-mobile-promo"; +@@ -908,7 +908,7 @@ const char kGlicGuestURL[] = "glic-guest-url"; + const char kCSPOverride[] = "glic-webui-csp-override"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index e62e627c3fd4..07e0658c4f90 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.h +++ b/www/iridium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2024-12-22 12:24:29 UTC +--- chrome/common/chrome_switches.h.orig 2025-02-22 18:06:53 UTC +++ chrome/common/chrome_switches.h -@@ -277,13 +277,13 @@ extern const char kAllowNaClSocketAPI[]; +@@ -278,7 +278,7 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,6 +9,8 @@ extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; extern const char kForceNtpMobilePromo[]; +@@ -289,7 +289,7 @@ extern const char kGlicGuestURL[]; + extern const char kCSPOverride[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-chrome_common_extensions_extension__constants.cc b/www/iridium/files/patch-chrome_common_extensions_extension__constants.cc new file mode 100644 index 000000000000..2e27eeef305f --- /dev/null +++ b/www/iridium/files/patch-chrome_common_extensions_extension__constants.cc @@ -0,0 +1,11 @@ +--- chrome/common/extensions/extension_constants.cc.orig 2025-02-22 18:06:53 UTC ++++ chrome/common/extensions/extension_constants.cc +@@ -46,7 +46,7 @@ const char* const kBuiltInFirstPartyExtensionIds[] = { + #if !BUILDFLAG(IS_CHROMEOS_LACROS) + kReadingModeGDocsHelperExtensionId, + #endif // !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + kTTSEngineExtensionId, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + nullptr, // Null-terminated array. diff --git a/www/iridium/files/patch-chrome_common_extensions_extension__constants.h b/www/iridium/files/patch-chrome_common_extensions_extension__constants.h new file mode 100644 index 000000000000..708101a21765 --- /dev/null +++ b/www/iridium/files/patch-chrome_common_extensions_extension__constants.h @@ -0,0 +1,11 @@ +--- chrome/common/extensions/extension_constants.h.orig 2025-02-22 18:06:53 UTC ++++ chrome/common/extensions/extension_constants.h +@@ -332,7 +332,7 @@ inline constexpr base::FilePath::CharType + kReadingModeGDocsHelperManifestFilename[] = + FILE_PATH_LITERAL("reading_mode_gdocs_helper_manifest.json"); + #endif // !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // The extension id of the google tts engine extension to use on-device natural + // Google voices. + inline constexpr char kTTSEngineExtensionId[] = diff --git a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc index 5e89b583ca02..8f389574c4bc 100644 --- a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -1,4 +1,4 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/common/media/cdm_host_file_path.cc @@ -90,7 +90,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, @@ -8,4 +8,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath chrome_exe_dir; - if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) + if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) { diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index 251d23206765..14bb78cf6391 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2024-12-22 12:24:29 UTC +--- chrome/common/pref_names.h.orig 2025-02-22 18:06:53 UTC +++ chrome/common/pref_names.h -@@ -1387,7 +1387,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1356,7 +1356,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1564,7 +1564,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1533,7 +1533,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"; -@@ -2176,7 +2176,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2147,7 +2147,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 -@@ -2619,14 +2619,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2608,14 +2608,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,16 +44,16 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2704,7 +2704,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM - inline constexpr char kBasicAuthOverHttpEnabled[] = - "auth.basic_over_http_enabled"; +@@ -2707,7 +2707,7 @@ inline constexpr char kIsolatedWebAppInstallForceList[ + inline constexpr char kIsolatedWebAppPendingInitializationCount[] = + "profile.isolated_web_app.install.pending_initialization_count"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3245,7 +3245,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3236,7 +3236,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3836,7 +3836,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3834,7 +3834,7 @@ inline constexpr char kScreenCaptureWithoutGestureAllo inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -4103,7 +4103,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -4030,7 +4030,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -80,7 +80,7 @@ // A dict mapping the edition name with the major version it was shown. inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; // A list containing the features of each module in order of when they -@@ -4197,7 +4197,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4124,7 +4124,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h index 9e52e98288e8..895aad4daf75 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.h +++ b/www/iridium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2024-12-22 12:24:29 UTC +--- chrome/common/url_constants.h.orig 2025-02-22 18:06:53 UTC +++ chrome/common/url_constants.h -@@ -950,7 +950,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -981,7 +981,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook?p=multidevice"; 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 904230b5c8a6..af7b7af19343 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc @@ -1,16 +1,12 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/common/webui_url_constants.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/common/webui_url_constants.cc -@@ -197,21 +197,21 @@ base::span<const base::cstring_view> ChromeURLHosts() +@@ -192,18 +192,18 @@ base::span<const base::cstring_view> ChromeURLHosts() 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) + kChromeUIConnectorsInternalsHost, kChromeUIDiscardsHost, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -26,12 +22,3 @@ kChromeUISandboxHost, #endif #if BUILDFLAG(IS_WIN) -@@ -284,7 +284,7 @@ base::span<const base::cstring_view> ChromeDebugURLs() - blink::kChromeUIGpuJavaCrashURL, - kChromeUIJavaCrashURL, - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIWebUIJsErrorURL, - #endif - kChromeUIQuitURL, 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 7d218eadfd8f..cbca3193f7ea 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,18 +1,11 @@ ---- chrome/common/webui_url_constants.h.orig 2024-12-22 12:24:29 UTC +--- chrome/common/webui_url_constants.h.orig 2025-02-22 18:06:53 UTC +++ chrome/common/webui_url_constants.h -@@ -578,24 +578,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy - inline constexpr char kOsUIVersionURL[] = "os://version"; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - inline constexpr char kChromeUIWebUIJsErrorHost[] = "webuijserror"; - inline constexpr char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; - #endif +@@ -497,18 +497,18 @@ inline constexpr char kChromeUIOsUrlAppURL[] = "chrome + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; #endif @@ -29,7 +22,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -607,13 +607,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -520,11 +520,11 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,14 +31,12 @@ inline constexpr char kChromeUISandboxHost[] = "sandbox"; #endif - // 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) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; -@@ -635,7 +635,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue + inline constexpr char kChromeUIIntroDefaultBrowserSubPage[] = "default-browser"; +@@ -545,7 +545,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif 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 60dd80419c64..3779fe489da1 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,4 +1,4 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2024-08-27 06:28:16 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/services/printing/print_backend_service_impl.cc @@ -50,7 +50,7 @@ #include "printing/backend/cups_connection_pool.h" @@ -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()); -@@ -470,7 +470,7 @@ void PrintBackendServiceImpl::Init( +@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -36,7 +36,7 @@ // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -691,7 +691,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc index a97ec528e8b8..9d1d3df1ab7d 100644 --- a/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc -@@ -251,7 +251,7 @@ TEST(KeyConverter, ToggleModifiers) { +@@ -252,7 +252,7 @@ TEST(KeyConverter, ToggleModifiers) { CheckEventsReleaseModifiers(keys, key_events); } @@ -9,12 +9,12 @@ // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else -@@ -308,7 +308,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { +@@ -310,7 +310,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); - const char kTextForKeys[] = { + const auto kTextForKeys = std::to_array<char>({ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, + 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, #else - 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, diff --git a/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc b/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc index d59ffabde329..a4c27f190086 100644 --- a/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc +++ b/www/iridium/files/patch-chrome_updater_app_app__uninstall.cc @@ -1,6 +1,6 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/updater/app/app_uninstall.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/updater/app/app_uninstall.cc -@@ -161,7 +161,7 @@ void UninstallInThreadPool(UpdaterScope scope, +@@ -157,7 +157,7 @@ void UninstallInThreadPool(UpdaterScope scope, } if (int result = UninstallOtherVersions(scope); result != kErrorOk) { diff --git a/www/iridium/files/patch-chrome_updater_configurator.cc b/www/iridium/files/patch-chrome_updater_configurator.cc index 2af5af93dbc3..e8647c49434d 100644 --- a/www/iridium/files/patch-chrome_updater_configurator.cc +++ b/www/iridium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2024-12-22 12:24:29 UTC +--- chrome/updater/configurator.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/updater/configurator.cc -@@ -70,7 +70,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> +@@ -72,7 +72,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> return std::nullopt; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) }()) { diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc index 78f6f6051cdb..0b4f802f2384 100644 --- a/www/iridium/files/patch-chrome_utility_services.cc +++ b/www/iridium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2024-11-04 08:56:03 UTC +--- chrome/utility/services.cc.orig 2025-02-22 18:06:53 UTC +++ chrome/utility/services.cc -@@ -51,7 +51,7 @@ +@@ -49,7 +49,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -210,7 +210,7 @@ auto RunMacNotificationService( +@@ -207,7 +207,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -474,7 +474,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) 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 308d38151137..fc488edef44d 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,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2024-12-22 12:24:29 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2025-02-22 18:06:53 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -94,7 +94,7 @@ +@@ -95,7 +95,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif // BUILDFLAG(IS_OZONE) @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -267,7 +267,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -268,7 +268,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()); -@@ -313,7 +313,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -314,7 +314,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {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. -@@ -490,7 +490,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -491,7 +491,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) 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 index 23494ab930a9..55e954486304 100644 --- 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 @@ -1,6 +1,6 @@ ---- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig 2024-12-22 12:24:29 UTC +--- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig 2025-02-22 18:06:53 UTC +++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc -@@ -346,7 +346,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre +@@ -347,7 +347,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre params->force_720p_resolution = GetFlagEntry(feature::kCastCoreForce720p, config_.extra_features(), /*default_value=*/false); diff --git a/www/iridium/files/patch-components_autofill_core_browser_autofill__optimization__guide.cc b/www/iridium/files/patch-components_autofill_core_browser_autofill__optimization__guide.cc deleted file mode 100644 index 22c452fb20a7..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_autofill__optimization__guide.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/browser/autofill_optimization_guide.cc.orig 2024-11-04 08:56:03 UTC -+++ components/autofill/core/browser/autofill_optimization_guide.cc -@@ -186,7 +186,7 @@ void AutofillOptimizationGuide::OnDidParseForm( - } - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (has_credit_card_field && - !personal_data_manager->payments_data_manager() - .GetServerCreditCards() diff --git a/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc new file mode 100644 index 000000000000..c7cfdeda4a50 --- /dev/null +++ b/www/iridium/files/patch-components_autofill_core_browser_data__manager_payments_payments__data__manager.cc @@ -0,0 +1,20 @@ +--- components/autofill/core/browser/data_manager/payments/payments_data_manager.cc.orig 2025-02-22 18:06:53 UTC ++++ components/autofill/core/browser/data_manager/payments/payments_data_manager.cc +@@ -1150,7 +1150,7 @@ bool PaymentsDataManager::IsServerCard(const CreditCar + bool PaymentsDataManager::ShouldShowCardsFromAccountOption() const { + // The feature is only for Linux, Windows, Mac, and Fuchsia. + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ +- BUILDFLAG(IS_FUCHSIA) ++ 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/40066949): Simplify once ConsentLevel::kSync and +@@ -2005,7 +2005,7 @@ bool PaymentsDataManager::AreEwalletAccountsSupported( + + bool PaymentsDataManager::AreBnplIssuersSupported() const { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled( + features::kAutofillEnableBuyNowPayLaterSyncing); + #else diff --git a/www/iridium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc b/www/iridium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc new file mode 100644 index 000000000000..7ad3ea358eca --- /dev/null +++ b/www/iridium/files/patch-components_autofill_core_browser_integrators_autofill__optimization__guide.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/integrators/autofill_optimization_guide.cc.orig 2025-02-22 18:06:53 UTC ++++ components/autofill/core/browser/integrators/autofill_optimization_guide.cc +@@ -185,7 +185,7 @@ void AutofillOptimizationGuide::OnDidParseForm( + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (has_credit_card_field && + !personal_data_manager.payments_data_manager() + .GetServerCreditCards() 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 deleted file mode 100644 index 5d9581f8ce88..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_payments__data__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/browser/payments_data_manager.cc.orig 2024-12-22 12:24:29 UTC -+++ components/autofill/core/browser/payments_data_manager.cc -@@ -1095,7 +1095,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_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 46432248b758..097ae45fa61e 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,20 +1,20 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-12-22 12:24:29 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2025-02-22 18:06:53 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -8,7 +8,7 @@ - - namespace autofill::features { +@@ -11,7 +11,7 @@ BASE_FEATURE(kAutofillDisableLocalCardMigration, + "AutofillDisableLocalCardMigration", + base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // When enabled, Chrome will extract the checkout amount from the checkout page // of the allowlisted merchant websites. -@@ -331,7 +331,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -322,7 +322,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, + #endif // BUILDFLAG(IS_ANDROID) + bool ShouldShowImprovedUserConsentForCreditCardSave() { - // 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) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The new user consent UI is fully launched on MacOS, Windows and Linux. return true; + #else diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.h b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.h index 68aa9412e2b3..76502734a005 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.h +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.h @@ -1,8 +1,8 @@ ---- components/autofill/core/common/autofill_payments_features.h.orig 2024-08-27 06:28:16 UTC +--- components/autofill/core/common/autofill_payments_features.h.orig 2025-02-22 18:06:53 UTC +++ components/autofill/core/common/autofill_payments_features.h -@@ -14,7 +14,7 @@ namespace autofill::features { +@@ -17,7 +17,7 @@ COMPONENT_EXPORT(AUTOFILL) + BASE_DECLARE_FEATURE(kAutofillDisableLocalCardMigration); - // All features in alphabetical order. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc index c121e072809f..2a6e5217759d 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_prefs.cc.orig 2024-11-04 08:56:03 UTC +--- components/autofill/core/common/autofill_prefs.cc.orig 2025-02-22 18:06:53 UTC +++ components/autofill/core/common/autofill_prefs.cc -@@ -118,7 +118,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -102,7 +102,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h index 6d5e59db929f..74c3bb4f94ab 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__prefs.h @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_prefs.h.orig 2024-11-04 08:56:03 UTC +--- components/autofill/core/common/autofill_prefs.h.orig 2025-02-22 18:06:53 UTC +++ components/autofill/core/common/autofill_prefs.h -@@ -73,7 +73,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = +@@ -74,7 +74,7 @@ inline constexpr char kAutofillPaymentCvcStorage[] = inline constexpr char kAutofillPaymentCardBenefits[] = "autofill.payment_card_benefits"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 cf64a85c728d..314da9685047 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,16 +1,25 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-12-22 12:24:29 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2025-02-22 18:06:53 UTC +++ components/commerce/core/commerce_feature_list.cc -@@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, +@@ -165,7 +165,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) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -250,7 +250,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ - &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, false}; +@@ -235,7 +235,7 @@ BASE_FEATURE(kEnableDiscountInfoApi, + + const char kDiscountOnShoppyPageParam[] = "discount-on-shoppy-page"; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const base::FeatureParam<bool> kDiscountOnShoppyPage{ + &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, true}; + #else +@@ -244,7 +244,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -18,12 +27,22 @@ BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, "EnableDiscountInfoApiRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -289,7 +289,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -258,7 +258,7 @@ const char kHistoryClustersBehaviorParam[] = "history- + const char kMerchantWideBehaviorParam[] = "merchant-wide-behavior"; + const char kNonMerchantWideBehaviorParam[] = "non-merchant-wide-behavior"; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kDiscountDialogAutoPopupBehaviorSetting, + "DiscountDialogAutoPopupBehaviorSetting", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -299,7 +299,8 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || \ ++ BUILDFLAG(IS_BSD) BASE_FEATURE(kShoppingListRegionLaunched, "ShoppingListRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); 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 index c14c944f68ca..cf58a2fcfa08 100644 --- a/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/iridium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,11 +1,11 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2024-11-04 08:56:03 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2025-02-22 18:06:53 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -372,7 +372,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -371,7 +371,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if 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 0cbb1745f622..c4bdbc1855aa 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 2024-06-25 12:08:48 UTC +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2025-02-22 18:06:53 UTC +++ components/content_settings/core/browser/website_settings_registry.cc -@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re +@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re #if BUILDFLAG(IS_WIN) if (!(platform & PLATFORM_WINDOWS)) return nullptr; 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 21fd40bc94b0..a5900d865b12 100644 --- a/www/iridium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/iridium/files/patch-components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/app/BUILD.gn.orig 2024-11-04 08:56:03 UTC +--- components/crash/core/app/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ components/crash/core/app/BUILD.gn @@ -70,6 +70,10 @@ static_library("app") { ] @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -233,11 +237,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -235,11 +239,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc b/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc index a7aa9e8556e4..0cd2ea7e8ce3 100644 --- a/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc +++ b/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc @@ -1,6 +1,6 @@ ---- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2023-10-21 11:51:27 UTC +--- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2025-02-22 18:06:53 UTC +++ components/crash/core/browser/crash_upload_list_crashpad.cc -@@ -38,7 +38,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() = +@@ -37,7 +37,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() = std::vector<std::unique_ptr<UploadList::UploadInfo>> CrashUploadListCrashpad::LoadUploadList() { std::vector<crash_reporter::Report> reports; @@ -10,7 +10,7 @@ std::vector<std::unique_ptr<UploadInfo>> uploads; for (const crash_reporter::Report& report : reports) { -@@ -52,9 +54,13 @@ CrashUploadListCrashpad::LoadUploadList() { +@@ -51,9 +53,13 @@ CrashUploadListCrashpad::LoadUploadList() { void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, const base::Time& end) { diff --git a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc index 5575b4e23379..66d8658f46b7 100644 --- a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc +++ b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc @@ -1,6 +1,6 @@ ---- components/device_signals/core/browser/signals_aggregator_impl.cc.orig 2023-07-24 14:27:53 UTC +--- components/device_signals/core/browser/signals_aggregator_impl.cc.orig 2025-02-22 18:06:53 UTC +++ components/device_signals/core/browser/signals_aggregator_impl.cc -@@ -65,7 +65,7 @@ SignalsAggregatorImpl::SignalsAggregatorImpl( +@@ -64,7 +64,7 @@ SignalsAggregatorImpl::SignalsAggregatorImpl( SignalsAggregatorImpl::~SignalsAggregatorImpl() = default; diff --git a/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc b/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc index 5f89482336ce..10a72186c66c 100644 --- a/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc +++ b/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc @@ -1,11 +1,11 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2024-12-22 12:24:29 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2025-02-22 18:06:53 UTC +++ components/device_signals/core/common/signals_features.cc @@ -50,7 +50,7 @@ bool IsNewFunctionEnabled(NewEvFunction new_ev_functio } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Enables the triggering of device signals consent dialog when conditions met // This feature also requires UnmanagedDeviceSignalsConsentFlowEnabled policy to // be enabled diff --git a/www/iridium/files/patch-components_device__signals_core_common_signals__features.h b/www/iridium/files/patch-components_device__signals_core_common_signals__features.h index 649bfdea211e..b218e1508de6 100644 --- a/www/iridium/files/patch-components_device__signals_core_common_signals__features.h +++ b/www/iridium/files/patch-components_device__signals_core_common_signals__features.h @@ -1,11 +1,11 @@ ---- components/device_signals/core/common/signals_features.h.orig 2024-12-22 12:24:29 UTC +--- components/device_signals/core/common/signals_features.h.orig 2025-02-22 18:06:53 UTC +++ components/device_signals/core/common/signals_features.h @@ -31,7 +31,7 @@ enum class NewEvFunction { kFileSystemInfo, kSettings, bool IsNewFunctionEnabled(NewEvFunction new_ev_function); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kDeviceSignalsConsentDialog); // Returns true if device signals consent dialog has been enabled for 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 8ce24137b9ad..1f13631a60cb 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 2024-06-25 12:08:48 UTC +--- components/embedder_support/user_agent_utils.cc.orig 2025-02-22 18:06:53 UTC +++ components/embedder_support/user_agent_utils.cc -@@ -445,6 +445,9 @@ std::string GetPlatformForUAMetadata() { +@@ -481,6 +481,9 @@ std::string GetPlatformForUAMetadata() { # else return "Chromium OS"; # endif diff --git a/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc b/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc index 8ef47843110e..7760699631db 100644 --- a/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc +++ b/www/iridium/files/patch-components_enterprise_watermarking_watermark.cc @@ -1,6 +1,6 @@ ---- components/enterprise/watermarking/watermark.cc.orig 2024-11-04 08:56:03 UTC +--- components/enterprise/watermarking/watermark.cc.orig 2025-02-22 18:06:53 UTC +++ components/enterprise/watermarking/watermark.cc -@@ -34,7 +34,7 @@ gfx::Font WatermarkFont() { +@@ -31,7 +31,7 @@ gfx::Font WatermarkFont() { "Segoe UI", #elif BUILDFLAG(IS_MAC) "SF Pro Text", @@ -9,7 +9,7 @@ "Ubuntu", #elif BUILDFLAG(IS_CHROMEOS) "Google Sans", -@@ -45,7 +45,7 @@ gfx::Font WatermarkFont() { +@@ -47,7 +47,7 @@ const gfx::FontList& WatermarkFontList() { } gfx::Font::Weight WatermarkFontWeight() { diff --git a/www/iridium/files/patch-components_error__page_common_localized__error.cc b/www/iridium/files/patch-components_error__page_common_localized__error.cc new file mode 100644 index 000000000000..87e2b4f281d8 --- /dev/null +++ b/www/iridium/files/patch-components_error__page_common_localized__error.cc @@ -0,0 +1,11 @@ +--- components/error_page/common/localized_error.cc.orig 2025-02-22 18:06:53 UTC ++++ components/error_page/common/localized_error.cc +@@ -901,7 +901,7 @@ void AddSuggestionsDetails(int error_code, + if (suggestions & SUGGEST_PROXY_CONFIG) { + // Custom body string. + std::u16string inner = +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + l10n_util::GetStringFUTF16( + IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM, + l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE), 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 0e582af65d61..13212f9141ad 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-11-04 08:56:03 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2025-02-22 18:06:53 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -95,7 +95,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro @@ -18,7 +18,7 @@ if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1641,7 +1641,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1644,7 +1644,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ 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 9cd68e56c181..a4e386e427d6 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2024-12-22 12:24:29 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2025-02-22 18:06:53 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU +@@ -19,7 +19,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) || \ @@ -9,17 +9,16 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -646,7 +646,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -646,7 +646,7 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, + #endif // BUILDFLAG(IS_IOS) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) - BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature, - "IPH_AutofillCreditCardBenefit", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -786,7 +787,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +-#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(kIPHAutofillCardInfoRetrievalSuggestionFeature, + "IPH_AutofillCardInfoRetrievalSuggestion", +@@ -790,7 +790,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif 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 149b34f804b0..8e0635789068 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,30 +1,29 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2024-12-22 12:24:29 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2025-02-22 18:06:53 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); - BASE_DECLARE_FEATURE(kIPHDummyFeature); +@@ -27,7 +27,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDemoMode); + FEATURE_CONSTANTS_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) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); + FEATURE_CONSTANTS_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -261,7 +261,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp +@@ -285,7 +285,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kDefaultBrowserTrigg + #endif // BUILDFLAG(IS_IOS) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature); - BASE_DECLARE_FEATURE(kIPHAutofillDisabledVirtualCardSuggestionFeature); - BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); -@@ -313,7 +314,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea - BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); +-#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) + FEATURE_CONSTANTS_DECLARE_FEATURE( + kIPHAutofillCardInfoRetrievalSuggestionFeature); +@@ -343,7 +343,7 @@ FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHScalableIphHelpA + FEATURE_CONSTANTS_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); - BASE_DECLARE_FEATURE(kIPHToolbarManagementButtonFeature); + FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch); + FEATURE_CONSTANTS_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunchAppInTab); #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 5a669d16b832..117f3e71b243 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,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-12-22 12:24:29 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2025-02-22 18:06:53 UTC +++ components/feature_engagement/public/feature_list.cc @@ -162,7 +162,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSLensOverlayEntrypointTipFeature, + &kIPHiOSSharedTabGroupForeground, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,22 +9,21 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, #endif -@@ -230,7 +230,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -232,7 +232,7 @@ const base::Feature* const kAllFeatures[] = { + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -+ BUILDFLAG(IS_BSD) +-#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) + &kIPHAutofillCardInfoRetrievalSuggestionFeature, &kIPHAutofillCreditCardBenefitFeature, - &kIPHAutofillDisabledVirtualCardSuggestionFeature, - &kIPHAutofillExternalAccountProfileSuggestionFeature, -@@ -282,7 +283,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -286,7 +286,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) &kIPHDesktopPWAsLinkCapturingLaunch, - &kIPHToolbarManagementButtonFeature, + &kIPHDesktopPWAsLinkCapturingLaunchAppInTab, #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 c6205eceb858..6dc083312ee6 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2024-12-22 12:24:29 UTC +--- components/feature_engagement/public/feature_list.h.orig 2025-02-22 18:06:53 UTC +++ components/feature_engagement/public/feature_list.h -@@ -282,7 +282,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomizationMenuFeatur +@@ -279,7 +279,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSharedTabGroupForeground #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -388,7 +388,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe +@@ -389,7 +389,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,25 +19,25 @@ DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit"); -@@ -482,7 +483,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -483,7 +484,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#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"); - DEFINE_VARIATION_PARAM(kIPHToolbarManagementButtonFeature, -@@ -644,7 +645,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHHomeCustomizationMenuFeature), + DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunchAppInTab, +@@ -644,7 +645,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHiOSLensOverlayEntrypointTipFeature), + VARIATION_ENTRY(kIPHiOSSharedTabGroupForeground), #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), -@@ -700,7 +701,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -703,7 +704,8 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -45,14 +45,14 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), + VARIATION_ENTRY(kIPHAutofillCardInfoRetrievalSuggestionFeature), VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), -@@ -752,7 +754,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -755,7 +757,7 @@ inline constexpr flags_ui::FeatureEntry::FeatureVariat VARIATION_ENTRY(kIPHScalableIphGamingFeature), - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_CHROMEOS) -#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), - VARIATION_ENTRY(kIPHToolbarManagementButtonFeature), + VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunchAppInTab), #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_flags__ui_flags__state.cc b/www/iridium/files/patch-components_flags__ui_flags__state.cc index a79a68bb9330..0e88a6fde5a8 100644 --- a/www/iridium/files/patch-components_flags__ui_flags__state.cc +++ b/www/iridium/files/patch-components_flags__ui_flags__state.cc @@ -1,9 +1,9 @@ ---- components/flags_ui/flags_state.cc.orig 2024-11-04 08:56:03 UTC +--- components/flags_ui/flags_state.cc.orig 2025-02-22 18:06:53 UTC +++ components/flags_ui/flags_state.cc -@@ -755,7 +755,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -751,7 +751,7 @@ unsigned short FlagsState::GetCurrentPlatform() { + return kOsWin; + #elif BUILDFLAG(IS_CHROMEOS) return kOsCrOS; - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - return kOsLacros; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return kOsLinux; diff --git a/www/iridium/files/patch-components_gcm__driver_gcm__desktop__utils.cc b/www/iridium/files/patch-components_gcm__driver_gcm__desktop__utils.cc new file mode 100644 index 000000000000..fc4ba66ff48c --- /dev/null +++ b/www/iridium/files/patch-components_gcm__driver_gcm__desktop__utils.cc @@ -0,0 +1,11 @@ +--- components/gcm_driver/gcm_desktop_utils.cc.orig 2025-02-22 18:06:53 UTC ++++ components/gcm_driver/gcm_desktop_utils.cc +@@ -32,7 +32,7 @@ GCMClient::ChromePlatform GetPlatform() { + return GCMClient::PLATFORM_ANDROID; + #elif BUILDFLAG(IS_CHROMEOS) + return GCMClient::PLATFORM_CROS; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return GCMClient::PLATFORM_LINUX; + #else + // For all other platforms, return as LINUX. 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 9cdf2c730a79..e5a227e5311c 100644 --- a/www/iridium/files/patch-components_live__caption_caption__util.cc +++ b/www/iridium/files/patch-components_live__caption_caption__util.cc @@ -1,11 +1,11 @@ ---- components/live_caption/caption_util.cc.orig 2024-11-04 08:56:03 UTC +--- components/live_caption/caption_util.cc.orig 2025-02-22 18:06:53 UTC +++ components/live_caption/caption_util.cc -@@ -139,7 +139,7 @@ std::string GetCaptionSettingsUrl() { +@@ -136,7 +136,7 @@ bool IsLiveCaptionFeatureSupported() { + std::string GetCaptionSettingsUrl() { + #if BUILDFLAG(IS_CHROMEOS) return "chrome://os-settings/audioAndCaptions"; - #endif // BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return "chrome://settings/captions"; - #endif // BUILDFLAG(IS_LINUX) - + #elif BUILDFLAG(IS_WIN) + return base::win::GetVersion() >= base::win::Version::WIN10 diff --git a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc index 268cf171f569..e0a154d3bc36 100644 --- a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc +++ b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc @@ -1,11 +1,11 @@ ---- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig 2023-11-22 14:00:11 UTC +--- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig 2025-02-22 18:06:53 UTC +++ components/media_router/common/providers/cast/channel/cast_message_util.cc -@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() { +@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() { return 4; - #elif BUILDFLAG(IS_CHROMEOS_ASH) + #elif BUILDFLAG(IS_CHROMEOS) return 5; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return 6; #else return 0; diff --git a/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc b/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc index a1d0ffce5c76..5d2439fb7d24 100644 --- a/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc +++ b/www/iridium/files/patch-components_metrics_dwa_dwa__service.cc @@ -1,6 +1,6 @@ ---- components/metrics/dwa/dwa_service.cc.orig 2024-12-22 12:24:29 UTC +--- components/metrics/dwa/dwa_service.cc.orig 2025-02-22 18:06:53 UTC +++ components/metrics/dwa/dwa_service.cc -@@ -88,7 +88,7 @@ void DwaService::RecordCoarseSystemInformation( +@@ -161,7 +161,7 @@ void DwaService::RecordCoarseSystemInformation( coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_WINDOWS); #elif BUILDFLAG(IS_MAC) coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_MACOS); diff --git a/www/iridium/files/patch-components_metrics_metrics__log.cc b/www/iridium/files/patch-components_metrics_metrics__log.cc index 8ee149c02f45..5ec2eb873c1a 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 2024-06-25 12:08:48 UTC +--- components/metrics/metrics_log.cc.orig 2025-02-22 18:06:53 UTC +++ components/metrics/metrics_log.cc -@@ -56,7 +56,7 @@ +@@ -60,7 +60,7 @@ #include "base/win/current_module.h" #endif @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -146,7 +146,7 @@ void RecordCurrentTime( +@@ -150,7 +150,7 @@ void RecordCurrentTime( } } @@ -18,16 +18,16 @@ metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType( base::nix::SessionType session_type) { switch (session_type) { -@@ -415,7 +415,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -413,7 +413,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); -@@ -432,7 +432,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -430,7 +430,7 @@ void MetricsLog::RecordCoreSystemProfile( os->set_build_number(base::SysInfo::GetIOSBuildNumber()); #endif diff --git a/www/iridium/files/patch-components_neterror_resources_neterror.js b/www/iridium/files/patch-components_neterror_resources_neterror.js deleted file mode 100644 index b6b0547343fe..000000000000 --- a/www/iridium/files/patch-components_neterror_resources_neterror.js +++ /dev/null @@ -1,11 +0,0 @@ ---- components/neterror/resources/neterror.js.orig 2024-06-25 12:08:48 UTC -+++ components/neterror/resources/neterror.js -@@ -142,7 +142,7 @@ function detailsButtonClick() { - - let primaryControlOnLeft = true; - // clang-format off --// <if expr="is_macosx or is_ios or is_linux or is_chromeos or is_android"> -+// <if expr="is_macosx or is_ios or is_posix or is_chromeos or is_android"> - // clang-format on - primaryControlOnLeft = false; - // </if> diff --git a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc index 0e84ded4019a..15d2fb5872d5 100644 --- a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc +++ b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__features.cc @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/optimization_guide_features.cc.orig 2024-12-22 12:24:29 UTC +--- components/optimization_guide/core/optimization_guide_features.cc.orig 2025-02-22 18:06:53 UTC +++ components/optimization_guide/core/optimization_guide_features.cc -@@ -140,7 +140,7 @@ BASE_FEATURE(kOptimizationGuideModelExecution, +@@ -136,7 +136,7 @@ BASE_FEATURE(kOptimizationGuideModelExecution, // Whether to use the on device model service in optimization guide. BASE_FEATURE(kOptimizationGuideOnDeviceModel, "OptimizationGuideOnDeviceModel", diff --git a/www/iridium/files/patch-components_os__crypt_async_common_encryptor.cc b/www/iridium/files/patch-components_os__crypt_async_common_encryptor.cc index 176ba3391194..f10aa85acbf2 100644 --- a/www/iridium/files/patch-components_os__crypt_async_common_encryptor.cc +++ b/www/iridium/files/patch-components_os__crypt_async_common_encryptor.cc @@ -1,6 +1,6 @@ ---- components/os_crypt/async/common/encryptor.cc.orig 2024-11-04 08:56:03 UTC +--- components/os_crypt/async/common/encryptor.cc.orig 2025-02-22 18:06:53 UTC +++ components/os_crypt/async/common/encryptor.cc -@@ -277,7 +277,7 @@ std::optional<std::string> Encryptor::DecryptData( +@@ -275,7 +275,7 @@ std::optional<std::string> Encryptor::DecryptData( // or not encryption worked or not, and certainly not advisable to recommend // a re-encryption of this potentially invalid data. // TODO(crbug.com/365712505): Remove this fallback. diff --git a/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h b/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h index cdf9a753a19a..a7dcc7cc3532 100644 --- a/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h +++ b/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h @@ -1,15 +1,15 @@ ---- components/os_crypt/sync/os_crypt.h.orig 2024-11-04 08:56:03 UTC +--- components/os_crypt/sync/os_crypt.h.orig 2025-02-22 18:06:53 UTC +++ components/os_crypt/sync/os_crypt.h -@@ -14,7 +14,7 @@ - #include "build/build_config.h" +@@ -15,7 +15,7 @@ #include "build/chromecast_buildflags.h" + #include "crypto/subtle_passkey.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class KeyStorageLinux; #endif // BUILDFLAG(IS_LINUX) -@@ -23,7 +23,7 @@ class PrefRegistrySimple; +@@ -24,7 +24,7 @@ class PrefRegistrySimple; class PrefService; #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ namespace crypto { class SymmetricKey; } -@@ -36,7 +36,7 @@ struct Config; +@@ -37,7 +37,7 @@ struct Config; // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions // of what each function does. namespace OSCrypt { @@ -27,7 +27,7 @@ COMPONENT_EXPORT(OS_CRYPT) void SetConfig(std::unique_ptr<os_crypt::Config> config); #endif // BUILDFLAG(IS_LINUX) -@@ -81,7 +81,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b +@@ -82,7 +82,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy); COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyStorageForTesting( base::OnceCallback<std::unique_ptr<KeyStorageLinux>()> -@@ -108,7 +108,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -109,7 +109,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { // Returns singleton instance of OSCryptImpl. static OSCryptImpl* GetInstance(); @@ -45,7 +45,7 @@ // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -200,7 +200,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -201,7 +201,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { void ResetStateForTesting(); #endif @@ -54,7 +54,7 @@ // For unit testing purposes, inject methods to be used. // |storage_provider_factory| provides the desired |KeyStorage| // implementation. If the provider returns |nullptr|, a hardcoded password -@@ -225,13 +225,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { +@@ -226,13 +226,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { crypto::SymmetricKey* GetEncryptionKey(); #endif // BUILDFLAG(IS_APPLE) @@ -67,6 +67,6 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Returns a cached string of "peanuts". Is thread-safe. - crypto::SymmetricKey* GetPasswordV10(); + static constexpr size_t kDerivedKeyBytes = 16; + crypto::SubtlePassKey MakeCryptoPassKey(); 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 bd542ffc5bc3..fc0037e5bb9b 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,6 +1,6 @@ ---- components/paint_preview/player/player_compositor_delegate.cc.orig 2024-08-27 06:28:16 UTC +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ components/paint_preview/player/player_compositor_delegate.cc -@@ -434,8 +434,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT +@@ -433,8 +433,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() && 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 594997762671..8197f2c86965 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,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-12-22 12:24:29 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -45,7 +45,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, +@@ -35,7 +35,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -108,7 +108,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, +@@ -113,7 +113,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, "ReuseDetectionBasedOnPasswordHashes", base::FEATURE_DISABLED_BY_DEFAULT); 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 c5b8a9c684d4..3895e741b935 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,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-12-22 12:24:29 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -106,7 +106,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable) +@@ -114,7 +114,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable) // Detects password reuse based on hashed password values. BASE_DECLARE_FEATURE(kReuseDetectionBasedOnPasswordHashes); 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 index 066b218ab057..8b6302e58efc 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2024-11-04 08:56:03 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/password_form_manager.cc -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -231,7 +231,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -239,7 +239,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -888,7 +888,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -897,7 +897,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } 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 index 5c654ae5d5d1..9382189df19b 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2024-12-22 12:24:29 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -419,7 +419,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -433,7 +433,7 @@ void PasswordManager::RegisterProfilePrefs( prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); @@ -9,7 +9,7 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -432,7 +432,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -446,7 +446,7 @@ void PasswordManager::RegisterProfilePrefs( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 index 23635e78f60b..449f61852c4a 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2024-12-22 12:24:29 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/password_manager_client.h -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "net/cert/cert_status_flags.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,12 +9,12 @@ #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" -@@ -551,7 +551,7 @@ class PasswordManagerClient { +@@ -559,7 +559,7 @@ class PasswordManagerClient { CredentialsCallback callback); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Shows the bubble with the details of the `form`. virtual void OpenPasswordDetailsBubble( + const password_manager::PasswordForm& form) = 0; 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 index a69f62932f6c..73ebf66c95ef 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager_switches.h.orig 2024-08-01 05:47:53 UTC +--- components/password_manager/core/browser/password_manager_switches.h.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/password_manager_switches.h -@@ -10,7 +10,7 @@ +@@ -9,7 +9,7 @@ namespace password_manager { 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 index 1a254e297b48..412658dbe197 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-12-22 12:24:29 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -43,7 +43,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri +@@ -44,7 +44,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ // Returns the password form corresponding to the `payload` data. In most // cases there is only one such form stored, but having more than one or no // forms is also possible. If there is more than one form, showing any of them -@@ -281,7 +281,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -293,7 +293,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( } case autofill::SuggestionType::kViewPasswordDetails: { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ std::optional<password_manager::PasswordForm> credentials = GetCorrespondingPasswordForm( suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(), -@@ -418,7 +418,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass +@@ -428,7 +428,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass const Suggestion::PasswordSuggestionDetails& payload, base::OnceClosure on_allowed) { #if 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__unittest.cc b/www/iridium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index 238199b78778..10ab8cb15ff8 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_password__store_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/password_store/login_database_unittest.cc.orig 2024-11-04 08:56:03 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2253,7 +2253,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, +@@ -2257,7 +2257,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, testing::Bool())); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ 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 index 38b6de6ee3a2..7d9bbd06bfda 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-12-22 12:24:29 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -190,7 +190,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -195,7 +195,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -8,4 +8,4 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void StubPasswordManagerClient::OpenPasswordDetailsBubble( const password_manager::PasswordForm& form) {} - + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || 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 index 21ecc5c79fd0..1a8734220296 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-11-04 08:56:03 UTC +--- components/password_manager/core/browser/stub_password_manager_client.h.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/browser/stub_password_manager_client.h -@@ -75,7 +75,7 @@ class StubPasswordManagerClient : public PasswordManag +@@ -76,7 +76,7 @@ class StubPasswordManagerClient : public PasswordManag MockPasswordFeatureManager* GetPasswordFeatureManager(); version_info::Channel GetChannel() const override; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -8,4 +8,4 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void OpenPasswordDetailsBubble( const password_manager::PasswordForm& form) override; - std::unique_ptr< + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || 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 index d45721fcb96a..1b7d8e89fe25 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-11-04 08:56:03 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2025-02-22 18:06:53 UTC +++ components/password_manager/core/common/password_manager_pref_names.h -@@ -41,7 +41,7 @@ inline constexpr char kCredentialProviderEnabledOnStar +@@ -50,7 +50,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. // If set to false it blocks deleting undecryptable passwords, otherwise the // deletion can happen. -@@ -334,7 +334,7 @@ inline constexpr char kAutofillableCredentialsAccountS +@@ -349,7 +349,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc b/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc index 5f20d40486b1..e2698f55f53a 100644 --- a/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc +++ b/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc @@ -1,6 +1,6 @@ ---- components/permissions/prediction_service/prediction_common.cc.orig 2022-10-05 07:34:01 UTC +--- components/permissions/prediction_service/prediction_common.cc.orig 2025-02-22 18:06:53 UTC +++ components/permissions/prediction_service/prediction_common.cc -@@ -33,7 +33,7 @@ int BucketizeValue(int count) { +@@ -32,7 +32,7 @@ int BucketizeValue(int count) { ClientFeatures_Platform GetCurrentPlatformProto() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) return permissions::ClientFeatures_Platform_PLATFORM_MOBILE; -@@ -44,7 +44,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { +@@ -43,7 +43,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 53d91dab5612..d7af749844a1 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,7 +1,7 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -411,7 +411,7 @@ class PolicyTestCase { - const std::string os("chromeos_lacros"); +@@ -408,7 +408,7 @@ class PolicyTestCase { + const std::string os("chromeos_ash"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); -#elif BUILDFLAG(IS_LINUX) 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 0390b6bfc7b2..3f932d991fea 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-12-22 12:24:29 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2025-02-22 18:06:53 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -720,7 +720,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -739,7 +739,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 bdfe4b3b3d6c..b9e116125dff 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,11 +1,11 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ + #include "base/win/wincred_shim.h" #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include <pwd.h> #include <sys/types.h> #include <unistd.h> @@ -13,8 +13,8 @@ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include <limits.h> // For HOST_NAME_MAX #endif @@ -26,16 +26,16 @@ #include <algorithm> #include <utility> -@@ -88,7 +93,7 @@ namespace em = enterprise_management; +@@ -83,7 +88,7 @@ namespace policy { + namespace em = enterprise_management; std::string GetMachineName() { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -145,7 +150,7 @@ std::string GetMachineName() { +@@ -139,7 +144,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 = -@@ -168,7 +173,7 @@ std::string GetOSArchitecture() { +@@ -161,7 +166,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 7c157a6da21a..faef992d4de8 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 2024-06-25 12:08:48 UTC +--- components/policy/core/common/policy_loader_common.cc.orig 2025-02-22 18:06:53 UTC +++ components/policy/core/common/policy_loader_common.cc @@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = { key::kDefaultSearchProviderEnabled, @@ -7,9 +7,9 @@ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) key::kAutoOpenFileTypes, + key::kEnterpriseSearchAggregatorSettings, key::kHomepageIsNewTabPage, - key::kPasswordProtectionChangePasswordURL, -@@ -56,7 +56,7 @@ const char* kSensitivePolicies[] = { +@@ -57,7 +57,7 @@ const char* kSensitivePolicies[] = { key::kSafeBrowsingAllowlistDomains, key::kSiteSearchSettings, #endif 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 9871d5029a2e..8964b6dd7e3d 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,20 +1,11 @@ ---- components/policy/core/common/policy_paths.cc.orig 2024-06-25 12:08:48 UTC +--- components/policy/core/common/policy_paths.cc.orig 2025-02-22 18:06:53 UTC +++ components/policy/core/common/policy_paths.cc -@@ -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) --const char kPolicyPath[] = "/etc/iridium-browser/policies"; --#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"; +@@ -17,6 +17,8 @@ namespace policy { + const char kPolicyPath[] = "/etc/iridium-browser/policies"; + #elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING) + const char kPolicyPath[] = "/etc/iridium-browser/policies"; ++#elif BUILDFLAG(IS_FREEBSD) ++const char kPolicyPath[] = "/usr/local/etc/iridium-browser/policies"; #else --const char kPolicyPath[] = "/etc/iridium-browser/policies"; --#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) -+const char kPolicyPath[] = "/etc/iridium/policies"; -+#endif - #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) - - } // namespace policy + const char kPolicyPath[] = "/etc/iridium-browser/policies"; + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) 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 919fbc0dd843..d9298ba731c6 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,9 +1,9 @@ ---- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2024-11-04 08:56:03 UTC +--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2025-02-22 18:06:53 UTC +++ components/safe_browsing/content/common/file_type_policies_unittest.cc -@@ -148,7 +148,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { +@@ -146,7 +146,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { + EXPECT_EQ(142, file_type.uma_value()); + EXPECT_FALSE(file_type.is_archive()); EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting()); - // 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) EXPECT_EQ(DownloadFileType::ALLOW_ON_USER_GESTURE, 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 index c51ba09341aa..15643668c33e 100644 --- a/www/iridium/files/patch-components_safe__browsing_core_common_features.cc +++ b/www/iridium/files/patch-components_safe__browsing_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-12-22 12:24:29 UTC +--- components/safe_browsing/core/common/features.cc.orig 2025-02-22 18:06:53 UTC +++ components/safe_browsing/core/common/features.cc -@@ -249,7 +249,7 @@ constexpr base::FeatureParam<std::string> kRedWarningS +@@ -262,7 +262,7 @@ constexpr base::FeatureParam<std::string> kRedWarningS BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, "SafeBrowsingAsyncRealTimeCheck", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 index 2e94b3f05a2b..8df3420baf4f 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-12-22 12:24:29 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2025-02-22 18:06:53 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -613,7 +613,7 @@ void SearchEngineChoiceService::RegisterLocalStatePref +@@ -625,7 +625,7 @@ void SearchEngineChoiceService::RegisterLocalStatePref int SearchEngineChoiceService::GetCountryIdInternal() { // `country_codes::kCountryIDAtInstall` may not be set yet. diff --git a/www/iridium/files/patch-components_search__engines_search__engines__switches.cc b/www/iridium/files/patch-components_search__engines_search__engines__switches.cc new file mode 100644 index 000000000000..552e91147116 --- /dev/null +++ b/www/iridium/files/patch-components_search__engines_search__engines__switches.cc @@ -0,0 +1,11 @@ +--- components/search_engines/search_engines_switches.cc.orig 2025-02-22 18:06:53 UTC ++++ components/search_engines/search_engines_switches.cc +@@ -107,7 +107,7 @@ const base::FeatureParam<bool> kReconcileWithAllKnownE + "reconcile_with_all_known_engines", + false); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(SEARCH_ENGINES_SWITCHES) + BASE_FEATURE(kClearPrefForUnknownCountry, + "ClearCountryPrefForStoredUnknownCountry", diff --git a/www/iridium/files/patch-components_search__engines_search__engines__switches.h b/www/iridium/files/patch-components_search__engines_search__engines__switches.h new file mode 100644 index 000000000000..6f1430cc9fe1 --- /dev/null +++ b/www/iridium/files/patch-components_search__engines_search__engines__switches.h @@ -0,0 +1,11 @@ +--- components/search_engines/search_engines_switches.h.orig 2025-02-22 18:06:53 UTC ++++ components/search_engines/search_engines_switches.h +@@ -113,7 +113,7 @@ BASE_DECLARE_FEATURE(kTemplateUrlReconciliation); + COMPONENT_EXPORT(SEARCH_ENGINES_SWITCHES) + extern const base::FeatureParam<bool> kReconcileWithAllKnownEngines; + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // When the `country_codes::kCountryIDUnknown` is stored in prefs and this + // feature is enabled the pref will be cleared allowing a valid country to be + // set again. 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 index 20d48497cc59..a39b37c1fc75 100644 --- a/www/iridium/files/patch-components_search__engines_template__url__service.cc +++ b/www/iridium/files/patch-components_search__engines_template__url__service.cc @@ -1,11 +1,11 @@ ---- components/search_engines/template_url_service.cc.orig 2024-12-22 12:24:29 UTC +--- components/search_engines/template_url_service.cc.orig 2025-02-22 18:06:53 UTC +++ components/search_engines/template_url_service.cc -@@ -3069,7 +3069,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( - std::unique_ptr<EnterpriseSiteSearchManager> - TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { +@@ -3218,7 +3218,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( + std::unique_ptr<EnterpriseSearchManager> + TemplateURLService::GetEnterpriseSearchManager(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( + return std::make_unique<EnterpriseSearchManager>( + prefs, base::BindRepeating(&TemplateURLService::EnterpriseSearchChanged, + base::Unretained(this))); diff --git a/www/iridium/files/patch-components_security__interstitials_content_utils.cc b/www/iridium/files/patch-components_security__interstitials_content_utils.cc index fc3707a799b3..9c04bf2c0a4f 100644 --- a/www/iridium/files/patch-components_security__interstitials_content_utils.cc +++ b/www/iridium/files/patch-components_security__interstitials_content_utils.cc @@ -1,11 +1,11 @@ ---- components/security_interstitials/content/utils.cc.orig 2023-01-17 19:19:00 UTC +--- components/security_interstitials/content/utils.cc.orig 2025-02-22 18:06:53 UTC +++ components/security_interstitials/content/utils.cc -@@ -38,7 +38,7 @@ void LaunchDateAndTimeSettings() { +@@ -37,7 +37,7 @@ void LaunchDateAndTimeSettings() { #if BUILDFLAG(IS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) struct ClockCommand { const char* const pathname; const char* const argument; diff --git a/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc index 79468df8ee03..6b3a98a7d055 100644 --- a/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc +++ b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc @@ -1,6 +1,6 @@ ---- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-11-22 14:00:11 UTC +--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2025-02-22 18:06:53 UTC +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -148,7 +148,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -147,7 +147,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( // Check for current device type and subtract it from the device count // calculation. #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-components_soda_soda__util.cc b/www/iridium/files/patch-components_soda_soda__util.cc index 1dce99e0ba91..db3459ba20fb 100644 --- a/www/iridium/files/patch-components_soda_soda__util.cc +++ b/www/iridium/files/patch-components_soda_soda__util.cc @@ -1,6 +1,6 @@ ---- components/soda/soda_util.cc.orig 2024-11-04 08:56:03 UTC +--- components/soda/soda_util.cc.orig 2025-02-22 18:06:53 UTC +++ components/soda/soda_util.cc -@@ -27,7 +27,7 @@ +@@ -22,7 +22,7 @@ #include "base/win/windows_version.h" #endif @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -52,7 +52,7 @@ bool IsSupportedChromeOS() { +@@ -38,7 +38,7 @@ bool IsSupportedChromeOS() { } #endif // BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ bool IsSupportedLinux() { #if defined(ARCH_CPU_X86_FAMILY) // Check if the CPU has the required instruction set to run the Speech -@@ -83,7 +83,7 @@ bool IsSupportedWin() { +@@ -69,7 +69,7 @@ bool IsSupportedWin() { bool IsOnDeviceSpeechRecognitionSupported() { #if BUILDFLAG(IS_CHROMEOS) return IsSupportedChromeOS(); diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn index acb8e7c20bfd..50f8140380a9 100644 --- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn @@ -1,20 +1,20 @@ ---- components/storage_monitor/BUILD.gn.orig 2024-11-04 08:56:03 UTC +--- components/storage_monitor/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ components/storage_monitor/BUILD.gn -@@ -75,7 +75,7 @@ static_library("storage_monitor") { +@@ -71,7 +71,7 @@ static_library("storage_monitor") { deps += [ "//services/device/public/mojom" ] } - } else if (is_linux || is_chromeos_lacros) { + } else if (is_linux) { - if (use_udev) { + if (use_udev && !is_bsd) { sources += [ "mtab_watcher_linux.cc", "mtab_watcher_linux.h", -@@ -180,7 +180,7 @@ source_set("unit_tests") { +@@ -177,7 +177,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] } -- } else if (is_linux || is_chromeos_lacros) { -+ } else if ((is_linux || is_chromeos_lacros) && !is_bsd) { +- } else if (is_linux) { ++ } else if (is_linux && !is_bsd) { if (use_udev) { sources += [ "storage_monitor_linux_unittest.cc" ] } diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_list__family__members__service.h b/www/iridium/files/patch-components_supervised__user_core_browser_list__family__members__service.h new file mode 100644 index 000000000000..9aa69899e02b --- /dev/null +++ b/www/iridium/files/patch-components_supervised__user_core_browser_list__family__members__service.h @@ -0,0 +1,11 @@ +--- components/supervised_user/core/browser/list_family_members_service.h.orig 2025-02-22 18:06:53 UTC ++++ components/supervised_user/core/browser/list_family_members_service.h +@@ -33,7 +33,7 @@ namespace supervised_user { + // If true, this fetcher is active for all users with CanFetchFamilyMemberInfo + // capability. Otherwise, it is only used by supervised users. + constexpr bool FetchListFamilyMembersWithCapability() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + return true; + #else + return false; 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 index 1c8ab63c8987..38e961999434 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-11-04 08:56:03 UTC +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2025-02-22 18:06:53 UTC +++ components/supervised_user/core/browser/supervised_user_preferences.cc -@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry +@@ -144,7 +144,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); #if BUILDFLAG(ENABLE_EXTENSIONS) && \ 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 deleted file mode 100644 index 435656c28bed..000000000000 --- a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-11-04 08:56:03 UTC -+++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -152,7 +152,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 (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 ae6865895538..dd7f99ae334a 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,15 +1,15 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-12-22 12:24:29 UTC +--- components/supervised_user/core/common/features.cc.orig 2025-02-22 18:06:53 UTC +++ components/supervised_user/core/common/features.cc -@@ -66,7 +66,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt +@@ -60,7 +60,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -81,7 +81,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -75,7 +75,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); @@ -18,14 +18,16 @@ bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = -@@ -106,13 +106,13 @@ BASE_FEATURE(kSupervisedUserProfileSigninIPH, - "SupervisedUserProfileSigninIPH", +@@ -96,7 +96,7 @@ BASE_FEATURE(kCustomProfileStringsForSupervisedUsers, + "CustomProfileStringsForSupervisedUsers", 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(kShowKiteForSupervisedUsers, - "ShowKiteForSupervisedUsers", + BASE_FEATURE(kEnableSupervisedUserVersionSignOutDialog, + "EnableSupervisedUserVersionSignOutDialog", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -106,7 +106,7 @@ BASE_FEATURE(kShowKiteForSupervisedUsers, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -33,22 +35,29 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kHideGuestModeForSupervisedUsers, "HideGuestModeForSupervisedUsers", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -122,7 +122,7 @@ BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervi + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -114,13 +114,13 @@ BASE_FEATURE(kHideGuestModeForSupervisedUsers, + + BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers, "ForceSafeSearchForUnauthenticatedSupervisedUsers", +-#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_ENABLED_BY_DEFAULT); + #else base::FEATURE_DISABLED_BY_DEFAULT); + #endif -#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(kForceSupervisedUserReauthenticationForYouTube, "ForceSupervisedUserReauthenticationForYouTube", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -172,7 +172,7 @@ BASE_FEATURE(kReplaceSupervisionSystemCapabilitiesWith - - BASE_FEATURE(kFetchListFamilyMembersWithCapability, - "FetchListFamilyMembersWithCapability", --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT +@@ -149,7 +149,7 @@ BASE_FEATURE(kExemptYouTubeInfrastructureFromBlocking, + // platform #defines. + BASE_FEATURE(kUncredentialedFilteringFallbackForSupervisedUsers, + "UncredentialedFilteringFallbackForSupervisedUsers", +-#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_ENABLED_BY_DEFAULT); #else - base::FEATURE_DISABLED_BY_DEFAULT + base::FEATURE_DISABLED_BY_DEFAULT); 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 1a85ae51c319..876e658a24d8 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,4 +1,4 @@ ---- components/supervised_user/core/common/features.h.orig 2024-11-04 08:56:03 UTC +--- components/supervised_user/core/common/features.h.orig 2025-02-22 18:06:53 UTC +++ components/supervised_user/core/common/features.h @@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( // Applies new informative strings during the parental extension approval flow. @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif -@@ -59,11 +59,11 @@ BASE_DECLARE_FEATURE(kSupervisedUserProfileSigninIPH); +@@ -55,11 +55,11 @@ BASE_DECLARE_FEATURE(kCustomProfileStringsForSupervise // Displays a Family Link kite badge on the supervised user avatar in various // surfaces. @@ -20,10 +20,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // This hides the following guest mode entry points for supervised users: - // - // * In the Profile menu for supervised profiles -@@ -75,7 +75,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) + // Uses supervised user strings on the signout dialog. + BASE_DECLARE_FEATURE(kEnableSupervisedUserVersionSignOutDialog); + +@@ -74,7 +74,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) // unauthenticated (e.g. signed out of the content area) account. BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); 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 index 0aaad7065140..13437ec203f2 100644 --- 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 @@ -1,7 +1,7 @@ ---- components/supervised_user/core/common/pref_names.h.orig 2024-08-01 05:47:53 UTC +--- components/supervised_user/core/common/pref_names.h.orig 2025-02-22 18:06:53 UTC +++ components/supervised_user/core/common/pref_names.h -@@ -137,7 +137,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat - "profile.managed.banner_state"; +@@ -129,7 +129,7 @@ inline constexpr char kDefaultSupervisedUserFilteringB + "profile.managed.default_filtering_behavior"; #if BUILDFLAG(ENABLE_EXTENSIONS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) 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 457b48d34825..f3f6953e9b1c 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 2024-11-04 08:56:03 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2025-02-22 18:06:53 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -85,7 +85,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,16 +9,16 @@ return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) switch (ui::GetDeviceFormFactor()) { -@@ -110,7 +110,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -107,7 +107,7 @@ sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { + DeviceInfo::OsType GetLocalDeviceOSType() { + #if BUILDFLAG(IS_CHROMEOS) return DeviceInfo::OsType::kChromeOsAsh; - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - return DeviceInfo::OsType::kChromeOsLacros; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -129,7 +129,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -126,7 +126,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_update__client_update__query__params.cc b/www/iridium/files/patch-components_update__client_update__query__params.cc index e341d50213be..51e62a5bda97 100644 --- a/www/iridium/files/patch-components_update__client_update__query__params.cc +++ b/www/iridium/files/patch-components_update__client_update__query__params.cc @@ -1,6 +1,6 @@ ---- components/update_client/update_query_params.cc.orig 2024-11-04 08:56:03 UTC +--- components/update_client/update_query_params.cc.orig 2025-02-22 18:06:53 UTC +++ components/update_client/update_query_params.cc -@@ -40,6 +40,8 @@ const char kOs[] = +@@ -39,6 +39,8 @@ const char kOs[] = "fuchsia"; #elif BUILDFLAG(IS_OPENBSD) "openbsd"; 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 81f6ec539d01..9e86839d35e2 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 2024-06-25 12:08:48 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2025-02-22 18:06:53 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -294,7 +294,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -299,7 +299,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_views_help__bubble__view.cc b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc index 2fa1d0a053bb..1c61439e43a4 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,11 +1,29 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2024-11-04 08:56:03 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2025-02-22 18:06:53 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -852,7 +852,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -299,7 +299,7 @@ DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(HelpBubbleView, + // TODO(https://crbug.com/382611284): Temporarily handle the case when the + // primary window is minimized by closing the help bubble. Remove this code when + // the issue is solved at the Views framework level. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + class HelpBubbleView::PrimaryWidgetObserver : public views::WidgetObserver { + public: + explicit PrimaryWidgetObserver(HelpBubbleView& help_bubble) +@@ -772,7 +772,7 @@ HelpBubbleView::HelpBubbleView( + event_relay_->Init(this); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + primary_widget_observer_ = std::make_unique<PrimaryWidgetObserver>(*this); + #endif + +@@ -886,7 +886,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); -#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD) // Help bubbles anchored to menus may be clipped to their anchors' bounds, // resulting in visual errors, unless they use accelerated rendering. See // crbug.com/1445770 for details. This also applies to bubbles anchored to diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.h b/www/iridium/files/patch-components_user__education_views_help__bubble__view.h new file mode 100644 index 000000000000..fd2b547965a3 --- /dev/null +++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.h @@ -0,0 +1,11 @@ +--- components/user_education/views/help_bubble_view.h.orig 2025-02-22 18:06:53 UTC ++++ components/user_education/views/help_bubble_view.h +@@ -162,7 +162,7 @@ class HelpBubbleView : public views::BubbleDialogDeleg + // work around this problem by closing the bubble if the widget is minimized. + // When the underlying issue is fixed at the framework level, this can be + // removed. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + class PrimaryWidgetObserver; + std::unique_ptr<PrimaryWidgetObserver> primary_widget_observer_; + #endif 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 4e451b9962ad..3ce57bf5881e 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-11-04 08:56:03 UTC +--- components/variations/service/variations_service.cc.orig 2025-02-22 18:06:53 UTC +++ components/variations/service/variations_service.cc -@@ -102,7 +102,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_host_gpu__host__impl.cc b/www/iridium/files/patch-components_viz_host_gpu__host__impl.cc new file mode 100644 index 000000000000..9683abdc84cc --- /dev/null +++ b/www/iridium/files/patch-components_viz_host_gpu__host__impl.cc @@ -0,0 +1,11 @@ +--- components/viz/host/gpu_host_impl.cc.orig 2025-02-22 18:06:53 UTC ++++ components/viz/host/gpu_host_impl.cc +@@ -135,7 +135,7 @@ GpuHostImpl::GpuHostImpl(Delegate* delegate, + mojom::GpuServiceCreationParams::New(); + #if BUILDFLAG(IS_OZONE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Linux has an issue when running in single-process mode wherein + // GetPlatformRuntimeProperties() browser-side calls can have a data race with + // in-process GPU service initialization. The call to 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 76dd97b50b4a..15e370336335 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,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-11-04 08:56:03 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2025-02-22 18:06:53 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1498,7 +1498,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1506,7 +1506,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); 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 dbffb8071a59..25ed17d59f41 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,20 +1,20 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-11-04 08:56:03 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2025-02-22 18:06:53 UTC +++ components/viz/service/display_embedder/software_output_surface.cc @@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: + base::TimeTicks now = base::TimeTicks::Now(); + base::TimeDelta interval_to_next_refresh = now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -144,7 +144,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -142,7 +142,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla + return gfx::OVERLAY_TRANSFORM_NONE; + } - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SoftwareOutputSurface::SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) { needs_swap_size_notifications_ = needs_swap_size_notifications; 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 00b6833f2487..95e410ce4f22 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,20 +1,20 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2024-11-04 08:56:03 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2025-02-22 18:06:53 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -44,7 +44,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -41,7 +41,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + UpdateVSyncParametersCallback callback) override; + void SetDisplayTransformHint(gfx::OverlayTransform transform) override {} gfx::OverlayTransform GetDisplayTransform() override; - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -64,7 +64,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -59,7 +59,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + base::TimeTicks refresh_timebase_; + base::TimeDelta refresh_interval_ = BeginFrameArgs::DefaultInterval(); - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool needs_swap_size_notifications_ = false; #endif 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 91da3f53c323..d351abad9007 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 2024-12-22 12:24:29 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2025-02-22 18:06:53 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1364,7 +1364,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1369,7 +1369,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 index 9cfb0166a2a5..a1df3f21dae9 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-12-22 12:24:29 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2025-02-22 18:06:53 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -113,7 +113,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -122,7 +122,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -792,7 +792,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -832,7 +832,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } 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 index c9f510aac736..5847f175a4da 100644 --- a/www/iridium/files/patch-components_viz_test_mock__display__client.h +++ b/www/iridium/files/patch-components_viz_test_mock__display__client.h @@ -1,9 +1,9 @@ ---- components/viz/test/mock_display_client.h.orig 2024-11-04 08:56:03 UTC +--- components/viz/test/mock_display_client.h.orig 2025-02-22 18:06:53 UTC +++ components/viz/test/mock_display_client.h @@ -45,7 +45,7 @@ class MockDisplayClient : public mojom::DisplayClient - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate)); - #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) -#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&)); diff --git a/www/iridium/files/patch-content_app_BUILD.gn b/www/iridium/files/patch-content_app_BUILD.gn index 725785f694c9..e64861e6dc71 100644 --- a/www/iridium/files/patch-content_app_BUILD.gn +++ b/www/iridium/files/patch-content_app_BUILD.gn @@ -1,9 +1,9 @@ ---- content/app/BUILD.gn.orig 2024-08-01 05:47:53 UTC +--- content/app/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ content/app/BUILD.gn -@@ -96,9 +96,9 @@ source_set("content_main_runner_app") { - "//chromeos/startup:constants", - ] - } +@@ -89,9 +89,9 @@ source_set("content_main_runner_app") { + "//third_party/tflite:buildflags", + "//tools/v8_context_snapshot:buildflags", + ] - if (build_tflite_with_xnnpack) { - deps += [ "//third_party/cpuinfo" ] - } diff --git a/www/iridium/files/patch-content_app_content__main.cc b/www/iridium/files/patch-content_app_content__main.cc index e4db379edecd..90ab3ddde8ea 100644 --- a/www/iridium/files/patch-content_app_content__main.cc +++ b/www/iridium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2024-11-04 08:56:03 UTC +--- content/app/content_main.cc.orig 2025-02-22 18:06:53 UTC +++ content/app/content_main.cc -@@ -227,7 +227,7 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -221,7 +221,7 @@ NO_STACK_PROTECTOR int RunContentProcess( base::EnableTerminationOnOutOfMemory(); logging::RegisterAbslAbortHook(); @@ -9,7 +9,7 @@ // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client -@@ -313,7 +313,7 @@ NO_STACK_PROTECTOR int RunContentProcess( +@@ -306,7 +306,7 @@ NO_STACK_PROTECTOR int RunContentProcess( command_line->AppendSwitch(switches::kUseMobileUserAgent); #endif 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 5b92aa8a2f1e..797d9fd3bb82 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 2024-11-04 08:56:03 UTC +--- content/app/content_main_runner_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/app/content_main_runner_impl.cc -@@ -147,18 +147,20 @@ +@@ -146,18 +146,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -23,7 +23,7 @@ #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -192,6 +194,10 @@ +@@ -186,6 +188,10 @@ #include "media/base/media_switches.h" #endif @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -400,7 +406,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -438,7 +444,10 @@ void PreloadLibraryCdms() { +@@ -422,7 +428,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -450,9 +459,16 @@ void PreSandboxInit() { +@@ -434,9 +443,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -764,7 +780,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( +@@ -746,7 +762,7 @@ NO_STACK_PROTECTOR int RunOtherNamedProcessTypeMain( unregister_thread_closure = base::HangWatcher::RegisterThread( base::HangWatcher::ThreadType::kMainThread); bool start_hang_watcher_now; @@ -80,7 +80,7 @@ // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is // initialized, because the sandbox can't be started with multiple threads. // TODO(mpdenton): start the HangWatcher after the sandbox is initialized. -@@ -874,11 +890,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -856,11 +872,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -94,7 +94,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1059,8 +1074,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1041,8 +1056,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -115,7 +115,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1157,6 +1184,11 @@ NO_STACK_PROTECTOR int ContentMainRunnerImpl::Run() { +@@ -1139,6 +1166,11 @@ NO_STACK_PROTECTOR int 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 c8b4d95c6d9f..b6685a8fe7ad 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- content/browser/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ content/browser/BUILD.gn -@@ -2434,6 +2434,14 @@ source_set("browser") { +@@ -2504,6 +2504,14 @@ source_set("browser") { ] } @@ -13,9 +13,9 @@ + } + if (is_linux || is_chromeos) { - sources += [ - "child_process_launcher_helper_linux.cc", -@@ -2477,6 +2485,15 @@ source_set("browser") { + sources -= + [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ] +@@ -2549,6 +2557,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/stable_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] 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 4cbe5f670e71..4899b5421cc5 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,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2024-11-04 08:56:03 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -328,6 +328,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -326,6 +326,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kLogBestEffortTasks, switches::kPerfettoDisableInterning, switches::kTraceToConsole, @@ -9,7 +9,7 @@ }; cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); -@@ -659,7 +661,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -655,7 +657,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 9db604d76e09..0066793ba37e 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-08-27 06:28:16 UTC +--- content/browser/browser_child_process_host_impl.h.orig 2025-02-22 18:06:53 UTC +++ content/browser/browser_child_process_host_impl.h -@@ -35,7 +35,7 @@ +@@ -36,7 +36,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) -@@ -269,7 +269,7 @@ class BrowserChildProcessHostImpl +@@ -270,7 +270,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 faa50365a07e..8a1adc30766d 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-11-04 08:56:03 UTC +--- content/browser/browser_main_loop.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/browser_main_loop.cc -@@ -250,6 +250,12 @@ +@@ -247,6 +247,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 -@@ -545,6 +551,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -541,6 +547,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 -@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() { base::ThreadType::kDisplayCritical); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 index 1d50d56885fe..8df783b4c635 100644 --- 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 @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2024-08-01 05:47:53 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -110,7 +110,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -109,7 +109,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc index 96fcb8cb211a..1c9234d2d8e8 100644 --- a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc +++ b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/devtools_frontend_host_impl.cc.orig 2024-08-01 05:47:53 UTC +--- content/browser/devtools/devtools_frontend_host_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/devtools/devtools_frontend_host_impl.cc -@@ -27,7 +27,7 @@ +@@ -24,7 +24,7 @@ #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "components/crash/content/browser/error_reporting/javascript_error_report.h" // nogncheck #include "components/crash/content/browser/error_reporting/js_error_report_processor.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -42,7 +42,7 @@ const char kCompatibilityScriptSourceURL[] = +@@ -36,7 +36,7 @@ const char kCompatibilityScriptSourceURL[] = "\n//# " "sourceURL=devtools://devtools/bundled/devtools_compatibility.js"; @@ -18,7 +18,7 @@ // Remove the pieces of the URL we don't want to send back with the error // reports. In particular, do not send query or fragments as those can have // privacy-sensitive information in them. -@@ -112,7 +112,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( +@@ -106,7 +106,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( const HandleMessageCallback& handle_message_callback) : web_contents_(WebContents::FromRenderFrameHost(frame_host)), handle_message_callback_(handle_message_callback) { @@ -27,7 +27,7 @@ Observe(web_contents_); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend; -@@ -137,7 +137,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage +@@ -131,7 +131,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage handle_message_callback_.Run(std::move(message)); } 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 5d8438f4bed3..3727116f8f9b 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 2024-06-25 12:08:48 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -51,7 +51,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -52,7 +52,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__path__watcher_file__path__watcher.h b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h index 03e05b6fc8c4..a97b203a4c16 100644 --- a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h +++ b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h @@ -1,6 +1,6 @@ ---- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig 2024-11-04 08:56:03 UTC +--- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig 2025-02-22 18:06:53 UTC +++ content/browser/file_system_access/file_path_watcher/file_path_watcher.h -@@ -125,7 +125,7 @@ class CONTENT_EXPORT FilePathWatcher { +@@ -126,7 +126,7 @@ class CONTENT_EXPORT FilePathWatcher { Type type = Type::kNonRecursive; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc index 1275420be397..95c709e29c1d 100644 --- a/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc +++ b/www/iridium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher__bsd.cc @@ -1,6 +1,6 @@ ---- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig 2024-08-01 05:47:53 UTC +--- content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/file_system_access/file_path_watcher/file_path_watcher_bsd.cc -@@ -0,0 +1,55 @@ +@@ -0,0 +1,60 @@ +// Copyright 2024 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -55,4 +55,9 @@ +FilePathWatcher::FilePathWatcher() + : FilePathWatcher(std::make_unique<FilePathWatcherImpl>()) {} + ++// static ++size_t FilePathWatcher::GetQuotaLimitImpl() { ++ return std::numeric_limits<size_t>::max(); ++} ++ +} // namespace content 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 f603b9b3f50c..f4b2b6b8e147 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,6 +1,6 @@ ---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2024-11-04 08:56:03 UTC +--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc -@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( +@@ -67,7 +67,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( .type = scope().IsRecursive() ? FilePathWatcher::Type::kRecursive : FilePathWatcher::Type::kNonRecursive, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ 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 69788e942723..adf351094d4b 100644 --- a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/compositor_util.cc.orig 2024-12-22 12:24:29 UTC +--- content/browser/gpu/compositor_util.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/gpu/compositor_util.cc -@@ -153,7 +153,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -152,7 +152,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_decode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, @@ -9,7 +9,7 @@ !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), -@@ -165,7 +165,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -164,7 +164,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_encode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, 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 b52907dae1e6..c0520abcf427 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 2024-12-22 12:24:29 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1672,7 +1672,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1675,7 +1675,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } 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 048ec083e0e3..1a5397ec5ae0 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,4 +1,4 @@ ---- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2024-11-04 08:56:03 UTC +--- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc @@ -46,7 +46,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun #endif @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported() { static bool is_computed = false; static bool supported = false; -@@ -98,7 +98,7 @@ GpuMemoryBufferManagerSingleton::GetInstance() { +@@ -111,7 +111,7 @@ void GpuMemoryBufferManagerSingleton::RemoveObserver( } void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUpdate() { 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 396dc1c7c633..650fba475c97 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,14 +1,14 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2024-11-04 08:56:03 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/gpu/gpu_process_host.cc @@ -275,6 +275,7 @@ static const char* const kSwitchNames[] = { - switches::kEnableLowEndDeviceMode, switches::kDisableSkiaGraphite, + switches::kDisableSkiaGraphitePrecompilation, switches::kDisableLowEndDeviceMode, + switches::kDisableUnveil, switches::kProfilingAtStart, switches::kProfilingFile, switches::kProfilingFlush, -@@ -302,7 +303,7 @@ static const char* const kSwitchNames[] = { +@@ -303,7 +304,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kEnableNativeGpuMemoryBuffers, #endif 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 519271e63ec8..b320c01c6514 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-08-01 05:47:53 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc -@@ -333,7 +333,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -332,7 +332,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe return; } --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) || BUILDFLAG(IS_WIN) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // 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 c7f24f4422cb..7fecf79686ac 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-11-04 08:56:03 UTC +--- content/browser/network_service_instance_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/network_service_instance_impl.cc -@@ -85,7 +85,7 @@ +@@ -84,7 +84,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 -@@ -368,7 +368,7 @@ void CreateInProcessNetworkService( +@@ -367,7 +367,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( -@@ -437,7 +437,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -436,7 +436,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 bbd63f46297a..2717466f4ac1 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,11 +1,11 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2024-06-25 12:08:48 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -318,7 +318,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -317,7 +317,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { --#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) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On Windows and Linux, we would like to produce new content as soon as // possible or the OS will create an additional black gutter. Until we can // block resize on surface synchronization on these platforms, we will not 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 30b3627eee5e..5edb5b7c20d6 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ #include "media/base/media_switches.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/gpu/gpu_data_manager_impl.h" #endif -@@ -173,7 +173,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs +@@ -176,7 +176,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs } #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { 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 dd51ddab7318..569a5a614482 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,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-12-22 12:24:29 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -220,7 +220,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1083,7 +1083,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1085,7 +1085,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1260,7 +1260,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1253,7 +1253,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -3264,7 +3264,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3269,7 +3269,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -36,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3320,6 +3320,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3325,6 +3325,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -45,7 +45,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -5102,7 +5104,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr +@@ -5135,7 +5137,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr // - Win: https://crbug.com/707022 . uint64_t total_size = 0; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ 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 9f65bda7240d..719a081bf515 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-12-22 12:24:29 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2025-02-22 18:06:53 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -102,7 +102,7 @@ +@@ -101,7 +101,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" #endif @@ -9,16 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #include "media/mojo/mojom/video_encode_accelerator.mojom.h" #endif -@@ -612,7 +612,7 @@ class CONTENT_EXPORT RenderProcessHostImpl - // Sets this RenderProcessHost to be guest only. For Testing only. - void SetForGuestsOnlyForTesting(); - --#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - // Launch the zygote early in the browser startup. - static void EarlyZygoteLaunch(); - #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -973,7 +973,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -981,7 +981,7 @@ class CONTENT_EXPORT RenderProcessHostImpl std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; @@ -27,3 +18,12 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; ChildThreadTypeSwitcher child_thread_type_switcher_; +@@ -1228,7 +1228,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + // if the request isn't handled on the IO thread. + void OnBindHostReceiver(mojo::GenericPendingReceiver receiver); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Provides /proc/{renderer pid}/status and statm files for the renderer, + // because the files are required to calculate the renderer's private + // footprint on Chromium Linux. Regarding MacOS X and Windows, we have 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 7676fdb6db65..010cd48cfdbe 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,15 +1,15 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-11-04 08:56:03 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,7 @@ #include "ui/gfx/gdi_util.h" - #endif + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/accessibility/platform/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -484,7 +484,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -478,7 +478,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ ui::BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1745,7 +1745,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1852,7 +1852,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,16 +27,16 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2654,7 +2654,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2822,7 +2822,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { --#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) return NeedsInputGrab(); #else return false; -@@ -2838,7 +2838,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -3006,7 +3006,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; 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 1a11b6c5b608..44f854f1e5b1 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 2024-11-04 08:56:03 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2025-02-22 18:06:53 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -267,7 +267,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -274,7 +274,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; 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 eca927e35f81..f84610f16061 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,11 +1,11 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2024-08-01 05:47:53 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2025-02-22 18:06:53 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. --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ - BUILDFLAG(IS_OZONE) +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE) task_execution_metadata_.clear(); #endif + return; 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 e0579f65f894..ed51ed4377f0 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-12-22 12:24:29 UTC +--- content/browser/utility_process_host.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/utility_process_host.cc -@@ -62,7 +62,7 @@ +@@ -63,7 +63,7 @@ #include "content/browser/v8_snapshot_files.h" #endif @@ -9,16 +9,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -76,7 +76,7 @@ - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "base/task/sequenced_task_runner.h" - #include "components/viz/host/gpu_client.h" - #include "media/capture/capture_switches.h" -@@ -87,7 +87,7 @@ namespace content { +@@ -91,7 +91,7 @@ namespace content { namespace { @@ -27,25 +18,7 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -153,7 +153,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr - name_(u"utility process"), - file_data_(std::make_unique<ChildProcessLauncherFileData>()), - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - allowed_gpu_(false), - gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), - #endif -@@ -213,7 +213,7 @@ void UtilityProcessHost::SetPreloadLibraries( - - void UtilityProcessHost::SetAllowGpuClient() { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - allowed_gpu_ = true; - #endif - } -@@ -410,7 +410,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -412,7 +412,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -54,14 +27,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -421,13 +421,13 @@ bool UtilityProcessHost::StartProcess() { - } - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only - // when the video capture use GPU memory buffer enabled. +@@ -429,7 +429,7 @@ bool UtilityProcessHost::StartProcess() { if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { bool pass_gpu_buffer_flag = switches::IsVideoCaptureUseGpuMemoryBufferEnabled(); diff --git a/www/iridium/files/patch-content_browser_utility__process__host.h b/www/iridium/files/patch-content_browser_utility__process__host.h deleted file mode 100644 index 4b6fd90a0189..000000000000 --- a/www/iridium/files/patch-content_browser_utility__process__host.h +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/utility_process_host.h.orig 2024-12-22 12:24:29 UTC -+++ content/browser/utility_process_host.h -@@ -34,7 +34,7 @@ class Thread; - } // namespace base - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - namespace viz { - class GpuClient; - } // namespace viz -@@ -202,7 +202,7 @@ class CONTENT_EXPORT UtilityProcessHost - LaunchState launch_state_ = LaunchState::kLaunchInProgress; - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || 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 a918b4768318..19accee414a4 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,22 +1,15 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2024-12-22 12:24:29 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/utility_process_host_receiver_bindings.cc -@@ -10,13 +10,13 @@ - #include "content/public/browser/content_browser_client.h" +@@ -10,7 +10,7 @@ #include "content/public/common/content_client.h" + #include "media/media_buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "components/viz/host/gpu_client.h" - #include "content/public/browser/gpu_client.h" - #endif -@@ -25,14 +25,14 @@ namespace content { +@@ -24,7 +24,7 @@ namespace content { void UtilityProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { @@ -25,11 +18,3 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; - } - #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || 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 10b26242e068..655ca5d88acf 100644 --- a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,21 +1,22 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2024-12-22 12:24:29 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -76,10 +76,10 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -77,7 +77,7 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif --#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 || - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -93,10 +93,10 @@ UtilitySandboxedProcessLauncherDelegate:: - #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) +@@ -90,14 +90,14 @@ UtilitySandboxedProcessLauncherDelegate:: + #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) + #endif // BUILDFLAG(IS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI || + sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend || #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -26,21 +27,22 @@ sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation || #endif sandbox_type_ == sandbox::mojom::Sandbox::kAudio || -@@ -142,10 +142,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -143,7 +143,7 @@ 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 || - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -163,7 +163,7 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe - #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) +@@ -157,11 +157,11 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe + #endif // BUILDFLAG(IS_CHROMEOS) + sandbox_type_ == sandbox::mojom::Sandbox::kAudio || + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend || sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI || #endif -#if BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc b/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc index 184b1acd8691..d9e01c377604 100644 --- a/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc +++ b/www/iridium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc @@ -1,6 +1,6 @@ ---- content/browser/web_contents/slow_web_preference_cache.cc.orig 2024-12-22 12:24:29 UTC +--- content/browser/web_contents/slow_web_preference_cache.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/web_contents/slow_web_preference_cache.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #if BUILDFLAG(IS_WIN) #include "ui/events/devices/input_device_observer_win.h" @@ -9,7 +9,7 @@ #include "ui/events/devices/device_data_manager.h" #elif BUILDFLAG(IS_ANDROID) #include "ui/base/device_form_factor.h" -@@ -54,7 +54,7 @@ SlowWebPreferenceCache::SlowWebPreferenceCache() { +@@ -57,7 +57,7 @@ SlowWebPreferenceCache::SlowWebPreferenceCache() { #if BUILDFLAG(IS_WIN) ui::InputDeviceObserverWin::GetInstance()->AddObserver(this); @@ -18,7 +18,7 @@ ui::DeviceDataManager::GetInstance()->AddObserver(this); #elif BUILDFLAG(IS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); -@@ -64,7 +64,7 @@ SlowWebPreferenceCache::SlowWebPreferenceCache() { +@@ -69,7 +69,7 @@ SlowWebPreferenceCache::SlowWebPreferenceCache() { SlowWebPreferenceCache::~SlowWebPreferenceCache() { #if BUILDFLAG(IS_WIN) ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); 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 1930df070c86..0ae4bc0c9856 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-12-22 12:24:29 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -258,7 +258,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -259,7 +259,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1326,7 +1326,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1328,7 +1328,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 3e8682cf3432..46c11f6eb698 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,38 +1,11 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ content/browser/webui/web_ui_main_frame_observer.cc -@@ -13,7 +13,7 @@ - #include "content/public/browser/navigation_handle.h" - #include "content/public/browser/web_ui_controller.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/feature_list.h" - #include "base/functional/callback_helpers.h" - #include "base/logging.h" -@@ -31,7 +31,7 @@ namespace content { - - namespace { - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Remove the pieces of the URL we don't want to send back with the error - // reports. In particular, do not send query or fragments as those can have - // privacy-sensitive information in them. -@@ -55,7 +55,7 @@ WebUIMainFrameObserver::WebUIMainFrameObserver(WebUIIm - - WebUIMainFrameObserver::~WebUIMainFrameObserver() = default; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void WebUIMainFrameObserver::OnDidAddMessageToConsole( - RenderFrameHost* source_frame, - blink::mojom::ConsoleMessageLevel log_level, -@@ -167,7 +167,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( - - // 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) - MaybeEnableWebUIJavaScriptErrorReporting(navigation_handle); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } +@@ -47,7 +47,7 @@ std::string RedactURL(const GURL& url) { + bool IsWebUIJavaScriptErrorReportingSupported() { + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + return false; +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return base::FeatureList::IsEnabled(features::kWebUIJSErrorReportingExtended); 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 deleted file mode 100644 index ba6013af379a..000000000000 --- a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/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) - // On official Google builds, capture and report JavaScript error messages on - // WebUI surfaces back to Google. This allows us to fix JavaScript errors and - // exceptions. -@@ -60,7 +60,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W - void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override; - - private: --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void MaybeEnableWebUIJavaScriptErrorReporting( - NavigationHandle* navigation_handle); - 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 3fb418f64536..c2dd689429f6 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,7 +1,7 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-11-04 08:56:03 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2025-02-22 18:06:53 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -19,8 +19,10 @@ - #include "build/chromeos_buildflags.h" +@@ -18,8 +18,10 @@ + #include "build/build_config.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" +#if !BUILDFLAG(IS_BSD) @@ -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, -@@ -60,6 +63,7 @@ bool ReceiveFixedMessage(int fd, +@@ -59,6 +62,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -27,7 +27,7 @@ } // namespace -@@ -69,9 +73,13 @@ ZygoteHost* ZygoteHost::GetInstance() { +@@ -68,9 +72,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -41,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -84,6 +92,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -83,6 +91,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; } -@@ -138,6 +147,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -137,6 +146,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -57,7 +57,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -162,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -161,6 +171,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -65,7 +65,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -230,9 +241,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -229,9 +240,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h index 5cdca9331e95..6e9a9cfa55f7 100644 --- a/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h +++ b/www/iridium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,6 +1,6 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2023-03-13 07:33:08 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2025-02-22 18:06:53 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.h -@@ -47,12 +47,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos +@@ -46,12 +46,14 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds); @@ -15,7 +15,7 @@ bool HasZygote() { return !zygote_pids_.empty(); } -@@ -67,9 +69,11 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos +@@ -66,9 +68,11 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos int renderer_sandbox_status_; diff --git a/www/iridium/files/patch-content_child_BUILD.gn b/www/iridium/files/patch-content_child_BUILD.gn index ddaefaece19a..952c1549b134 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-06-25 12:08:48 UTC +--- content/child/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ content/child/BUILD.gn -@@ -130,6 +130,13 @@ target(link_target_type, "child") { +@@ -134,6 +134,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 b64b1a783725..fe2326b9f0e2 100644 --- a/www/iridium/files/patch-content_common_BUILD.gn +++ b/www/iridium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2024-11-04 08:56:03 UTC +--- content/common/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ content/common/BUILD.gn -@@ -386,19 +386,28 @@ source_set("common") { +@@ -384,19 +384,28 @@ source_set("common") { } if (is_linux || is_chromeos) { diff --git a/www/iridium/files/patch-content_common_features.cc b/www/iridium/files/patch-content_common_features.cc index 6b10520e16ca..332c94d40fb4 100644 --- a/www/iridium/files/patch-content_common_features.cc +++ b/www/iridium/files/patch-content_common_features.cc @@ -1,7 +1,7 @@ ---- content/common/features.cc.orig 2024-12-22 12:24:29 UTC +--- content/common/features.cc.orig 2025-02-22 18:06:53 UTC +++ content/common/features.cc -@@ -143,7 +143,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -130,7 +130,7 @@ BASE_FEATURE(kEmbeddingRequiresOptIn, + base::FEATURE_DISABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,12 +9,3 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -306,7 +306,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. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kHandleChildThreadTypeChangesInBrowser, - "HandleChildThreadTypeChangesInBrowser", - base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-content_common_features.h b/www/iridium/files/patch-content_common_features.h index d629ea291985..a685b980deb8 100644 --- a/www/iridium/files/patch-content_common_features.h +++ b/www/iridium/files/patch-content_common_features.h @@ -1,20 +1,11 @@ ---- content/common/features.h.orig 2024-12-22 12:24:29 UTC +--- content/common/features.h.orig 2025-02-22 18:06:53 UTC +++ content/common/features.h -@@ -34,7 +34,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg - CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); - CONTENT_EXPORT BASE_DECLARE_FEATURE( - kEnableBackForwardCacheForOngoingSubframeNavigation); +@@ -29,7 +29,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginEn + CONTENT_EXPORT BASE_DECLARE_FEATURE(kCommittedOriginTracking); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kCriticalClientHint); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); -#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(kEmbeddingRequiresOptIn); -@@ -80,7 +80,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); - #endif - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleChildThreadTypeChangesInBrowser); - #endif - #if BUILDFLAG(IS_ANDROID) 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 7265beb20d3e..cb19d479b6b3 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-06-25 12:08:48 UTC +--- content/gpu/gpu_child_thread.cc.orig 2025-02-22 18:06:53 UTC +++ content/gpu/gpu_child_thread.cc -@@ -58,7 +58,7 @@ +@@ -57,7 +57,7 @@ #include "third_party/skia/include/ports/SkFontConfigInterface.h" #endif @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -142,7 +142,8 @@ void GpuChildThread::Init(const base::TimeTicks& proce +@@ -147,7 +147,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 f31d18773620..d57c7aa086ec 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2024-12-22 12:24:29 UTC +--- content/gpu/gpu_main.cc.orig 2025-02-22 18:06:53 UTC +++ content/gpu/gpu_main.cc @@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" @@ -25,16 +25,16 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -175,7 +179,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel - bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, +@@ -177,7 +181,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { + GPU_STARTUP_TRACE_EVENT("gpu_main::EnsureSandboxInitialized"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -293,7 +297,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -300,7 +304,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -43,7 +43,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -318,7 +322,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -326,7 +330,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain"); @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -449,7 +454,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -459,7 +464,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,12 +62,12 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -489,7 +494,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -499,7 +504,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Video decoding of many video streams can use thousands of FDs as well as - // Exo clients like Lacros. + // Exo clients. // See https://crbug.com/1417237 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 3e82a4fd1b16..4060262fae06 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-12-22 12:24:29 UTC +--- content/public/browser/content_browser_client.cc.orig 2025-02-22 18:06:53 UTC +++ content/public/browser/content_browser_client.cc -@@ -1343,7 +1343,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1361,7 +1361,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 deleted file mode 100644 index 408617b82b1f..000000000000 --- a/www/iridium/files/patch-content_public_browser_service__process__host.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/browser/service_process_host.cc.orig 2024-12-22 12:24:29 UTC -+++ content/public/browser/service_process_host.cc -@@ -71,7 +71,7 @@ ServiceProcessHost::Options::WithPreloadedLibraries( - ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient( - base::PassKey<ServiceProcessHostGpuClient> passkey) { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - allow_gpu_client = true; - #endif - return *this; diff --git a/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h b/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h index 4482260daf7f..a7e1982d5b9f 100644 --- a/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h +++ b/www/iridium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h @@ -1,6 +1,6 @@ ---- content/public/browser/zygote_host/zygote_host_linux.h.orig 2023-03-13 07:33:08 UTC +--- content/public/browser/zygote_host/zygote_host_linux.h.orig 2025-02-22 18:06:53 UTC +++ content/public/browser/zygote_host/zygote_host_linux.h -@@ -35,11 +35,13 @@ class ZygoteHost { +@@ -34,11 +34,13 @@ class ZygoteHost { // after the first render has been forked. virtual int GetRendererSandboxStatus() = 0; 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 77fbda9c4d00..92c686a35440 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,27 +1,27 @@ ---- content/public/common/content_features.cc.orig 2024-12-22 12:24:29 UTC +--- content/public/common/content_features.cc.orig 2025-02-22 18:06:53 UTC +++ content/public/common/content_features.cc -@@ -65,7 +65,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) || \ -- (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +@@ -68,7 +68,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, + // Runs the audio service in a separate process. + BASE_FEATURE(kAudioServiceOutOfProcess, + "AudioServiceOutOfProcess", +-#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 -@@ -1218,9 +1218,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1209,9 +1209,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)) && \ ++ 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 #else -@@ -1257,7 +1257,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1258,7 +1258,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, // 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 276acf7be040..1e3c88a924bf 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-12-22 12:24:29 UTC +--- content/public/common/content_switches.cc.orig 2025-02-22 18:06:53 UTC +++ content/public/common/content_switches.cc -@@ -350,6 +350,10 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -346,6 +346,10 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -11,12 +11,12 @@ // 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. -@@ -969,7 +973,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -946,7 +950,7 @@ const char kPreventResizingContentsForTesting[] = + "prevent-resizing-contents-for-testing"; + #endif - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Allows sending text-to-speech requests to speech-dispatcher, a common // Linux speech service. Because it's buggy, the user must explicitly // enable it so that visiting a random webpage can't cause instability. 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 bc83700498ce..29819885c163 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-12-22 12:24:29 UTC +--- content/public/common/content_switches.h.orig 2025-02-22 18:06:53 UTC +++ content/public/common/content_switches.h -@@ -110,6 +110,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -108,6 +108,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,12 +9,12 @@ 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 kPreventResizingConte +@@ -258,7 +260,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD + CONTENT_EXPORT extern const char kPreventResizingContentsForTesting[]; + #endif - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) CONTENT_EXPORT extern const char kEnableSpeechDispatcher[]; - CONTENT_EXPORT extern const char kLLVMProfileFile[]; #endif + 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 83613879c4ec..ad0f07d7de71 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-12-22 12:24:29 UTC +--- content/renderer/render_thread_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/renderer/render_thread_impl.cc -@@ -214,6 +214,8 @@ +@@ -211,6 +211,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1017,7 +1019,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1047,7 +1049,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1026,7 +1028,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1056,7 +1058,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1830,7 +1832,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1849,7 +1851,7 @@ RenderThreadImpl::CreateMediaMojoCodecFactory( 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 76d598ba6ba2..efb7b1b705aa 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-08-27 06:28:16 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2025-02-22 18:06:53 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -127,7 +127,7 @@ +@@ -129,7 +129,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 "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -198,13 +198,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -224,7 +224,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -284,7 +284,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -285,7 +285,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 85f950ee7072..c4876f18657a 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-12-22 12:24:29 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2025-02-22 18:06:53 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -254,7 +254,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -256,7 +256,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 83a6a27513b0..d5b63973ae5b 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-12-22 12:24:29 UTC +--- content/shell/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ content/shell/BUILD.gn -@@ -1086,7 +1086,7 @@ group("content_shell_crash_test") { +@@ -1082,7 +1082,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_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc index ffb42cb177b1..76aee3ca9a4d 100644 --- a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,33 +1,33 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2023-10-21 11:51:27 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2025-02-22 18:06:53 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -51,7 +51,7 @@ +@@ -50,7 +50,7 @@ #include "net/base/network_change_notifier.h" #endif --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +-#if BUILDFLAG(IS_LINUX) && defined(USE_AURA) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(USE_AURA) #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -68,7 +68,7 @@ - #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h" +@@ -61,7 +61,7 @@ + #include "device/bluetooth/floss/floss_features.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h" #include "ui/linux/linux_ui.h" // nogncheck #include "ui/linux/linux_ui_factory.h" // nogncheck - #endif -@@ -139,7 +139,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -128,7 +128,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( } int ShellBrowserMainParts::PreEarlyInitialization() { --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +-#if BUILDFLAG(IS_LINUX) && defined(USE_AURA) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_AURA) ui::InitializeInputMethodForTesting(); - #endif - #if BUILDFLAG(IS_ANDROID) -@@ -168,7 +168,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { + #elif BUILDFLAG(IS_ANDROID) + net::NetworkChangeNotifier::SetFactory( +@@ -156,7 +156,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { if (switches::IsRunWebTestsSwitchPresent()) return; @@ -36,7 +36,7 @@ ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi()); #endif } -@@ -215,7 +215,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { +@@ -203,7 +203,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { ShellDevToolsManagerDelegate::StopHttpHandler(); browser_context_.reset(); off_the_record_browser_context_.reset(); 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 index f9a88659124d..03de70a620d0 100644 --- 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 @@ -1,6 +1,6 @@ ---- content/shell/renderer/shell_content_renderer_client.cc.orig 2024-06-25 12:08:48 UTC +--- content/shell/renderer/shell_content_renderer_client.cc.orig 2025-02-22 18:06:53 UTC +++ content/shell/renderer/shell_content_renderer_client.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "media/base/media_switches.h" #endif diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 72d3f9922e0c..70dc575d2e36 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-12-22 12:24:29 UTC +--- content/utility/services.cc.orig 2025-02-22 18:06:53 UTC +++ content/utility/services.cc -@@ -74,7 +74,7 @@ +@@ -73,7 +73,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,25 +9,16 @@ #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" -@@ -102,7 +102,7 @@ extern sandbox::TargetServices* g_utility_target_servi - #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || +@@ -101,7 +101,7 @@ extern sandbox::TargetServices* g_utility_target_servi + #endif // BUILDFLAG(IS_CHROMEOS) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) --#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)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck -@@ -120,7 +120,7 @@ extern sandbox::TargetServices* g_utility_target_servi - #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "media/capture/capture_switches.h" - #include "services/viz/public/cpp/gpu/gpu.h" - #include "services/viz/public/mojom/gpu.mojom.h" -@@ -240,7 +240,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -237,7 +237,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -36,26 +27,17 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -337,7 +337,7 @@ auto RunVideoCapture( - auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( - std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) - { - #else -@@ -392,7 +392,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( - #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || - // BUILDFLAG(USE_V4L2_CODEC)) +@@ -381,7 +381,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( + #endif // BUILDFLAG(IS_CHROMEOS) && \ + // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) --#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)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -403,7 +403,7 @@ auto RunStableVideoDecoderFactoryProcessService( - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && +@@ -392,7 +392,7 @@ auto RunStableVideoDecoderFactoryProcessService( + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -63,26 +45,17 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -426,7 +426,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -415,7 +415,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ - (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - if (base::FeatureList::IsEnabled( - features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -482,7 +482,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& - #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || - // BUILDFLAG(USE_V4L2_CODEC)) - --#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)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS)) && \ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) - if (!base::FeatureList::IsEnabled( - features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -491,7 +491,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && + services.Add(RunStableVideoDecoderFactoryProcessService); + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && +@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + #endif // BUILDFLAG(IS_CHROMEOS) && \ // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-content_utility_utility__main.cc b/www/iridium/files/patch-content_utility_utility__main.cc index cac66584cf05..b78adc819e1d 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-12-22 12:24:29 UTC +--- content/utility/utility_main.cc.orig 2025-02-22 18:06:53 UTC +++ content/utility/utility_main.cc -@@ -37,17 +37,21 @@ +@@ -36,18 +36,22 @@ #include "services/tracing/public/cpp/trace_startup.h" #include "services/video_effects/public/cpp/buildflags.h" @@ -16,21 +16,17 @@ #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_decoding_sandbox_hook_linux.h" #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h" +#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" - // gn check is not smart enough to realize that this include only applies to -@@ -59,11 +63,16 @@ - #endif - #endif + #include "services/screen_ai/buildflags/buildflags.h" +@@ -66,7 +70,12 @@ --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_BSD) @@ -42,24 +38,16 @@ #include "services/video_effects/video_effects_sandbox_hook_linux.h" // nogncheck #endif // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) -@@ -78,7 +87,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 "services/screen_ai/public/cpp/utilities.h" // nogncheck - #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck - #endif -@@ -102,14 +111,14 @@ +@@ -101,7 +110,7 @@ sandbox::TargetServices* g_utility_target_services = nullptr; #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) #include "components/services/on_device_translation/sandbox_hook.h" - #endif // BUILDFLAG(IS_LINUX) - namespace content { + #endif // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) + +@@ -109,7 +118,7 @@ namespace content { namespace { @@ -68,27 +56,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -136,9 +145,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) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) - sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -153,6 +163,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) { +@@ -247,7 +256,8 @@ int UtilityMain(MainFunctionParams parameters) { CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); } @@ -98,8 +66,8 @@ // 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) { - } +@@ -255,7 +265,7 @@ int UtilityMain(MainFunctionParams parameters) { + SandboxedProcessThreadTypeHandler::Create(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -107,18 +75,18 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -292,7 +304,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -287,7 +297,7 @@ int UtilityMain(MainFunctionParams parameters) { pre_sandbox_hook = base::BindOnce(&speech::SpeechRecognitionPreSandboxHook); break; --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) case sandbox::mojom::Sandbox::kOnDeviceTranslation: pre_sandbox_hook = base::BindOnce( &on_device_translation::OnDeviceTranslationSandboxHook); -@@ -306,13 +318,13 @@ int UtilityMain(MainFunctionParams parameters) { - screen_ai::GetBinaryPathSwitch())); - break; +@@ -303,13 +313,13 @@ int UtilityMain(MainFunctionParams parameters) { + #else + NOTREACHED(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -127,12 +95,12 @@ base::BindOnce(&video_effects::VideoEffectsPreSandboxHook); break; #endif // BUILDFLAG(IS_LINUX) --#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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -339,6 +351,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -336,6 +346,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -140,7 +108,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -346,6 +359,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -343,6 +354,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_zygote_zygote__linux.cc b/www/iridium/files/patch-content_zygote_zygote__linux.cc index 54d892b78e86..1a58c268c382 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 2024-08-01 05:47:53 UTC +--- content/zygote/zygote_linux.cc.orig 2025-02-22 18:06:53 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright 2012 The Chromium Authors @@ -8,7 +8,7 @@ #ifdef UNSAFE_BUFFERS_BUILD // TODO(crbug.com/342213636): Remove this and spanify to fix the errors. -@@ -723,3 +724,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi +@@ -709,3 +710,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi } } // namespace content diff --git a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc index 22c020984642..8e5161c410d6 100644 --- a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2024-08-27 06:28:16 UTC +--- device/gamepad/gamepad_provider.cc.orig 2025-02-22 18:06:53 UTC +++ device/gamepad/gamepad_provider.cc -@@ -224,7 +224,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -159,7 +159,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); 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 e671749d63db..605660ee890d 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,6 +1,6 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-12-22 12:24:29 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -117,7 +117,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -120,7 +120,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt #endif MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -8,4 +8,4 @@ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) NetworkingPrivateEventRouterFactory::GetInstance(); #endif - OffscreenDocumentManager::GetFactory(); + PrinterProviderAPIFactory::GetInstance(); 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 00367ef3db32..e1ccd007a057 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-08-27 06:28:16 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -78,7 +78,7 @@ namespace { +@@ -74,7 +74,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -551,7 +551,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -634,7 +634,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index 5d0ef6c7925c..23465b8b7959 100644 --- a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2024-12-22 12:24:29 UTC +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc @@ -12,7 +12,7 @@ @@ -18,3 +18,12 @@ delegate = std::make_unique<NetworkingPrivateLinux>(); #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); +@@ -74,7 +74,7 @@ NetworkingPrivateDelegateFactory::BuildServiceInstance + #endif + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (ui_factory_) { + delegate->set_ui_delegate(ui_factory_->CreateDelegate()); + } diff --git a/www/iridium/files/patch-extensions_common_api___permission__features.json b/www/iridium/files/patch-extensions_common_api___permission__features.json index 1c1a0124dbf6..ea08c02f3190 100644 --- a/www/iridium/files/patch-extensions_common_api___permission__features.json +++ b/www/iridium/files/patch-extensions_common_api___permission__features.json @@ -1,15 +1,15 @@ ---- extensions/common/api/_permission_features.json.orig 2024-02-04 14:46:08 UTC +--- extensions/common/api/_permission_features.json.orig 2025-02-22 18:06:53 UTC +++ extensions/common/api/_permission_features.json @@ -138,7 +138,7 @@ { "channel": "stable", "extension_types": ["platform_app"], -- "platforms": ["chromeos", "lacros", "win", "mac", "linux"], -+ "platforms": ["chromeos", "lacros", "win", "mac", "linux", "openbsd", "freebsd"], +- "platforms": ["chromeos", "win", "mac", "linux"], ++ "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"], "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -432,7 +432,7 @@ +@@ -423,7 +423,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,12 +18,12 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -476,7 +476,7 @@ +@@ -467,7 +467,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], -- "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia"], -+ "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], +- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"], ++ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], "allowlist": [ // DO NOT ADD ANY MORE ENTRIES HERE. // networkingPrivate is being migrated to networking.onc. diff --git a/www/iridium/files/patch-extensions_common_command.cc b/www/iridium/files/patch-extensions_common_command.cc index be1e8a20f271..85bb6df310e1 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 2024-11-04 08:56:03 UTC +--- extensions/common/command.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/common/command.cc -@@ -286,7 +286,7 @@ std::string Command::CommandPlatform() { +@@ -281,7 +281,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/iridium/files/patch-extensions_common_features_feature.cc b/www/iridium/files/patch-extensions_common_features_feature.cc index 34d69d7417b9..c6657c5b8433 100644 --- a/www/iridium/files/patch-extensions_common_features_feature.cc +++ b/www/iridium/files/patch-extensions_common_features_feature.cc @@ -1,6 +1,6 @@ ---- extensions/common/features/feature.cc.orig 2023-10-21 11:51:27 UTC +--- extensions/common/features/feature.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/common/features/feature.cc -@@ -34,6 +34,8 @@ Feature::Platform Feature::GetCurrentPlatform() { +@@ -29,6 +29,8 @@ Feature::Platform Feature::GetCurrentPlatform() { return WIN_PLATFORM; #elif BUILDFLAG(IS_FUCHSIA) return FUCHSIA_PLATFORM; diff --git a/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc index b9bd0e29066c..e0c55d2eee7c 100644 --- a/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/iridium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,8 +1,8 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2024-11-04 08:56:03 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/renderer/bindings/api_binding_util.cc -@@ -133,7 +133,7 @@ std::string GetPlatformString() { - return "lacros"; - #elif BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -128,7 +128,7 @@ void InvalidateContext(v8::Local<v8::Context> context) + std::string GetPlatformString() { + #if BUILDFLAG(IS_CHROMEOS) return "chromeos"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 16b2cd8d4380..ebbaeacfdb3f 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,6 +1,6 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2024-06-25 12:08:48 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/shell/app/shell_main_delegate.cc -@@ -43,7 +43,7 @@ +@@ -40,7 +40,7 @@ #if BUILDFLAG(IS_WIN) #include "base/base_paths_win.h" #include "base/process/process_info.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -63,7 +63,7 @@ base::FilePath GetDataPath() { +@@ -60,7 +60,7 @@ base::FilePath GetDataPath() { } base::FilePath data_dir; diff --git a/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc index 345ec9d6c3b1..988b9bc22f48 100644 --- a/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc +++ b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -1,11 +1,11 @@ ---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2024-11-04 08:56:03 UTC +--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc @@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) info->os = api::runtime::PlatformOs::kCros; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) info->os = api::runtime::PlatformOs::kLinux; #endif return true; diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc index 2b2e84625ff5..c143b272c986 100644 --- a/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc +++ b/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc @@ -1,11 +1,11 @@ ---- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-10-05 07:34:01 UTC +--- extensions/shell/browser/shell_browser_main_parts.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/shell/browser/shell_browser_main_parts.cc -@@ -150,7 +150,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( switches::kAppShellAllowRoaming)) { network_controller_->SetCellularAllowRoaming(true); } --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // app_shell doesn't need GTK, so the fake input method context can work. // See crbug.com/381852 and revision fb69f142. // TODO(michaelpg): Verify this works for target environments. 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 41fd731ed0fb..ef2031d4d3f5 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,11 +1,20 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2024-06-25 12:08:48 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2025-02-22 18:06:53 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc -@@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() +@@ -18,7 +18,7 @@ + #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h" + #include "extensions/shell/browser/shell_web_view_guest_delegate.h" - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h" + #endif + +@@ -54,7 +54,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() + return std::make_unique<ShellDisplayInfoProvider>(); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() { if (!file_system_delegate_) file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>(); 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 b9ea61782df3..8e6573e05ceb 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,20 +1,19 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2024-06-25 12:08:48 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2025-02-22 18:06:53 UTC +++ extensions/shell/browser/shell_extensions_api_client.h -@@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC +@@ -34,14 +34,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC + content::BrowserContext* browser_context) const override; + std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider() const override; - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) FileSystemDelegate* GetFileSystemDelegate() override; #endif MessagingDelegate* GetMessagingDelegate() override; -@@ -45,7 +45,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC + FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override; + private: - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<FileSystemDelegate> file_system_delegate_; #endif std::unique_ptr<MessagingDelegate> messaging_delegate_; 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 fbed66d60518..7e8cd7b70bd1 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,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-12-22 12:24:29 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -302,7 +302,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -324,7 +324,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; 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 d0dcfe654cc4..222d7580a0e2 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-12-22 12:24:29 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2879,7 +2879,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2864,7 +2864,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc index 79c90282cbe1..79960d44d671 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_context_state.cc.orig 2024-11-04 08:56:03 UTC +--- gpu/command_buffer/service/shared_context_state.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/command_buffer/service/shared_context_state.cc -@@ -56,7 +56,7 @@ +@@ -62,7 +62,7 @@ #include "gpu/vulkan/vulkan_implementation.h" #include "gpu/vulkan/vulkan_util.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_semaphore_pool.h" #endif -@@ -287,7 +287,7 @@ SharedContextState::SharedContextState( +@@ -388,7 +388,7 @@ SharedContextState::SharedContextState( if (gr_context_type_ == GrContextType::kVulkan) { if (vk_context_provider_) { #if BUILDFLAG(ENABLE_VULKAN) && \ @@ -18,8 +18,8 @@ external_semaphore_pool_ = std::make_unique<ExternalSemaphorePool>(this); #endif use_virtualized_gl_contexts_ = false; -@@ -320,7 +320,7 @@ SharedContextState::~SharedContextState() { - transfer_cache_.reset(); +@@ -425,7 +425,7 @@ SharedContextState::~SharedContextState() { + } #if BUILDFLAG(ENABLE_VULKAN) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h index b243987823d6..bcb4e33e3947 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_context_state.h.orig 2024-11-04 08:56:03 UTC +--- gpu/command_buffer/service/shared_context_state.h.orig 2025-02-22 18:06:53 UTC +++ gpu/command_buffer/service/shared_context_state.h -@@ -222,7 +222,7 @@ class GPU_GLES2_EXPORT SharedContextState +@@ -235,7 +235,7 @@ class GPU_GLES2_EXPORT SharedContextState return &memory_type_tracker_; } #if BUILDFLAG(ENABLE_VULKAN) && \ @@ -9,7 +9,7 @@ ExternalSemaphorePool* external_semaphore_pool() { return external_semaphore_pool_.get(); } -@@ -429,7 +429,7 @@ class GPU_GLES2_EXPORT SharedContextState +@@ -448,7 +448,7 @@ class GPU_GLES2_EXPORT SharedContextState bool disable_check_reset_status_throttling_for_test_ = false; #if BUILDFLAG(ENABLE_VULKAN) && \ 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 2d0b8766379a..98dd0d1fd290 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,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-12-22 12:24:29 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -57,7 +57,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" -@@ -704,7 +704,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -702,7 +702,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats, scoped_refptr<SharedContextState> context_state) { 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 f16ebc705ff8..aaf893359654 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,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-11-04 08:56:03 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc @@ -48,7 +48,7 @@ #include "gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.h" @@ -18,7 +18,7 @@ return gfx::GpuMemoryBufferType::NATIVE_PIXMAP; #elif BUILDFLAG(IS_WIN) return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE; -@@ -315,7 +315,7 @@ SharedImageFactory::SharedImageFactory( +@@ -316,7 +316,7 @@ SharedImageFactory::SharedImageFactory( context_state_, workarounds_); factories_.push_back(std::move(ozone_factory)); } 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 eea8b8322dde..9c7c7f4a7d44 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-12-22 12:24:29 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1390,7 +1390,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1364,7 +1364,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -2075,7 +2075,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -2061,7 +2061,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 44be7508c2d6..b403c9dcad82 100644 --- a/www/iridium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/iridium/files/patch-gpu_config_gpu__control__list.cc @@ -1,15 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2024-12-22 12:24:29 UTC +--- gpu/config/gpu_control_list.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/config/gpu_control_list.cc -@@ -277,7 +277,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( - GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { - #if BUILDFLAG(IS_CHROMEOS) - return kGLTypeGL; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return kGLTypeGL; - #elif BUILDFLAG(IS_MAC) - return kGLTypeGL; -@@ -848,7 +848,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -831,7 +831,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 ca17bb19f67e..1285594d04ec 100644 --- a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc +++ b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_finch_features.cc.orig 2024-12-22 12:24:29 UTC +--- gpu/config/gpu_finch_features.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/config/gpu_finch_features.cc -@@ -147,7 +147,8 @@ const base::FeatureParam<std::string> +@@ -156,7 +156,8 @@ BASE_FEATURE(kAllowHardwareBufferUsageFlagsFromVulkanF BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc index 4ca46493b942..1212dd94ca0b 100644 --- a/www/iridium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/iridium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_info_collector.cc.orig 2024-12-22 12:24:29 UTC +--- gpu/config/gpu_info_collector.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/config/gpu_info_collector.cc -@@ -362,7 +362,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -360,7 +360,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", 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 766298d59956..ad07ca5554f8 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-12-22 12:24:29 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2025-02-22 18:06:53 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -392,7 +392,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 -@@ -424,7 +424,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -430,7 +430,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. -@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -532,7 +532,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 -@@ -610,7 +610,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -614,7 +614,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; -@@ -766,7 +766,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -784,7 +784,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. -@@ -821,7 +821,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -839,7 +839,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 -@@ -1008,7 +1008,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1036,7 +1036,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 -@@ -1063,7 +1063,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1091,7 +1091,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc index b3ad85d98098..b802273a1a50 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2023-10-21 11:51:27 UTC +--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2025-02-22 18:06:53 UTC +++ headless/lib/browser/headless_browser_main_parts_posix.cc -@@ -21,13 +21,13 @@ +@@ -22,13 +22,13 @@ #include "content/public/browser/browser_thread.h" #include "headless/lib/browser/headless_browser_impl.h" @@ -11,12 +11,12 @@ #include "components/os_crypt/sync/os_crypt.h" #include "headless/public/switches.h" --#if defined(USE_DBUS) -+#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD) +-#if BUILDFLAG(USE_DBUS) ++#if BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_BSD) #include "device/bluetooth/dbus/bluez_dbus_manager.h" #endif -@@ -161,7 +161,7 @@ class BrowserShutdownHandler { +@@ -162,7 +162,7 @@ class BrowserShutdownHandler { } // namespace @@ -25,15 +25,15 @@ constexpr char kProductName[] = "HeadlessChrome"; #endif -@@ -169,9 +169,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo +@@ -170,9 +170,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo BrowserShutdownHandler::Install(base::BindOnce( &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr())); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) --#if defined(USE_DBUS) -+#if defined(USE_DBUS) && !BUILDFLAG(IS_BSD) +-#if BUILDFLAG(USE_DBUS) ++#if BUILDFLAG(USE_DBUS) && !BUILDFLAG(IS_BSD) bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr); #endif diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 9c420aa90508..46005e18b600 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,4 +1,4 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2024-12-22 12:24:29 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2025-02-22 18:06:53 UTC +++ headless/lib/browser/headless_content_browser_client.cc @@ -56,7 +56,7 @@ #include "content/public/common/content_descriptors.h" @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" // nogncheck #include "content/public/browser/network_service_util.h" #endif -@@ -488,7 +488,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll +@@ -517,7 +517,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll void HeadlessContentBrowserClient::SetEncryptionKey( ::network::mojom::NetworkService* network_service) { 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 9a59b38a3697..a7789379b820 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 2024-06-25 12:08:48 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2025-02-22 18:06:53 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -62,7 +62,7 @@ namespace headless { +@@ -71,7 +71,7 @@ BASE_FEATURE(kPrerender2InHeadlessMode, namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index 0aeb7ebe93a4..864321371d4a 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-11-04 08:56:03 UTC +--- media/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ media/BUILD.gn -@@ -91,6 +91,9 @@ config("media_config") { +@@ -93,6 +93,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 8d11505e121f..be98610e4a93 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2024-11-04 08:56:03 UTC +--- media/audio/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ media/audio/BUILD.gn -@@ -268,9 +268,23 @@ source_set("audio") { +@@ -269,9 +269,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } 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 71be572574d9..41727d5851c8 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 2024-11-04 08:56:03 UTC +--- media/audio/audio_input_device.cc.orig 2025-02-22 18:06:53 UTC +++ media/audio/audio_input_device.cc -@@ -269,7 +269,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -275,7 +275,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_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index 2109b5107f89..329e9d231c23 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-12-22 12:24:29 UTC +--- media/base/media_switches.cc.orig 2025-02-22 18:06:53 UTC +++ media/base/media_switches.cc -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ #include "ui/gl/gl_features.h" #include "ui/gl/gl_utils.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -375,8 +375,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, +@@ -378,8 +378,8 @@ BASE_FEATURE(kUseSCContentSharingPicker, "UseSCContentSharingPicker", base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_MAC) @@ -20,7 +20,7 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -386,6 +386,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, +@@ -389,6 +389,28 @@ BASE_FEATURE(kPulseaudioLoopbackForCast, BASE_FEATURE(kPulseaudioLoopbackForScreenShare, "PulseaudioLoopbackForScreenShare", base::FEATURE_DISABLED_BY_DEFAULT); @@ -49,7 +49,7 @@ #endif // BUILDFLAG(IS_LINUX) // When enabled, MediaCapabilities will check with GPU Video Accelerator -@@ -674,7 +696,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, +@@ -634,7 +656,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -58,7 +58,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -697,7 +719,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -657,7 +679,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -67,7 +67,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -709,7 +731,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -669,7 +691,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -738,7 +760,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -698,7 +720,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -85,7 +85,7 @@ // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default // on chromeos, but needs an experiment on linux. BASE_FEATURE(kAcceleratedVideoDecodeLinux, -@@ -838,7 +860,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, +@@ -802,7 +824,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, "VSyncMjpegDecoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -94,7 +94,7 @@ // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS. BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding, "V4L2H264TemporalLayerHWEncoding", -@@ -1453,7 +1475,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1380,7 +1402,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -103,7 +103,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1533,7 +1555,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1460,7 +1482,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h index 7a1a18ec644d..0c655bc9e8f7 100644 --- a/www/iridium/files/patch-media_base_media__switches.h +++ b/www/iridium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2024-12-22 12:24:29 UTC +--- media/base/media_switches.h.orig 2025-02-22 18:06:53 UTC +++ media/base/media_switches.h -@@ -333,13 +333,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -326,13 +326,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kMediaRecorderHEVCSu MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -28,7 +28,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -353,7 +365,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); +@@ -346,7 +358,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); @@ -37,7 +37,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux); -@@ -374,7 +386,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLay +@@ -368,7 +380,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiAV1TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -46,7 +46,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -@@ -511,7 +523,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide +@@ -499,7 +511,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/iridium/files/patch-media_base_user__input__monitor__unittest.cc b/www/iridium/files/patch-media_base_user__input__monitor__unittest.cc deleted file mode 100644 index ce4f835d430a..000000000000 --- a/www/iridium/files/patch-media_base_user__input__monitor__unittest.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- media/base/user_input_monitor_unittest.cc.orig 2023-03-13 07:33:08 UTC -+++ media/base/user_input_monitor_unittest.cc -@@ -13,7 +13,7 @@ - #include "build/build_config.h" - #include "testing/gtest/include/gtest/gtest.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/files/file_descriptor_watcher_posix.h" - #endif - -@@ -49,7 +49,7 @@ class UserInputMonitorTest : public testing::Test { - } // namespace - - TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::test::TaskEnvironment task_environment( - base::test::TaskEnvironment::MainThreadType::IO); - #else -@@ -72,7 +72,7 @@ TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { - } - - TEST_F(UserInputMonitorTest, CreatePlatformSpecificWithMapping) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::test::TaskEnvironment task_environment( - base::test::TaskEnvironment::MainThreadType::IO); - #else diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc index 642c3c3ba28b..e9d0d4faa367 100644 --- a/www/iridium/files/patch-media_base_video__frame.cc +++ b/www/iridium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2024-12-22 12:24:29 UTC +--- media/base/video_frame.cc.orig 2025-02-22 18:06:53 UTC +++ media/base/video_frame.cc -@@ -88,7 +88,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -90,7 +90,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -103,7 +103,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -104,7 +104,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,8 +18,8 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -401,7 +401,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII - : shared_image->GetStrideForVideoFrame(i); +@@ -420,7 +420,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII + plane_size.width() * VideoFrame::BytesPerElement(*format, plane); } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -27,16 +27,7 @@ bool is_native_buffer = gpu_memory_buffer ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) -@@ -453,7 +453,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII - } - - // static --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - scoped_refptr<VideoFrame> VideoFrame::WrapOOPVDMailbox( - VideoPixelFormat format, - const gpu::Mailbox& mailbox, -@@ -769,7 +769,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -906,7 +906,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,16 +36,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1261,7 +1261,7 @@ bool VideoFrame::IsMappable() const { - return IsStorageTypeMappable(storage_type_); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - bool VideoFrame::HasOOPVDMailbox() const { - return wrapped_frame_ ? wrapped_frame_->HasOOPVDMailbox() - : !oopvd_mailbox_.IsZero(); -@@ -1490,7 +1490,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1592,7 +1592,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } diff --git a/www/iridium/files/patch-media_base_video__frame.h b/www/iridium/files/patch-media_base_video__frame.h index a498f73d5d2f..4a92b2ee1300 100644 --- a/www/iridium/files/patch-media_base_video__frame.h +++ b/www/iridium/files/patch-media_base_video__frame.h @@ -1,33 +1,24 @@ ---- media/base/video_frame.h.orig 2024-12-22 12:24:29 UTC +--- media/base/video_frame.h.orig 2025-02-22 18:06:53 UTC +++ media/base/video_frame.h -@@ -50,7 +50,7 @@ - #include "base/apple/scoped_cftyperef.h" - #endif // BUILDFLAG(IS_APPLE) +@@ -42,7 +42,7 @@ + #include "ui/gfx/geometry/size.h" + #include "ui/gfx/hdr_metadata.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -109,7 +109,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -86,7 +86,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. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // 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 -@@ -240,7 +240,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - base::TimeDelta timestamp, - bool zero_initialize_memory); - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Wraps RegisteredMailboxFrameConverter mailbox with a VideoFrame. This is - // used only by ChromeOS/Linux's out-of-process video decoder. - // |mailbox_holder_release_cb| will be called with a sync token as the -@@ -386,7 +386,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + STORAGE_DMABUFS = 5, // Each plane is stored into a DmaBuf. + #endif + STORAGE_GPU_MEMORY_BUFFER = 6, +@@ -409,7 +409,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -36,39 +27,21 @@ // 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 -@@ -551,7 +551,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // visible_data() etc. - bool IsMappable() const; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Returns true if `frame` has `oopvd_mailbox`. - bool HasOOPVDMailbox() const; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -717,7 +717,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -723,7 +723,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // wait for the included sync point. scoped_refptr<gpu::ClientSharedImage> shared_image() const; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Returns the OOPVD mailbox set by `WrapOOPVDMailbox`. - // Only valid to call if this is a NATIVE_TEXTURE frame. Before using the - // mailbox, the caller must wait for the included sync point. -@@ -966,7 +966,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // VideoFrame. - const uint8_t* data_[kMaxPlanes]; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Native texture mailbox, if this frame HasOOPVDMailbox(). - gpu::Mailbox oopvd_mailbox_; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -995,7 +995,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // 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 + // remaining planes. Should be > 0 for STORAGE_DMABUFS. +@@ -982,7 +982,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. bool is_mappable_si_enabled_ = false; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either // equal or less than the number of planes of the frame. If it is less, then + // the memory area represented by the last FD contains the remaining planes. 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 43cf7b9fe99d..8ba57a52910b 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 2024-06-25 12:08:48 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2025-02-22 18:06:53 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -562,7 +562,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -563,7 +563,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 2fd834ed5f62..fead8b8d8441 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 2024-11-04 08:56:03 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -5,8 +5,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" @@ -72,9 +72,9 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (use_gpu_buffer_) { - v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>( - std::move(gmb_support_test_)); -@@ -801,7 +813,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting( + v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(); + } +@@ -795,7 +807,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -83,7 +83,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -811,7 +823,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -805,7 +817,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)); } -@@ -822,6 +834,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co +@@ -816,6 +828,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, -@@ -849,6 +862,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript +@@ -843,6 +856,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}"; } } @@ -108,7 +108,7 @@ } mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) { -@@ -1029,7 +1043,11 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1023,7 +1037,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)); -@@ -1067,6 +1085,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1061,6 +1079,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; -@@ -1102,6 +1121,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1094,6 +1113,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) { -@@ -1155,7 +1175,7 @@ void V4L2CaptureDelegate::DoCapture() { +@@ -1147,7 +1167,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(), -@@ -1228,7 +1248,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr +@@ -1221,7 +1241,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr client_->OnError(error, from_here, reason); } diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h index 9e4d5b276db1..067dbfe61015 100644 --- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h +++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h @@ -1,6 +1,6 @@ ---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-10-21 11:51:27 UTC +--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2025-02-22 18:06:53 UTC +++ media/capture/video/linux/v4l2_capture_delegate.h -@@ -35,7 +35,7 @@ class Location; +@@ -34,7 +34,7 @@ class Location; namespace media { @@ -9,16 +9,16 @@ class V4L2CaptureDelegateGpuHelper; #endif // BUILDFLAG(IS_LINUX) -@@ -86,7 +86,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -85,7 +85,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { static bool IsBlockedControl(int control_id); static bool IsControllableControl( int control_id, - const base::RepeatingCallback<int(int, void*)>& do_ioctl); + const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl); - void SetGPUEnvironmentForTesting( - std::unique_ptr<gpu::GpuMemoryBufferSupport> gmb_support); -@@ -100,10 +100,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { + private: + friend class V4L2CaptureDelegateTest; +@@ -96,10 +96,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // device file descriptor or (re)starting streaming, can fail but works after // retrying (https://crbug.com/670262). Returns false if the |request| ioctl // fails too many times. @@ -31,7 +31,7 @@ // Check whether the control is controllable (and not changed automatically). bool IsControllableControl(int control_id); -@@ -133,7 +133,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -129,7 +129,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { const base::Location& from_here, const std::string& reason); @@ -40,7 +40,7 @@ // Systems which describe a "color space" usually map that to one or more of // {primary, matrix, transfer, range}. BuildColorSpaceFromv4l2() will use the // matched value as first priority. Otherwise, if there is no best matching -@@ -167,7 +167,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -163,7 +163,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270. int rotation_; 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 a5e3075fcd21..fc43204a5f5a 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,4 +1,4 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ media/capture/video/linux/video_capture_device_factory_v4l2.cc @@ -38,6 +38,7 @@ bool CompareCaptureDevices(const VideoCaptureDeviceInf return a.descriptor < b.descriptor; @@ -8,7 +8,7 @@ // 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 +@@ -70,11 +71,24 @@ std::string ExtractFileNameFromDeviceId(const std::str DCHECK(base::StartsWith(device_id, kDevDir, base::CompareCase::SENSITIVE)); return device_id.substr(strlen(kDevDir), device_id.length()); } @@ -19,12 +19,21 @@ public: void GetDeviceIds(std::vector<std::string>* target_container) override { +#if BUILDFLAG(IS_OPENBSD) -+ target_container->emplace_back("/dev/video"); ++ char device[12]; ++ int fd; ++ /* unveil(2) limits access to /dev/, try /dev/video[0-7] */ ++ for (int n = 0; n < 8; n++) { ++ snprintf(device, sizeof(device), "/dev/video%d", n); ++ if ((fd = open(device, O_RDONLY)) != -1) { ++ close(fd); ++ target_container->emplace_back(device); ++ } ++ } +#else const base::FilePath path("/dev/"); base::FileEnumerator enumerator(path, false, base::FileEnumerator::FILES, "video*"); -@@ -82,9 +87,13 @@ class DevVideoFilePathsDeviceProvider +@@ -82,9 +96,13 @@ class DevVideoFilePathsDeviceProvider const base::FileEnumerator::FileInfo info = enumerator.GetInfo(); target_container->emplace_back(path.value() + info.GetName().value()); } @@ -38,7 +47,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); std::string usb_id; const std::string vid_path = -@@ -101,9 +110,13 @@ class DevVideoFilePathsDeviceProvider +@@ -101,9 +119,13 @@ class DevVideoFilePathsDeviceProvider } return usb_id; @@ -52,7 +61,7 @@ const std::string file_name = ExtractFileNameFromDeviceId(device_id); const std::string interface_path = base::StringPrintf(kInterfacePathTemplate, file_name.c_str()); -@@ -114,6 +127,7 @@ class DevVideoFilePathsDeviceProvider +@@ -114,6 +136,7 @@ class DevVideoFilePathsDeviceProvider return std::string(); } return display_name; @@ -60,7 +69,7 @@ } }; -@@ -219,7 +233,7 @@ void VideoCaptureDeviceFactoryV4L2::GetDevicesInfo( +@@ -219,7 +242,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 3e6df775b64d..1490f0322429 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-11-04 08:56:03 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2025-02-22 18:06:53 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -169,7 +169,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -173,7 +173,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_robo__lib_config.py b/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py index df8091383fef..50e34455367b 100644 --- a/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py +++ b/www/iridium/files/patch-media_ffmpeg_scripts_robo__lib_config.py @@ -1,6 +1,6 @@ ---- media/ffmpeg/scripts/robo_lib/config.py.orig 2024-06-25 12:08:48 UTC +--- media/ffmpeg/scripts/robo_lib/config.py.orig 2025-02-22 18:06:53 UTC +++ media/ffmpeg/scripts/robo_lib/config.py -@@ -55,19 +55,13 @@ class RoboConfiguration: +@@ -56,19 +56,13 @@ class RoboConfiguration: self._llvm_path = os.path.join(self.chrome_src(), "third_party", "llvm-build", "Release+Asserts", "bin") @@ -19,8 +19,8 @@ - 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: + # TODO: Should this use script_directory, or stay with ffmpeg? As long +@@ -187,9 +181,9 @@ class RoboConfiguration: if re.match(r"i.86", platform.machine()): self._host_architecture = "ia32" @@ -32,7 +32,7 @@ self._host_architecture = "arm64" elif platform.machine() == "mips32": self._host_architecture = "mipsel" -@@ -223,6 +217,10 @@ class RoboConfiguration: +@@ -224,6 +218,10 @@ class RoboConfiguration: elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system( ): self._host_operating_system = "win" @@ -43,7 +43,7 @@ else: raise ValueError(f"Unsupported platform: {platform.system()}") -@@ -231,8 +229,8 @@ class RoboConfiguration: +@@ -232,8 +230,8 @@ class RoboConfiguration: wd = os.getcwd() # Walk up the tree until we find src/AUTHORS while wd != "/": 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 2840a1218cda..26573220c942 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-12-22 12:24:29 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2025-02-22 18:06:53 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1095,7 +1095,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1159,7 +1159,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,7 +9,7 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -1104,7 +1104,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1168,7 +1168,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( *allocator, VideoFrame::STORAGE_DMABUFS); @@ -18,7 +18,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1286,7 +1286,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1350,7 +1350,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/iridium/files/patch-media_gpu_test_raw__video.cc b/www/iridium/files/patch-media_gpu_test_raw__video.cc index 79adbddeef64..6ae38df4973a 100644 --- a/www/iridium/files/patch-media_gpu_test_raw__video.cc +++ b/www/iridium/files/patch-media_gpu_test_raw__video.cc @@ -1,6 +1,6 @@ ---- media/gpu/test/raw_video.cc.orig 2024-11-04 08:56:03 UTC +--- media/gpu/test/raw_video.cc.orig 2025-02-22 18:06:53 UTC +++ media/gpu/test/raw_video.cc -@@ -60,7 +60,7 @@ std::unique_ptr<base::MemoryMappedFile> CreateMemoryMa +@@ -61,7 +61,7 @@ std::unique_ptr<base::MemoryMappedFile> CreateMemoryMa base::File::FLAG_READ | base::File::FLAG_WRITE // On Windows FLAG_CREATE_ALWAYS will require FLAG_WRITE, and FLAG_APPEND // must not be specified. 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 fa56fa342447..2a583eb0acba 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,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-08-27 06:28:16 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2025-02-22 18:06:53 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -782,7 +782,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -784,7 +784,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); 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 96758a588140..ad6e965d1368 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-11-04 08:56:03 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2025-02-22 18:06:53 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -77,7 +77,7 @@ +@@ -78,7 +78,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni index 225c465eaadb..d66c42d86f18 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-06-25 12:08:48 UTC +--- media/media_options.gni.orig 2025-02-22 18:06:53 UTC +++ media/media_options.gni -@@ -190,12 +190,15 @@ declare_args() { +@@ -197,12 +197,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc index 2436e6e25c2c..3cbddd9a5dfb 100644 --- a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc +++ b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2024-11-04 08:56:03 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2025-02-22 18:06:53 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc -@@ -841,7 +841,7 @@ const gfx::GpuMemoryBufferId& StructTraits< +@@ -856,7 +856,7 @@ const gfx::GpuMemoryBufferId& StructTraits< return input.id; } @@ -9,7 +9,7 @@ // static gfx::NativePixmapHandle StructTraits< media::stable::mojom::NativeGpuMemoryBufferHandleDataView, -@@ -862,7 +862,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor +@@ -877,7 +877,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor output->type = gfx::NATIVE_PIXMAP; 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 34f0fa92eac9..c9c8d351c0be 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 2024-11-04 08:56:03 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2025-02-22 18:06:53 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem +@@ -704,7 +704,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem static const gfx::GpuMemoryBufferId& id( const gfx::GpuMemoryBufferHandle& input); diff --git a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 67bbaa449fde..464459f4d3fa 100644 --- a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2024-12-22 12:24:29 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2025-02-22 18:06:53 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -27,7 +27,7 @@ +@@ -22,7 +22,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" @@ -9,21 +9,3 @@ #include "base/posix/eintr_wrapper.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -152,7 +152,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( - std::move(shared_image), std::move(mailbox_holder.sync_token), - std::move(mailbox_holder.texture_target), - std::move(input->ycbcr_info()))); --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - } else if (input->HasOOPVDMailbox()) { - return media::mojom::VideoFrameData::NewMailboxData( - media::mojom::MailboxVideoFrameData::New(input->oopvd_mailbox())); -@@ -353,7 +353,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, - frame = media::VideoFrame::WrapExternalGpuMemoryBuffer( - visible_rect, natural_size, std::move(gpu_memory_buffer), shared_image, - sync_token, base::NullCallback(), timestamp); --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - } else if (data.is_mailbox_data()) { - media::mojom::MailboxVideoFrameDataDataView mailbox_data; - data.GetMailboxDataDataView(&mailbox_data); 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 0c40966a6219..c2cdb1bceab1 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-12-22 12:24:29 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2025-02-22 18:06:53 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -641,7 +641,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -643,7 +643,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasSharedImage(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1049,7 +1049,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1051,7 +1051,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif @@ -18,12 +18,12 @@ is_webgpu_compatible = handle.native_pixmap_handle.supports_zero_copy_webgpu_import; #endif -@@ -1236,7 +1236,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr +@@ -1231,7 +1231,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr si_usage |= 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) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 35299f2a0c33..5bfdda3073c4 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-12-22 12:24:29 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2025-02-22 18:06:53 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -160,7 +160,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -159,7 +159,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( 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 -@@ -519,7 +519,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -522,7 +522,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_, is_gpu_supported_format); diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index ac3135c15f00..5047c8d57b9f 100644 --- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-11-04 08:56:03 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2025-02-22 18:06:53 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -461,7 +461,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -458,7 +458,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/iridium/files/patch-media_webrtc_audio__processor.cc b/www/iridium/files/patch-media_webrtc_audio__processor.cc index c5eb034556de..6a39ed18a161 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 2024-11-04 08:56:03 UTC +--- media/webrtc/audio_processor.cc.orig 2025-02-22 18:06:53 UTC +++ media/webrtc/audio_processor.cc -@@ -521,7 +521,7 @@ std::optional<double> AudioProcessor::ProcessData( +@@ -506,7 +506,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 31ab894f12c6..b51a6ab4632c 100644 --- a/www/iridium/files/patch-media_webrtc_helpers.cc +++ b/www/iridium/files/patch-media_webrtc_helpers.cc @@ -1,6 +1,6 @@ ---- media/webrtc/helpers.cc.orig 2024-06-25 12:08:48 UTC +--- media/webrtc/helpers.cc.orig 2025-02-22 18:06:53 UTC +++ media/webrtc/helpers.cc -@@ -41,14 +41,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS +@@ -43,14 +43,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS return; } diff --git a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc index 10c7e7308af5..e73852475a4d 100644 --- a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,6 +1,6 @@ ---- media/webrtc/helpers_unittests.cc.orig 2024-06-25 12:08:48 UTC +--- media/webrtc/helpers_unittests.cc.orig 2025-02-22 18:06:53 UTC +++ media/webrtc/helpers_unittests.cc -@@ -40,7 +40,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau +@@ -39,7 +39,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_TRUE(config.echo_canceller.enabled); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ EXPECT_FALSE(config.gain_controller1.enabled); EXPECT_TRUE(config.gain_controller2.enabled); #elif BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID) -@@ -73,7 +73,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -66,7 +66,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, InputVolumeAdjustmentEnabledWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -89,7 +89,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -82,7 +82,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -27,7 +27,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CanDisableInputVolumeAdjustmentWithAgc2) { ::base::test::ScopedFeatureList feature_list; -@@ -106,7 +106,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, +@@ -99,7 +99,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_BUILD.gn b/www/iridium/files/patch-mojo_core_BUILD.gn index c0e20d240ed5..2ecbda1c8821 100644 --- a/www/iridium/files/patch-mojo_core_BUILD.gn +++ b/www/iridium/files/patch-mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/core/BUILD.gn.orig 2024-11-04 08:56:03 UTC +--- mojo/core/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ mojo/core/BUILD.gn -@@ -161,7 +161,7 @@ source_set("impl_for_embedder") { +@@ -163,7 +163,7 @@ source_set("impl_for_embedder") { ] } diff --git a/www/iridium/files/patch-mojo_core_channel.cc b/www/iridium/files/patch-mojo_core_channel.cc index d062ceb977a1..2212c3bbb913 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 2024-11-04 08:56:03 UTC +--- mojo/core/channel.cc.orig 2025-02-22 18:06:53 UTC +++ mojo/core/channel.cc -@@ -82,7 +82,11 @@ const size_t kMaxAttachedHandles = 64; +@@ -83,7 +83,11 @@ const size_t kMaxAttachedHandles = 64; const size_t kMaxAttachedHandles = 253; #endif // BUILDFLAG(IS_FUCHSIA) 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 16652f86fa9b..624931128b50 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-11-04 08:56:03 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2025-02-22 18:06:53 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -776,6 +776,16 @@ template("mojom") { +@@ -796,6 +796,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } @@ -14,6 +14,6 @@ + enabled_features += [ "is_bsd" ] + } + - action(parser_target_name) { - allow_remote = true - + action_outputs = [] + foreach(base_path, output_file_base_paths) { + filename = get_path_info(base_path, "file") diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index 12e516f75420..884a78fc649b 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- net/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ net/BUILD.gn @@ -126,7 +126,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1287,6 +1287,19 @@ component("net") { +@@ -1303,6 +1303,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1450,7 +1463,7 @@ component("net") { +@@ -1466,7 +1479,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2935,7 +2948,7 @@ target(_test_target_type, "net_unittests") { +@@ -2982,7 +2995,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3028,6 +3041,10 @@ target(_test_target_type, "net_unittests") { +@@ -3076,6 +3089,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3094,7 +3111,7 @@ target(_test_target_type, "net_unittests") { +@@ -3142,7 +3159,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3233,7 +3250,7 @@ target(_test_target_type, "net_unittests") { +@@ -3281,7 +3298,7 @@ target(_test_target_type, "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 906c363ac192..8e9153ec1c04 100644 --- a/www/iridium/files/patch-net_base_features.cc +++ b/www/iridium/files/patch-net_base_features.cc @@ -1,4 +1,4 @@ ---- net/base/features.cc.orig 2024-11-04 08:56:03 UTC +--- net/base/features.cc.orig 2025-02-22 18:06:53 UTC +++ net/base/features.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, @@ -9,15 +9,15 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -522,7 +522,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -530,7 +530,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); +#if BUILDFLAG(IS_OPENBSD) +// No IP_RECVTOS support - BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); -+#else +BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT); ++#else + BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_ENABLED_BY_DEFAULT); +#endif BASE_FEATURE(kUseNewAlpsCodepointHttp2, diff --git a/www/iridium/files/patch-net_base_sockaddr__util__posix.cc b/www/iridium/files/patch-net_base_sockaddr__util__posix.cc index 57ce46d3520d..3066d021ee75 100644 --- a/www/iridium/files/patch-net_base_sockaddr__util__posix.cc +++ b/www/iridium/files/patch-net_base_sockaddr__util__posix.cc @@ -1,6 +1,6 @@ ---- net/base/sockaddr_util_posix.cc.orig 2024-08-01 05:47:53 UTC +--- net/base/sockaddr_util_posix.cc.orig 2025-02-22 18:06:53 UTC +++ net/base/sockaddr_util_posix.cc -@@ -46,7 +46,8 @@ bool FillUnixAddress(const std::string& socket_path, +@@ -40,7 +40,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; } diff --git a/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc index ab98a85ac25d..a347aac2dba0 100644 --- a/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc +++ b/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- net/disk_cache/simple/simple_file_tracker.cc.orig 2024-08-27 06:28:16 UTC +--- net/disk_cache/simple/simple_file_tracker.cc.orig 2025-02-22 18:06:53 UTC +++ net/disk_cache/simple/simple_file_tracker.cc -@@ -35,7 +35,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit +@@ -31,7 +31,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn index d6d9eb50daec..70e403a4448c 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-06-25 12:08:48 UTC +--- net/dns/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ net/dns/BUILD.gn -@@ -138,7 +138,7 @@ source_set("dns") { +@@ -140,7 +140,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -179,6 +179,7 @@ source_set("dns") { +@@ -181,6 +181,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -447,9 +448,9 @@ source_set("tests") { +@@ -450,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/iridium/files/patch-net_socket_socket__posix.cc b/www/iridium/files/patch-net_socket_socket__posix.cc deleted file mode 100644 index 2add7d650a33..000000000000 --- a/www/iridium/files/patch-net_socket_socket__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/socket/socket_posix.cc.orig 2022-10-05 07:34:01 UTC -+++ net/socket/socket_posix.cc -@@ -516,7 +516,7 @@ void SocketPosix::ReadCompleted() { - } - - int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Disable SIGPIPE for this write. Although Chromium globally disables - // SIGPIPE, the net stack may be used in other consumers which do not do - // this. MSG_NOSIGNAL is a Linux-only API. On OS X, this is a setsockopt on 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 f79612aaa227..13eb94d35bdb 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-11-04 08:56:03 UTC +--- net/socket/udp_socket_posix.cc.orig 2025-02-22 18:06:53 UTC +++ net/socket/udp_socket_posix.cc -@@ -522,12 +522,17 @@ int UDPSocketPosix::SetRecvTos() { +@@ -528,12 +528,17 @@ int UDPSocketPosix::SetRecvTos() { #endif // BUILDFLAG(IS_APPLE) } @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -548,7 +553,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -554,7 +559,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. -@@ -886,7 +891,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -892,7 +897,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_traffic__annotation_network__traffic__annotation.h b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h index f9a15c4cc05c..e65ad40d7e06 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,6 +1,6 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2024-08-01 05:47:53 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2025-02-22 18:06:53 UTC +++ net/traffic_annotation/network_traffic_annotation.h -@@ -378,7 +378,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -375,7 +375,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,7 +9,7 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -392,7 +392,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -389,7 +389,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ 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 6055dd0543c3..7388848d6c91 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,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2024-06-25 12:08:48 UTC +--- net/url_request/url_request_context.cc.orig 2025-02-22 18:06:53 UTC +++ net/url_request/url_request_context.cc -@@ -121,7 +121,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -123,7 +123,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ 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 dad5edfb70df..ffc95ce00e56 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,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2024-08-27 06:28:16 UTC +--- net/url_request/url_request_context.h.orig 2025-02-22 18:06:53 UTC +++ net/url_request/url_request_context.h -@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext final { +@@ -90,7 +90,7 @@ class NET_EXPORT URLRequestContext final { // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ 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 70faf80eac40..f42fd7d137ac 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 2024-11-04 08:56:03 UTC +--- net/url_request/url_request_context_builder.cc.orig 2025-02-22 18:06:53 UTC +++ net/url_request/url_request_context_builder.cc -@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -447,7 +447,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 699f91d4ce90..cb541cef7324 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 2024-12-22 12:24:29 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2025-02-22 18:06:53 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -99,7 +99,7 @@ +@@ -101,7 +101,7 @@ #include "ui/accessibility/ax_features.mojom-features.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -528,7 +528,7 @@ void InitializeSDK(bool enable_v8, +@@ -534,7 +534,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/iridium/files/patch-printing_backend_print__backend__cups.cc b/www/iridium/files/patch-printing_backend_print__backend__cups.cc index 730577e8f4e3..7427758cf3de 100644 --- a/www/iridium/files/patch-printing_backend_print__backend__cups.cc +++ b/www/iridium/files/patch-printing_backend_print__backend__cups.cc @@ -1,6 +1,6 @@ ---- printing/backend/print_backend_cups.cc.orig 2024-12-22 12:24:29 UTC +--- printing/backend/print_backend_cups.cc.orig 2025-02-22 18:06:53 UTC +++ printing/backend/print_backend_cups.cc -@@ -33,7 +33,7 @@ +@@ -29,7 +29,7 @@ #include "printing/mojom/print.mojom.h" #include "url/gurl.h" @@ -9,7 +9,7 @@ #include "base/feature_list.h" #include "printing/backend/cups_connection.h" #include "printing/backend/print_backend_cups_ipp.h" -@@ -63,7 +63,7 @@ int CaptureCupsDestCallback(void* data, unsigned flags +@@ -59,7 +59,7 @@ int CaptureCupsDestCallback(void* data, unsigned flags return 1; // Keep going. } diff --git a/www/iridium/files/patch-printing_printing__features.cc b/www/iridium/files/patch-printing_printing__features.cc index 2eeb1c70a9f2..3b7e19c38071 100644 --- a/www/iridium/files/patch-printing_printing__features.cc +++ b/www/iridium/files/patch-printing_printing__features.cc @@ -1,7 +1,7 @@ ---- printing/printing_features.cc.orig 2024-08-01 05:47:53 UTC +--- printing/printing_features.cc.orig 2025-02-22 18:06:53 UTC +++ printing/printing_features.cc @@ -21,12 +21,12 @@ BASE_FEATURE(kAddPrinterViaPrintscanmgr, - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -15,3 +15,12 @@ base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT +@@ -69,7 +69,7 @@ BASE_FEATURE(kUseXpsForPrintingFromPdf, + // out-of-process. + BASE_FEATURE(kEnableOopPrintDrivers, + "EnableOopPrintDrivers", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-remoting_client_display_sys__opengl.h b/www/iridium/files/patch-remoting_client_display_sys__opengl.h deleted file mode 100644 index f81210f3863c..000000000000 --- a/www/iridium/files/patch-remoting_client_display_sys__opengl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- remoting/client/display/sys_opengl.h.orig 2022-03-28 18:11:04 UTC -+++ remoting/client/display/sys_opengl.h -@@ -9,7 +9,7 @@ - - #if BUILDFLAG(IS_IOS) - #include <OpenGLES/ES3/gl.h> --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #define GL_GLEXT_PROTOTYPES - #include <GL/gl.h> - #include <GL/glext.h> diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.cc b/www/iridium/files/patch-remoting_host_chromoting__host.cc index 60bd52774603..b5086b231605 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 2024-11-04 08:56:03 UTC +--- remoting/host/chromoting_host.cc.orig 2025-02-22 18:06:53 UTC +++ remoting/host/chromoting_host.cc -@@ -132,7 +132,7 @@ void ChromotingHost::Start(const std::string& host_own +@@ -135,7 +135,7 @@ void ChromotingHost::Start(const std::string& host_own &ChromotingHost::OnIncomingSession, base::Unretained(this))); } diff --git a/www/iridium/files/patch-remoting_host_chromoting__host.h b/www/iridium/files/patch-remoting_host_chromoting__host.h index e1af56e9c2e6..89c054366049 100644 --- a/www/iridium/files/patch-remoting_host_chromoting__host.h +++ b/www/iridium/files/patch-remoting_host_chromoting__host.h @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host.h.orig 2024-11-04 08:56:03 UTC +--- remoting/host/chromoting_host.h.orig 2025-02-22 18:06:53 UTC +++ remoting/host/chromoting_host.h -@@ -33,7 +33,7 @@ +@@ -36,7 +36,7 @@ #include "remoting/protocol/session_manager.h" #include "remoting/protocol/transport_context.h" @@ -9,7 +9,7 @@ #include "remoting/host/chromoting_host_services_server.h" #endif -@@ -99,7 +99,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -112,7 +112,7 @@ class ChromotingHost : public ClientSession::EventHand // This method can only be called once during the lifetime of this object. void Start(const std::string& host_owner); @@ -18,7 +18,7 @@ // Starts running the ChromotingHostServices server and listening for incoming // IPC binding requests. // Currently only Linux runs the ChromotingHostServices server on the host -@@ -203,7 +203,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -220,7 +220,7 @@ class ChromotingHost : public ClientSession::EventHand // List of host extensions. std::vector<std::unique_ptr<HostExtension>> extensions_; diff --git a/www/iridium/files/patch-remoting_host_client__session.cc b/www/iridium/files/patch-remoting_host_client__session.cc index d337091c05dd..6ced891c2600 100644 --- a/www/iridium/files/patch-remoting_host_client__session.cc +++ b/www/iridium/files/patch-remoting_host_client__session.cc @@ -1,7 +1,7 @@ ---- remoting/host/client_session.cc.orig 2024-11-04 08:56:03 UTC +--- remoting/host/client_session.cc.orig 2025-02-22 18:06:53 UTC +++ remoting/host/client_session.cc @@ -161,7 +161,7 @@ void ClientSession::NotifyClientResolution( - if (desktop_environment_options_.enable_curtaining()) { + if (effective_policies_.curtain_required.value_or(false)) { dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); } -#elif BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-remoting_host_host__main.cc b/www/iridium/files/patch-remoting_host_host__main.cc index f03dab45ab0f..8aa795c11f5b 100644 --- a/www/iridium/files/patch-remoting_host_host__main.cc +++ b/www/iridium/files/patch-remoting_host_host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/host_main.cc.orig 2024-08-01 05:47:53 UTC +--- remoting/host/host_main.cc.orig 2025-02-22 18:06:53 UTC +++ remoting/host/host_main.cc @@ -50,7 +50,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); @@ -27,9 +27,9 @@ } else if (process_type == kProcessTypeXSessionChooser) { main_routine = &XSessionChooserMain; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -222,7 +222,7 @@ int HostMain(int argc, char** argv) { - // be initialized first, so that the preference for crash-reporting can be - // looked up in the config file. +@@ -224,7 +224,7 @@ int HostMain(int argc, char** argv) { + // Note that we enable crash reporting only if the user has opted in to having + // the crash reports uploaded. if (IsUsageStatsAllowed()) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 5263cf0b145e..113c275b5b08 100644 --- a/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2024-12-22 12:24:29 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2025-02-22 18:06:53 UTC +++ remoting/host/it2me/it2me_host.cc @@ -58,7 +58,7 @@ #include "remoting/host/chromeos/features.h" @@ -9,7 +9,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -184,7 +184,7 @@ void It2MeHost::Connect( +@@ -191,7 +191,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -18,7 +18,7 @@ if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -318,7 +318,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -325,7 +325,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 36bb5af2192c..37d61599db16 100644 --- a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2023-10-21 11:51:27 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2025-02-22 18:06:53 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" @@ -27,7 +27,7 @@ // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have // any command line arguments for gtk to consume. -@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -251,7 +251,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); @@ -36,7 +36,7 @@ scoped_refptr<AutoThreadTaskRunner> input_task_runner; if (!IsRunningWayland()) { // Create an X11EventSource on all UI threads, so the global X11 connection -@@ -284,7 +284,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -278,7 +278,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); 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 330668c69a89..dc1719a1f8c9 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-12-22 12:24:29 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2025-02-22 18:06:53 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -146,7 +146,7 @@ +@@ -145,7 +145,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,14 +9,14 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #endif // defined(REMOTING_USE_X11) -@@ -157,13 +157,13 @@ +@@ -156,13 +156,13 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/linux_util.h" - #include "remoting/host/audio_capturer_linux.h" + #include "remoting/host/linux/audio_capturer_linux.h" #include "remoting/host/linux/certificate_watcher.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -177,7 +177,7 @@ +@@ -176,7 +176,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) -@@ -205,7 +205,7 @@ const char kApplicationName[] = "chromoting"; +@@ -204,7 +204,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -52,16 +52,16 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -515,7 +515,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -510,7 +510,7 @@ class HostProcess : public ConfigWatcher::Delegate, + std::unique_ptr<FtlEchoMessageListener> ftl_echo_message_listener_; - std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -834,7 +834,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -828,7 +828,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) } -@@ -905,7 +905,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -899,7 +899,7 @@ void HostProcess::CreateAuthenticatorFactory() { context_->url_loader_factory(), service_account_email_, oauth_refresh_token_)); @@ -79,7 +79,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1047,13 +1047,13 @@ void HostProcess::StartOnUiThread() { +@@ -1041,13 +1041,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 = -@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1124,7 +1124,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. -@@ -1138,7 +1138,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1132,7 +1132,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,16 +113,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1592,7 +1592,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) - std::optional<bool> host_username_match_required = - policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); - if (!host_username_match_required.has_value()) { -@@ -1866,7 +1866,7 @@ void HostProcess::StartHost() { +@@ -1844,7 +1844,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } @@ -130,17 +121,17 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_); #endif + #if BUILDFLAG(IS_WIN) +@@ -1871,7 +1871,7 @@ void HostProcess::StartHost() { -@@ -1886,7 +1886,7 @@ void HostProcess::StartHost() { - host_status_logger_ = std::make_unique<HostStatusLogger>( - host_->status_monitor(), log_to_server_.get()); + host_->AddExtension(std::make_unique<TestEchoExtension>()); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1922,7 +1922,7 @@ void HostProcess::StartHost() { +@@ -1907,7 +1907,7 @@ void HostProcess::StartHost() { // addresses. host_->Start(*host_owner_emails_.begin()); @@ -149,7 +140,7 @@ // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2069,7 +2069,7 @@ int HostProcessMain() { +@@ -2051,7 +2051,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -158,7 +149,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 ...) -@@ -2118,7 +2118,7 @@ int HostProcessMain() { +@@ -2100,7 +2100,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc b/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc new file mode 100644 index 000000000000..b8b8a68e2dae --- /dev/null +++ b/www/iridium/files/patch-remoting_host_session__policies__from__dict.cc @@ -0,0 +1,11 @@ +--- remoting/host/session_policies_from_dict.cc.orig 2025-02-22 18:06:53 UTC ++++ remoting/host/session_policies_from_dict.cc +@@ -76,7 +76,7 @@ std::optional<SessionPolicies> SessionPoliciesFromDict + .curtain_required = + dict.FindBool(policy::key::kRemoteAccessHostRequireCurtain), + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + .host_username_match_required = + dict.FindBool(policy::key::kRemoteAccessHostMatchUsername), + #endif 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 184567e41535..2f6f76e341c6 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,4 +1,4 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc @@ -10,7 +10,7 @@ #include "base/strings/utf_string_conversions.h" @@ -18,7 +18,7 @@ constexpr auto kAllowedCallerPrograms = base::MakeFixedFlatSet<base::FilePath::StringPieceType>({ -@@ -82,7 +82,7 @@ bool IsLaunchedByTrustedProcess() { +@@ -83,7 +83,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-sandbox_policy_BUILD.gn b/www/iridium/files/patch-sandbox_policy_BUILD.gn index 1a89c3c78fd0..2540b0f567b5 100644 --- a/www/iridium/files/patch-sandbox_policy_BUILD.gn +++ b/www/iridium/files/patch-sandbox_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/policy/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- sandbox/policy/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ sandbox/policy/BUILD.gn -@@ -50,7 +50,7 @@ component("policy") { +@@ -45,7 +45,7 @@ component("policy") { "//third_party/jni_zero", ] } @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -127,6 +127,27 @@ component("policy") { +@@ -114,6 +114,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 21fec9d56898..d56a8a754929 100644 --- a/www/iridium/files/patch-sandbox_policy_features.cc +++ b/www/iridium/files/patch-sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/features.cc.orig 2024-12-22 12:24:29 UTC +--- sandbox/policy/features.cc.orig 2025-02-22 18:06:53 UTC +++ sandbox/policy/features.cc @@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) @@ -12,12 +12,3 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. -@@ -132,7 +136,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation, - 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) - // Enabling the kNetworkServiceSandbox feature automatically enables Spectre - // variant 2 mitigations in the network service. This can lead to performance - // regressions, so enabling this feature will turn off the Spectre Variant 2 diff --git a/www/iridium/files/patch-sandbox_policy_features.h b/www/iridium/files/patch-sandbox_policy_features.h deleted file mode 100644 index c4d122faa49a..000000000000 --- a/www/iridium/files/patch-sandbox_policy_features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- sandbox/policy/features.h.orig 2024-12-22 12:24:29 UTC -+++ sandbox/policy/features.h -@@ -45,7 +45,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kWinSboxPar - SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVariant2Mitigation); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE( - kForceDisableSpectreVariant2MitigationInNetworkService); - diff --git a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom index d84f50f57ebb..4a15cc7da96d 100644 --- a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,8 +1,8 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2024-12-22 12:24:29 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2025-02-22 18:06:53 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -81,6 +81,12 @@ enum Sandbox { - [EnableIf=is_fuchsia] - kVideoCapture, +@@ -74,6 +74,12 @@ enum Sandbox { + // Minimally privileged sandbox on Fuchsia. + [EnableIf=is_fuchsia] kVideoCapture, + [EnableIf=is_openbsd] + kVideoCapture, @@ -12,4 +12,4 @@ + // Allows access to file contents and Windows APIs for parsing icons from PE // files. - [EnableIf=is_win] + [EnableIf=is_win] kIconReader, diff --git a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc index 39f23470eac3..d7cec9284f35 100644 --- a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,47 +1,48 @@ ---- sandbox/policy/sandbox_type.cc.orig 2024-12-22 12:24:29 UTC +--- sandbox/policy/sandbox_type.cc.orig 2025-02-22 18:06:53 UTC +++ sandbox/policy/sandbox_type.cc -@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -39,7 +39,7 @@ constexpr char kPpapiSandbox[] = "ppapi"; #endif - case Sandbox::kAudio: - return false; + + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + constexpr char kPrintBackendSandbox[] = "print_backend"; + constexpr char kScreenAISandbox[] = "screen_ai"; + #endif +@@ -57,18 +57,18 @@ constexpr char kWindowsSystemProxyResolverSandbox[] = + constexpr char kMirroringSandbox[] = "mirroring"; + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr char kVideoEffectsSandbox[] = "video_effects"; + #endif + -#if BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - case Sandbox::kVideoCapture: - return false; - #endif -@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { - #if BUILDFLAG(IS_MAC) - case Sandbox::kMirroring: + constexpr char kVideoCaptureSandbox[] = "video_capture"; #endif + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - case Sandbox::kHardwareVideoDecoding: + constexpr char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -73,7 +73,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { - case Sandbox::kLibassistant: - #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) - #endif // // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | BUILDFLAG(IS_BSD) - case Sandbox::kZygoteIntermediateSandbox: - case Sandbox::kHardwareVideoEncoding: - #endif -@@ -81,10 +81,10 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { - case Sandbox::kScreenAI: - #endif - case Sandbox::kSpeechRecognition: --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - case Sandbox::kVideoEffects: - #endif ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -81,7 +81,7 @@ constexpr char kLibassistantSandbox[] = "libassistant" + #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - case Sandbox::kOnDeviceTranslation: - #endif - return false; -@@ -136,7 +136,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi - #endif + constexpr char kOnDeviceTranslationSandbox[] = "on_device_translation"; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +@@ -143,7 +143,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kCdm: case Sandbox::kPrintCompositor: case Sandbox::kAudio: -#if BUILDFLAG(IS_FUCHSIA) @@ -49,7 +50,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -147,10 +147,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -154,10 +154,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -62,7 +63,13 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -168,10 +168,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -172,15 +172,15 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kMirroring: + #endif // BUILDFLAG(IS_MAC) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + case Sandbox::kPrintBackend: case Sandbox::kScreenAI: #endif case Sandbox::kSpeechRecognition: @@ -75,7 +82,7 @@ case Sandbox::kOnDeviceTranslation: #endif DCHECK(command_line->GetSwitchValueASCII(switches::kProcessType) == -@@ -181,7 +181,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -190,7 +190,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi switches::kServiceSandboxType, StringFromUtilitySandboxType(sandbox_type)); break; @@ -84,7 +91,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -221,7 +221,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -230,7 +230,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( return Sandbox::kUtility; } @@ -93,44 +100,51 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -267,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb - return switches::kUtilitySandbox; +@@ -272,7 +272,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + return kUtilitySandbox; case Sandbox::kAudio: - return switches::kAudioSandbox; + return kAudioSandbox; -#if BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) case Sandbox::kVideoCapture: - return switches::kVideoCaptureSandbox; + return kVideoCaptureSandbox; #endif -@@ -281,11 +281,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -283,17 +283,17 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + case Sandbox::kSpeechRecognition: + return kSpeechRecognitionSandbox; + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + case Sandbox::kPrintBackend: + return kPrintBackendSandbox; case Sandbox::kScreenAI: - return switches::kScreenAISandbox; + return kScreenAISandbox; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case Sandbox::kVideoEffects: - return switches::kVideoEffectsSandbox; + return kVideoEffectsSandbox; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case Sandbox::kOnDeviceTranslation: - return switches::kOnDeviceTranslationSandbox; + return kOnDeviceTranslationSandbox; #endif -@@ -305,11 +305,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -313,11 +313,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: - return switches::kMirroringSandbox; + return kMirroringSandbox; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case Sandbox::kHardwareVideoDecoding: - return switches::kHardwareVideoDecodingSandbox; + return kHardwareVideoDecodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kHardwareVideoEncoding: - return switches::kHardwareVideoEncodingSandbox; + return kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -328,7 +328,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -336,7 +336,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb // The following are not utility processes so should not occur. case Sandbox::kRenderer: case Sandbox::kGpu: @@ -139,34 +153,45 @@ case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED(); -@@ -399,25 +399,25 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( - if (sandbox_string == switches::kScreenAISandbox) +@@ -414,7 +414,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + return Sandbox::kSpeechRecognition; + } + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (sandbox_string == kPrintBackendSandbox) { + return Sandbox::kPrintBackend; + } +@@ -422,27 +422,27 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( return Sandbox::kScreenAI; + } #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (sandbox_string == switches::kVideoEffectsSandbox) { + if (sandbox_string == kVideoEffectsSandbox) { return Sandbox::kVideoEffects; } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (sandbox_string == switches::kOnDeviceTranslationSandbox) { + if (sandbox_string == kOnDeviceTranslationSandbox) { return Sandbox::kOnDeviceTranslation; } #endif -#if BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (sandbox_string == switches::kVideoCaptureSandbox) + if (sandbox_string == kVideoCaptureSandbox) { return Sandbox::kVideoCapture; + } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - if (sandbox_string == switches::kHardwareVideoDecodingSandbox) + if (sandbox_string == kHardwareVideoDecodingSandbox) { return Sandbox::kHardwareVideoDecoding; + } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (sandbox_string == switches::kHardwareVideoEncodingSandbox) + if (sandbox_string == kHardwareVideoEncodingSandbox) { return Sandbox::kHardwareVideoEncoding; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + } diff --git a/www/iridium/files/patch-sandbox_policy_switches.cc b/www/iridium/files/patch-sandbox_policy_switches.cc index 45cae94f1968..2c28115fba74 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.cc +++ b/www/iridium/files/patch-sandbox_policy_switches.cc @@ -1,28 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2024-12-22 12:24:29 UTC +--- sandbox/policy/switches.cc.orig 2025-02-22 18:06:53 UTC +++ sandbox/policy/switches.cc -@@ -55,10 +55,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro - const char kMirroringSandbox[] = "mirroring"; - #endif // BUILDFLAG(IS_MAC) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -71,7 +71,7 @@ const char kLibassistantSandbox[] = "libassistant"; - #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - const char kOnDeviceTranslationSandbox[] = "on_device_translation"; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - -@@ -102,7 +102,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -38,7 +38,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/iridium/files/patch-sandbox_policy_switches.h b/www/iridium/files/patch-sandbox_policy_switches.h index befa02a55171..0567f40662a7 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.h +++ b/www/iridium/files/patch-sandbox_policy_switches.h @@ -1,28 +1,6 @@ ---- sandbox/policy/switches.h.orig 2024-12-22 12:24:29 UTC +--- sandbox/policy/switches.h.orig 2025-02-22 18:06:53 UTC +++ sandbox/policy/switches.h -@@ -58,10 +58,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem - SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; - #endif // BUILDFLAG(IS_MAC) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[]; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - -@@ -74,7 +74,7 @@ SANDBOX_POLICY_EXPORT extern const char kLibassistantS - #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - SANDBOX_POLICY_EXPORT extern const char kOnDeviceTranslationSandbox[]; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - -@@ -87,7 +87,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -23,7 +23,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/iridium/files/patch-services_device_BUILD.gn b/www/iridium/files/patch-services_device_BUILD.gn index 86b4179f8c12..828a85fdbe0c 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 2024-11-04 08:56:03 UTC +--- services/device/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/device/BUILD.gn -@@ -15,7 +15,7 @@ if (is_android) { +@@ -13,7 +13,7 @@ if (is_android) { } is_serial_enabled_platform = diff --git a/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc index 57dbfb94dfb1..f782d75d6c67 100644 --- a/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc +++ b/www/iridium/files/patch-services_device_geolocation_location__provider__manager.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_provider_manager.cc.orig 2024-12-22 12:24:29 UTC +--- services/device/geolocation/location_provider_manager.cc.orig 2025-02-22 18:06:53 UTC +++ services/device/geolocation/location_provider_manager.cc -@@ -87,7 +87,7 @@ LocationProviderManager::LocationProviderManager( +@@ -91,7 +91,7 @@ LocationProviderManager::LocationProviderManager( #if BUILDFLAG(IS_ANDROID) // On Android, default to using the platform location provider. provider_manager_mode_ = kPlatformOnly; diff --git a/www/iridium/files/patch-services_device_hid_BUILD.gn b/www/iridium/files/patch-services_device_hid_BUILD.gn index 65ced4bf3fc2..f33cf0416e0c 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 2024-06-25 12:08:48 UTC +--- services/device/hid/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/device/hid/BUILD.gn -@@ -36,7 +36,26 @@ source_set("hid") { +@@ -34,7 +34,26 @@ source_set("hid") { "//services/device/public/mojom", ] 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 44bf222c5da0..abfbe8e8a568 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 2024-06-25 12:08:48 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2025-02-22 18:06:53 UTC +++ services/device/hid/hid_connection_freebsd.cc @@ -0,0 +1,240 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. @@ -46,7 +46,7 @@ + // Must be called on a thread that has a base::MessageLoopForIO. + void Start() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ base::internal::AssertBlockingAllowed(); ++ base::AssertBlockingAllowed(); + + file_watcher_ = base::FileDescriptorWatcher::WatchReadable( + fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking, diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc index 7d2d79c986a0..fc975361c1fb 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,4 +1,4 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2023-04-22 17:45:15 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2025-02-22 18:06:53 UTC +++ services/device/hid/hid_service_freebsd.cc @@ -0,0 +1,395 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. @@ -106,7 +106,7 @@ + + bool HaveReadWritePermissions(std::string device_id) { + std::string device_node = "/dev/" + device_id; -+ base::internal::AssertBlockingAllowed(); ++ base::AssertBlockingAllowed(); + + base::FilePath device_path(device_node); + base::File device_file; @@ -130,7 +130,7 @@ + + std::vector<uint8_t> report_descriptor; + -+ base::internal::AssertBlockingAllowed(); ++ base::AssertBlockingAllowed(); + + base::FilePath device_path(device_node); + base::File device_file; @@ -196,7 +196,7 @@ + private: + + void CheckPendingPermissionChange() { -+ base::internal::AssertBlockingAllowed(); ++ base::AssertBlockingAllowed(); + std::map<std::string, int>::iterator it; + for (it = permissions_checks_attempts_.begin(); it != permissions_checks_attempts_.end();) { + std::string device_name = it->first; @@ -222,7 +222,7 @@ + } + + void SetupDevdMonitor() { -+ base::internal::AssertBlockingAllowed(); ++ base::AssertBlockingAllowed(); + + int devd_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); + if (devd_fd < 0) 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 740bc613469f..2d8f3614df5f 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 2024-11-04 08:56:03 UTC +--- services/device/public/mojom/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/device/public/mojom/BUILD.gn -@@ -98,7 +98,7 @@ mojom("device_service") { +@@ -97,7 +97,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/iridium/files/patch-services_device_serial_BUILD.gn b/www/iridium/files/patch-services_device_serial_BUILD.gn index 6c517a19f594..bd7fe68505f6 100644 --- a/www/iridium/files/patch-services_device_serial_BUILD.gn +++ b/www/iridium/files/patch-services_device_serial_BUILD.gn @@ -1,7 +1,7 @@ ---- services/device/serial/BUILD.gn.orig 2022-12-01 10:35:46 UTC +--- services/device/serial/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/device/serial/BUILD.gn -@@ -5,7 +5,7 @@ - import("//build/config/chromeos/ui_mode.gni") +@@ -4,7 +4,7 @@ + import("//build/config/features.gni") -if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) { diff --git a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index 0d5de072bf27..47fca47cf7b9 100644 --- a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2024-08-27 06:28:16 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2025-02-22 18:06:53 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -136,7 +136,11 @@ class TimeZoneMonitorLinuxImpl +@@ -135,7 +135,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/iridium/files/patch-services_device_usb_BUILD.gn b/www/iridium/files/patch-services_device_usb_BUILD.gn index 94b21635f04e..b19be5f5db40 100644 --- a/www/iridium/files/patch-services_device_usb_BUILD.gn +++ b/www/iridium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2024-08-27 06:28:16 UTC +--- services/device/usb/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/device/usb/BUILD.gn -@@ -91,7 +91,7 @@ static_library("usb") { +@@ -89,7 +89,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -9,7 +9,7 @@ # These sources and deps are required for libusb. # TODO(crbug.com/40136337) Remove these sources. sources += [ -@@ -114,6 +114,13 @@ static_library("usb") { +@@ -112,6 +112,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -23,7 +23,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -135,7 +142,7 @@ static_library("usb") { +@@ -133,7 +140,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index 8edcfe9c23f5..26b06cdb5dc9 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-12-22 12:24:29 UTC +--- services/network/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/network/BUILD.gn -@@ -401,7 +401,6 @@ if (is_linux || is_chromeos) { +@@ -396,7 +396,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 10394b7c9ce6..9d4e39ddc7cf 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-12-22 12:24:29 UTC +--- services/network/network_context.cc.orig 2025-02-22 18:06:53 UTC +++ services/network/network_context.cc -@@ -589,7 +589,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -611,7 +611,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2444,7 +2444,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2494,7 +2494,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__context.h b/www/iridium/files/patch-services_network_network__context.h index 7abef175a6e6..937b1c055651 100644 --- a/www/iridium/files/patch-services_network_network__context.h +++ b/www/iridium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2024-12-22 12:24:29 UTC +--- services/network/network_context.h.orig 2025-02-22 18:06:53 UTC +++ services/network/network_context.h -@@ -696,7 +696,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -702,7 +702,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc index 784e86873687..baa685966ee6 100644 --- a/www/iridium/files/patch-services_network_network__service.cc +++ b/www/iridium/files/patch-services_network_network__service.cc @@ -1,15 +1,20 @@ ---- services/network/network_service.cc.orig 2024-11-04 08:56:03 UTC +--- services/network/network_service.cc.orig 2025-02-22 18:06:53 UTC +++ services/network/network_service.cc -@@ -99,7 +99,7 @@ +@@ -97,11 +97,11 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif --#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ -+#if ((BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) - +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -977,7 +977,7 @@ void NetworkService::SetExplicitlyAllowedPorts( + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "services/network/network_change_notifier_passive_factory.h" + #endif + +@@ -971,7 +971,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +23,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1059,7 +1059,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1053,7 +1053,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 963f68c9e2ce..3a37a1171493 100644 --- a/www/iridium/files/patch-services_network_network__service.h +++ b/www/iridium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2024-11-04 08:56:03 UTC +--- services/network/network_service.h.orig 2025-02-22 18:06:53 UTC +++ services/network/network_service.h -@@ -238,7 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -237,7 +237,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService const std::vector<ContentSettingPatternSource>& settings) override; void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override; @@ -9,7 +9,7 @@ void SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) override; -@@ -264,7 +264,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -263,7 +263,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory( NetworkContext* network_context); @@ -18,7 +18,7 @@ // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -498,7 +498,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -501,7 +501,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_; 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 55cbf8f05533..7b71ab1100b3 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-11-04 08:56:03 UTC +--- services/network/public/cpp/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/network/public/cpp/BUILD.gn -@@ -481,7 +481,7 @@ component("cpp_base") { +@@ -505,7 +505,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/iridium/files/patch-services_network_public_cpp_features.cc b/www/iridium/files/patch-services_network_public_cpp_features.cc index cd56b0af2c23..7176085117c8 100644 --- a/www/iridium/files/patch-services_network_public_cpp_features.cc +++ b/www/iridium/files/patch-services_network_public_cpp_features.cc @@ -1,6 +1,6 @@ ---- services/network/public/cpp/features.cc.orig 2024-08-27 06:28:16 UTC +--- services/network/public/cpp/features.cc.orig 2025-02-22 18:06:53 UTC +++ services/network/public/cpp/features.cc -@@ -127,7 +127,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey, +@@ -125,7 +125,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey, BASE_FEATURE(kDnsOverHttpsUpgrade, "DnsOverHttpsUpgrade", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 4389ecddba60..5c59c706e236 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-12-22 12:24:29 UTC +--- services/network/public/mojom/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/network/public/mojom/BUILD.gn -@@ -491,11 +491,11 @@ mojom("url_loader_base") { +@@ -542,11 +542,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1493,7 +1493,7 @@ mojom("mojom") { +@@ -1561,7 +1561,7 @@ mojom("mojom") { } } 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 index 594502e63d36..c3800133d196 100644 --- 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 @@ -1,4 +1,4 @@ ---- services/on_device_model/pre_sandbox_init.cc.orig 2024-08-27 06:28:16 UTC +--- services/on_device_model/pre_sandbox_init.cc.orig 2025-02-22 18:06:53 UTC +++ services/on_device_model/pre_sandbox_init.cc @@ -14,7 +14,7 @@ #include "services/on_device_model/ml/chrome_ml.h" // nogncheck @@ -27,7 +27,7 @@ // 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. -@@ -101,7 +101,7 @@ bool OnDeviceModelService::PreSandboxInit() { +@@ -102,7 +102,7 @@ bool OnDeviceModelService::PreSandboxInit() { return true; } diff --git a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn index e23b9217d9e4..d2376e0a0e23 100644 --- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn +++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2023-07-24 14:27:53 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn -@@ -29,8 +29,12 @@ component("memory_instrumentation") { +@@ -27,8 +27,12 @@ component("memory_instrumentation") { sources += [ "os_metrics_win.cc" ] } diff --git a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index a0187041083c..d336db67f4ac 100644 --- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,17 +1,17 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2024-08-27 06:28:16 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2025-02-22 18:06:53 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -53,7 +53,7 @@ class COMPONENT_EXPORT( - mojom::RawOSMemDump*); - static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId); +@@ -57,7 +57,7 @@ class COMPONENT_EXPORT( + static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps( + base::ProcessHandle); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) static void SetProcSmapsForTesting(FILE*); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) -@@ -70,7 +70,7 @@ class COMPONENT_EXPORT( - static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId); - #endif +@@ -79,7 +79,7 @@ class COMPONENT_EXPORT( + GetMemoryInfo(base::ProcessHandle handle); + #endif // !BUILDFLAG(IS_APPLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-services_service__manager_BUILD.gn b/www/iridium/files/patch-services_service__manager_BUILD.gn index fc373a9fb7b9..2246d012d7da 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 2024-06-25 12:08:48 UTC +--- services/service_manager/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ services/service_manager/BUILD.gn -@@ -66,7 +66,7 @@ source_set("service_manager") { +@@ -65,7 +65,7 @@ source_set("service_manager") { ] } diff --git a/www/iridium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc b/www/iridium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc new file mode 100644 index 000000000000..d5d8d4ed31a0 --- /dev/null +++ b/www/iridium/files/patch-services_tracing_public_cpp_system__metrics__sampler.cc @@ -0,0 +1,13 @@ +--- services/tracing/public/cpp/system_metrics_sampler.cc.orig 2025-02-22 18:06:53 UTC ++++ services/tracing/public/cpp/system_metrics_sampler.cc +@@ -176,8 +176,8 @@ void SystemMetricsSampler::ProcessSampler::SampleProce + TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), + "PhysicalMemoryFootprint", + memory_info->physical_footprint_bytes); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)) && defined(notyet) + TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), "VmSwapMemory", + memory_info->vm_swap_bytes); + TRACE_COUNTER(TRACE_DISABLED_BY_DEFAULT("system_metrics"), "RssAnonMemory", 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 deleted file mode 100644 index 9c60c327bdba..000000000000 --- a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2024-12-22 12:24:29 UTC -+++ services/video_capture/video_capture_service_impl.cc -@@ -43,7 +43,7 @@ - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || 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" -@@ -112,7 +112,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext - }; - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || 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 -@@ -334,7 +334,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende - gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) - { - #else -@@ -468,7 +468,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || 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 deleted file mode 100644 index d4b260b27db1..000000000000 --- a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h +++ /dev/null @@ -1,29 +0,0 @@ ---- services/video_capture/video_capture_service_impl.h.orig 2024-12-22 12:24:29 UTC -+++ services/video_capture/video_capture_service_impl.h -@@ -28,7 +28,7 @@ - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "services/viz/public/cpp/gpu/gpu.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) -@@ -77,7 +77,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap - void OnGpuInfoUpdate(const CHROME_LUID& luid) override; - #endif - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) -@@ -123,7 +123,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap - #endif - - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || 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-services_video__effects_video__effects__sandbox__hook__linux.cc b/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc index 58b1c2c3a0db..badd84543fba 100644 --- a/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- services/video_effects/video_effects_sandbox_hook_linux.cc.orig 2024-12-22 12:24:29 UTC +--- services/video_effects/video_effects_sandbox_hook_linux.cc.orig 2025-02-22 18:06:53 UTC +++ services/video_effects/video_effects_sandbox_hook_linux.cc @@ -6,7 +6,13 @@ @@ -11,7 +11,7 @@ +#else #include "sandbox/policy/linux/sandbox_linux.h" +#endif - #include "services/on_device_model/ml/chrome_ml.h" + #include "services/on_device_model/ml/chrome_ml_holder.h" namespace video_effects { @@ -29,8 +35,10 @@ bool VideoEffectsPreSandboxHook( diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index d052470b31d7..8e9ea989a78f 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,11 +1,12 @@ ---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2024-08-27 06:28:16 UTC +--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2025-02-22 18:06:53 UTC +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h -@@ -35,7 +35,7 @@ +@@ -35,7 +35,8 @@ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ -- !defined(__VXWORKS__) && !defined(__hexagon__) -+ !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__FreeBSD__) +- !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__XTENSA__) ++ !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__XTENSA__) && \ ++ !defined(__FreeBSD__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn index f203e4305504..32f5be67cbc0 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 2024-11-04 08:56:03 UTC +--- third_party/angle/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ third_party/angle/BUILD.gn -@@ -354,7 +354,6 @@ config("extra_warnings") { +@@ -355,7 +355,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -531,7 +530,7 @@ template("angle_common_lib") { +@@ -532,7 +531,7 @@ template("angle_common_lib") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -686,6 +685,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -687,6 +686,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] 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 index 63e7ab213794..e3d601b47fe8 100644 --- 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 @@ -1,20 +1,22 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ third_party/angle/src/common/system_utils_linux.cpp -@@ -15,8 +15,13 @@ - - #include <array> +@@ -15,10 +15,15 @@ + #include <sys/types.h> + #include <unistd.h> +#if ANGLE_PLATFORM_OPENBSD +#include <pthread_np.h> +#endif + + #include <array> + 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() +@@ -34,6 +39,7 @@ std::string GetExecutablePath() path[result] = '\0'; return path; } @@ -22,10 +24,10 @@ std::string GetExecutableDirectory() { -@@ -56,6 +62,10 @@ void SetCurrentThreadName(const char *name) - { +@@ -59,6 +65,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. + // returned), name will be ignored. + ASSERT(strlen(name) < 16); +#if ANGLE_PLATFORM_OPENBSD + pthread_set_name_np(pthread_self(), name); +#else 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 31af852efee8..9a5df7f73572 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,16 +1,16 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2024-12-22 12:24:29 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2025-02-22 18:06:53 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -60,7 +60,7 @@ +@@ -58,7 +58,7 @@ + # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" + # elif ANGLE_ENABLE_CGL # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" - # elif ANGLE_ENABLE_EAGL - # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX_api.h" -@@ -416,7 +416,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di - impl = new rx::DisplayEAGL(state); +@@ -422,7 +422,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + impl = new rx::DisplayCGL(state); break; -# elif defined(ANGLE_PLATFORM_LINUX) @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -462,7 +462,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -468,7 +468,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) { -@@ -513,7 +513,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -519,7 +519,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,16 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2131,7 +2131,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2139,7 +2139,7 @@ static ClientExtensions GenerateClientExtensions() + extensions.platformWaylandEXT = true; + #endif + +-#if defined(ANGLE_PLATFORM_LINUX) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN)) ++#if (defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)) && (defined(ANGLE_ENABLE_OPENGL) || defined(ANGLE_ENABLE_VULKAN)) + extensions.platformSurfacelessMESA = true; + #endif + +@@ -2185,7 +2185,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp deleted file mode 100644 index ac725c032635..000000000000 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-10-21 11:51:27 UTC -+++ third_party/angle/src/libANGLE/formatutils.cpp -@@ -1475,7 +1475,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa - AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); - AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); - --#if defined(ANGLE_PLATFORM_LINUX) -+#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) - // From GL_OES_required_internalformat - // The |shared| bit shouldn't be 2. But given this hits assertion when bits - // are checked, it's fine to have this bit set as 2 as a workaround. 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 80df8fbb81b4..cfd47617bf91 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 2024-06-25 12:08:48 UTC +--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc -@@ -68,7 +68,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat +@@ -77,7 +77,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__mojom__traits.h b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index bd298c5cef06..5387d5587970 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 2024-06-25 12:08:48 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -166,7 +166,7 @@ struct BLINK_COMMON_EXPORT +@@ -180,7 +180,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 834c5a310f9d..9a3a1ad5164f 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 2024-09-14 15:19:53 UTC +--- third_party/blink/public/platform/platform.h.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/public/platform/platform.h -@@ -374,7 +374,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -371,7 +371,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } 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 a26d0544c3e5..45e505c1b4b6 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,20 +1,20 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-12-22 12:24:29 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -428,7 +428,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -429,7 +429,7 @@ void RecordPrerenderActivationSignalDelay(const String + #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) + SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { - // TODO(crbug.com/1052397): 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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' -@@ -3415,7 +3415,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3430,7 +3430,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs + gfx::FontRenderParams::SUBPIXEL_RENDERING_NONE); + WebFontRenderStyle::SetSubpixelPositioning( renderer_preferences_.use_subpixel_positioning); - // TODO(crbug.com/1052397): 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)) && \ - !BUILDFLAG(IS_ANDROID) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!renderer_preferences_.system_font_family_name.empty()) { WebFontRenderStyle::SetSystemFontFamily(blink::WebString::FromUTF8( + renderer_preferences_.system_font_family_name)); 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 739152ed9a44..b09734e35319 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,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-12-22 12:24:29 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -769,7 +769,7 @@ void LayoutView::LayoutRoot() { +@@ -784,7 +784,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc b/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc new file mode 100644 index 000000000000..53883913f3d9 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_core_loader_mixed__content__checker.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/core/loader/mixed_content_checker.cc.orig 2025-02-22 18:06:53 UTC ++++ third_party/blink/renderer/core/loader/mixed_content_checker.cc +@@ -463,7 +463,7 @@ bool MixedContentChecker::ShouldBlockFetch( + switch (context_type) { + case mojom::blink::MixedContentContextType::kOptionallyBlockable: + +-#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)) && \ ++#if (BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(ENABLE_CAST_RECEIVER) + // Fuchsia WebEngine can be configured to allow loading Mixed Content from + // an insecure IP address. This is a workaround to revert Fuchsia Cast diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc b/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc index f3fd560465b2..7c495f021a46 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2024-12-22 12:24:29 UTC +--- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc -@@ -553,7 +553,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const +@@ -565,7 +565,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const } if (trial_name == "TranslationAPI") { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return base::FeatureList::IsEnabled(features::kEnableTranslationAPI); + return base::FeatureList::IsEnabled(features::kTranslationAPI); #else return false; 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 d220cb50def8..b357a1aa9c64 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 2024-08-27 06:28:16 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -120,7 +120,7 @@ namespace blink { +@@ -123,7 +123,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 259063194446..1115eabc5243 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,20 +1,20 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-11-04 08:56:03 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -148,7 +148,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -147,7 +147,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const + // Disable snapback on desktop Linux to better integrate with the desktop + // behavior. Typically, Linux apps do not implement scrollbar snapback (this // is true for at least GTK and QT apps). - // TODO(crbug.com/1052397): 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return false; #else return true; -@@ -418,7 +418,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -420,7 +420,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT + + bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) const { - // TODO(crbug.com/1052397): 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) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (event.button == WebPointerProperties::Button::kMiddle) return true; #endif 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 f88b0e443d2a..c9fa73e49a56 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,6 +1,6 @@ ---- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2024-08-27 06:28:16 UTC +--- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -71,7 +71,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char +@@ -68,7 +68,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char // It would be nice to do something with this error message. } diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc index 73c90aaa929f..320a804b5d47 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-12-06 08:09:13 UTC +--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc -@@ -35,7 +35,7 @@ namespace { +@@ -34,7 +34,7 @@ namespace { + // Set when the default factory is overridden. AudioDeviceFactory* g_factory_override = nullptr; - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Due to driver deadlock issues on Windows (http://crbug/422522) there is a // chance device authorization response is never received from the browser side. // In this case we will time out, to avoid renderer hang forever waiting for 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 eed4e42bbb88..a7bafdf10dfd 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 2024-12-22 12:24:29 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -874,7 +874,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -873,7 +873,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_webaudio_audio__worklet__thread__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 5047a160d0c2..18702c16c091 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 2024-11-04 08:56:03 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -469,7 +469,7 @@ class AudioWorkletThreadPriorityTest +@@ -465,7 +465,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 d23f88f903fb..6fabdcecb4a0 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-12-22 12:24:29 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6321,7 +6321,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6306,7 +6306,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 28e740eee7d7..42b8e7d0d23c 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-08-27 06:28:16 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -788,7 +788,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -811,7 +811,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 497b2bed00a7..769247706dd5 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-12-22 12:24:29 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2021,7 +2021,7 @@ static_library("test_support") { +@@ -2034,7 +2034,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 0fa45a825904..a256ab08c6ec 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 2024-11-04 08:56:03 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -81,7 +81,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -82,7 +82,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 -@@ -132,7 +132,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD +@@ -133,7 +133,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__platform__data.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc deleted file mode 100644 index b4b5e01ef5e5..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2024-08-27 06:28:16 UTC -+++ third_party/blink/renderer/platform/fonts/font_platform_data.cc -@@ -54,7 +54,7 @@ - namespace blink { - namespace { - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // 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 -@@ -133,7 +133,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t - style_ = WebFontRenderStyle::GetDefault(); - #if !BUILDFLAG(IS_WIN) - WebFontRenderStyle system_style; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - bool override_font_name_and_size = - base::FeatureList::IsEnabled(kOptimizeLinuxFonts); - #else 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 2a5f997cb615..c48b7c0c5f97 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,7 +1,7 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -65,7 +65,7 @@ AtomicString ToAtomicString(const SkString& str) { - return AtomicString::FromUTF8(str.c_str(), str.size()); + return AtomicString::FromUTF8(std::string_view(str.begin(), str.end())); } -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc index ab4df2e0d422..48e7a060b4fc 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_gpu_image__layer__bridge.cc @@ -1,9 +1,9 @@ ---- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig 2024-11-04 08:56:03 UTC +--- third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc -@@ -49,7 +49,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated( +@@ -48,7 +48,7 @@ scoped_refptr<StaticBitmapImage> MakeAccelerated( + const auto paint_image = source->PaintImageForCurrentFrame(); - const auto image_info = paint_image.GetSkImageInfo().makeWH( - source->Size().width(), source->Size().height()); + const auto image_info = paint_image.GetSkImageInfo(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(b/330865436): On Linux, CanvasResourceProvider doesn't always check 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 9212602328ab..73aefa4940f7 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 2024-11-04 08:56:03 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -438,7 +438,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -431,7 +431,7 @@ void VideoFrameSubmitter::OnBeginFrame( auto& details = timing_details.find(frame_token)->value; auto& feedback = details.presentation_feedback; 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 61a83f6de31e..043d3c1b9862 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,17 +1,17 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-11-04 08:56:03 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -260,12 +260,12 @@ SupportedFormats GetSupportedFormatsInternal( - supported_formats.scalability_modes.push_back(profile.scalability_modes); +@@ -334,12 +334,12 @@ SupportedFormats GetSupportedFormatsInternal( + supported_formats.profiles.push_back(profile.profile); supported_formats.sdp_formats.push_back(std::move(*format)); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_WIN) const bool kShouldAddH264Cbp = base::FeatureList::IsEnabled(kMediaFoundationH264CbpEncoding) && profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const bool kShouldAddH264Cbp = profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; #endif 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 7cacb0ce3077..cc6c2fc83711 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,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-12-22 12:24:29 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -388,7 +388,7 @@ +@@ -406,7 +406,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,16 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1845,7 +1845,7 @@ +@@ -1559,7 +1559,7 @@ + name: "DocumentIsolationPolicy", + status: "experimental", + origin_trial_feature_name: "DocumentIsolationPolicy", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + base_feature: "none", + }, + { +@@ -1852,7 +1852,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -18,16 +27,16 @@ origin_trial_allows_third_party: true, }, { -@@ -3233,7 +3233,7 @@ +@@ -3275,7 +3275,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: "experimental", + status: {"Android": "", "default": "experimental"}, public: true, base_feature_status: "enabled", -@@ -3369,7 +3369,7 @@ +@@ -3401,7 +3401,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -36,7 +45,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4384,7 +4384,7 @@ +@@ -4433,7 +4433,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -45,7 +54,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4549,7 +4549,7 @@ +@@ -4617,7 +4617,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -54,12 +63,3 @@ status: "experimental", base_feature: "none", }, -@@ -4592,7 +4592,7 @@ - status: "experimental", - base_feature: "none", - origin_trial_feature_name: "WebAppUrlHandling", -- origin_trial_os: ["win", "mac", "linux"], -+ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], - }, - { - // WebAssembly JS Promise Integration, 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 7ab77cac0521..ef8745340c0e 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,4 +1,4 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-08-27 06:28:16 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc @@ -23,6 +23,11 @@ extern "C" void* __libc_stack_end; // NOLINT @@ -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, -@@ -154,6 +161,13 @@ void* GetStackStart() { +@@ -152,6 +159,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 deleted file mode 100644 index 7adcef119637..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc +++ /dev/null @@ -1,36 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-12-22 12:24:29 UTC -+++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc -@@ -323,7 +323,7 @@ void TextCodecICU::CreateICUConverter() const { - DCHECK(!converter_icu_); - - #if defined(USING_SYSTEM_ICU) -- const char* name = encoding_.GetName(); -+ const AtomicString& name = encoding_.GetName(); - needs_gbk_fallbacks_ = - name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3]; - #endif -@@ -448,7 +448,7 @@ String TextCodecICU::Decode(base::span<const uint8_t> - // <http://bugs.webkit.org/show_bug.cgi?id=17014> - // Simplified Chinese pages use the code A3A0 to mean "full-width space", but - // ICU decodes it as U+E5E5. -- if (!strcmp(encoding_.GetName(), "GBK")) { -+ if (!strcmp(encoding_.GetName().Utf8().c_str(), "GBK")) { - if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030")) - resultString.Replace(0xE5E5, kIdeographicSpaceCharacter); - // Make GBK compliant to the encoding spec and align with GB18030 -@@ -611,6 +611,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, -@@ -628,6 +629,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_ffmpeg_configure b/www/iridium/files/patch-third__party_ffmpeg_configure index 8e5c9c966678..35b4bf4dd78d 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_configure +++ b/www/iridium/files/patch-third__party_ffmpeg_configure @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/configure.orig 2024-12-22 12:24:29 UTC +--- third_party/ffmpeg/configure.orig 2025-02-22 18:06:53 UTC +++ third_party/ffmpeg/configure -@@ -6833,8 +6833,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en +@@ -6850,8 +6850,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en if enabled pthread_np_h; then hdrs="$hdrs pthread_np.h" fi 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 index 1cd51a377cba..c38ed97a9cd1 100644 --- a/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp +++ b/www/iridium/files/patch-third__party_libc++_src_src_chrono.cpp @@ -1,6 +1,6 @@ ---- third_party/libc++/src/src/chrono.cpp.orig 2024-11-04 08:56:03 UTC +--- third_party/libc++/src/src/chrono.cpp.orig 2025-02-22 18:06:53 UTC +++ third_party/libc++/src/src/chrono.cpp -@@ -34,7 +34,7 @@ +@@ -38,7 +38,7 @@ // OpenBSD and GPU do not have a fully conformant suite of POSIX timers, but // it does have clock_gettime and CLOCK_MONOTONIC which is all we need. #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || defined(__AMDGPU__) || \ 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 index 17d6f10a2c03..eacf7b5a0e39 100644 --- 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 @@ -1,6 +1,6 @@ ---- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig 2024-11-04 08:56:03 UTC +--- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig 2025-02-22 18:06:53 UTC +++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp -@@ -30,7 +30,7 @@ +@@ -35,7 +35,7 @@ #endif #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__AMDGPU__) || defined(__NVPTX__) || \ diff --git a/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c b/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c index 0bd8a5427be6..6a1bed820f4a 100644 --- a/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c +++ b/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c @@ -1,6 +1,6 @@ ---- third_party/lzma_sdk/C/CpuArch.c.orig 2022-10-05 07:34:01 UTC +--- third_party/lzma_sdk/C/CpuArch.c.orig 2025-02-22 18:06:53 UTC +++ third_party/lzma_sdk/C/CpuArch.c -@@ -412,12 +412,40 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP +@@ -854,7 +854,35 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; } BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; } @@ -35,10 +35,17 @@ + #else // __APPLE__ - #include <sys/auxv.h> + #if defined(__GLIBC__) && (__GLIBC__ * 100 + __GLIBC_MINOR__ >= 216) +@@ -869,10 +897,12 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP + #endif + #endif --#if !defined(ARMV8_OS_FUCHSIA) -+#if !defined(ARMV8_OS_FUCHSIA) && !defined(__FreeBSD__) ++#if !defined(__FreeBSD__) + #ifdef Z7_GETAUXV_AVAILABLE + // #pragma message("=== Z7_GETAUXV_AVAILABLE === ") + #include <sys/auxv.h> #define USE_HWCAP - #endif // !defined(ARMV8_OS_FUCHSIA) ++#endif + #endif + #ifdef USE_HWCAP diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h index 7f67e14f10ec..ed11bab5261b 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h @@ -1,22 +1,22 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2022-03-28 18:11:04 UTC +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/include/perfetto/base/build_config.h @@ -27,6 +27,7 @@ #if defined(__ANDROID__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 -@@ -38,6 +39,7 @@ +@@ -40,6 +41,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -51,9 +53,10 @@ +@@ -55,9 +57,10 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 #endif @@ -25,42 +25,46 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 1 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 -@@ -64,6 +67,8 @@ +@@ -70,6 +73,7 @@ + #elif defined(__QNXNTO__) + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 +@@ -82,6 +86,7 @@ #elif defined(_WIN32) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 -@@ -74,6 +79,8 @@ +@@ -94,6 +99,7 @@ #elif defined(__EMSCRIPTEN__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 -@@ -87,6 +94,8 @@ +@@ -109,6 +115,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1 -@@ -94,6 +103,8 @@ +@@ -118,6 +125,7 @@ #elif defined(__native_client__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_BSD() 0 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX_BUT_NOT_QNX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h index e7f9cb7ee468..7b461971711e 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2023-01-17 19:19:00 UTC +--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -34,6 +34,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre +@@ -37,6 +37,7 @@ __declspec(dllimport) unsigned long __stdcall GetCurre #include <sys/syscall.h> #include <sys/types.h> #include <unistd.h> @@ -8,7 +8,7 @@ #else #include <pthread.h> #endif -@@ -45,6 +46,11 @@ namespace base { +@@ -49,6 +50,11 @@ namespace base { using PlatformThreadId = pid_t; inline PlatformThreadId GetThreadId() { return gettid(); 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 9a37719199d6..36aab71bdc23 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-08-01 05:47:53 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/include/perfetto/base/time.h -@@ -199,6 +199,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -227,6 +227,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 = {}; -@@ -206,6 +209,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -234,6 +237,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,7 +18,7 @@ } inline TimeNanos GetWallTimeNs() { -@@ -213,7 +217,13 @@ inline TimeNanos GetWallTimeNs() { +@@ -241,7 +245,13 @@ inline TimeNanos GetWallTimeNs() { } inline TimeNanos GetWallTimeRawNs() { diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h index 0efa8c9af2da..a53877ffd9b1 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2022-03-28 18:11:04 UTC +--- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/include/perfetto/ext/base/event_fd.h -@@ -55,6 +55,8 @@ class EventFd { +@@ -58,6 +58,8 @@ class EventFd { // On Mac and other non-Linux UNIX platforms a pipe-based fallback is used. // The write end of the wakeup pipe. ScopedFile write_fd_; diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc b/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc index 1b950942c3b2..1b2d1d792a57 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc @@ -1,12 +1,10 @@ ---- third_party/perfetto/src/base/clock_snapshots.cc.orig 2024-12-22 12:24:29 UTC +--- third_party/perfetto/src/base/clock_snapshots.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/clock_snapshots.cc -@@ -26,7 +26,8 @@ ClockSnapshotVector CaptureClockSnapshots() { - ClockSnapshotVector snapshot_data; +@@ -27,6 +27,7 @@ ClockSnapshotVector CaptureClockSnapshots() { #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) + !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_QNX) struct { clockid_t id; - protos::pbzero::BuiltinClock type; diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc b/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc index bbf00b1fbce7..fa5908009443 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_event__fd.cc @@ -1,21 +1,21 @@ ---- third_party/perfetto/src/base/event_fd.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/perfetto/src/base/event_fd.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/event_fd.cc -@@ -22,7 +22,8 @@ - #if PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) - #include <Windows.h> +@@ -24,7 +24,8 @@ #include <synchapi.h> + #elif PERFETTO_BUILDFLAG(PERFETTO_OS_QNX) + #include <unistd.h> -#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) #include <sys/eventfd.h> #include <unistd.h> -@@ -57,7 +58,8 @@ void EventFd::Clear() { +@@ -59,7 +60,8 @@ void EventFd::Clear() { PERFETTO_DFATAL("EventFd::Clear()"); } --#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \ +-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#elif (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc b/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc index fd74f8f8af7f..20b48e16caa2 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_periodic__task.cc @@ -1,11 +1,11 @@ ---- third_party/perfetto/src/base/periodic_task.cc.orig 2023-04-22 17:45:15 UTC +--- third_party/perfetto/src/base/periodic_task.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/periodic_task.cc @@ -24,7 +24,7 @@ #include "perfetto/base/time.h" #include "perfetto/ext/base/file_utils.h" --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19) #include <sys/timerfd.h> #endif @@ -13,8 +13,8 @@ } ScopedPlatformHandle CreateTimerFd(const PeriodicTask::Args& args) { --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) && __ANDROID_API__ >= 19) ScopedPlatformHandle tfd( timerfd_create(CLOCK_BOOTTIME, TFD_CLOEXEC | TFD_NONBLOCK)); diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc b/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc index 8912cc4fb679..987e8d252d3b 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_string__utils.cc @@ -1,15 +1,12 @@ ---- third_party/perfetto/src/base/string_utils.cc.orig 2024-02-04 14:46:08 UTC +--- third_party/perfetto/src/base/string_utils.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/string_utils.cc -@@ -38,9 +38,10 @@ namespace base { - +@@ -39,7 +39,8 @@ namespace base { // Locale-independant as possible version of strtod. double StrToD(const char* nptr, char** endptr) { --#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) -+ PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE)) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) static auto c_locale = newlocale(LC_ALL, "C", nullptr); return strtod_l(nptr, endptr, c_locale); - #else diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc b/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc index 355841731c66..c2a55df7d66e 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc @@ -1,11 +1,11 @@ ---- third_party/perfetto/src/base/subprocess_posix.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/perfetto/src/base/subprocess_posix.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/subprocess_posix.cc @@ -35,7 +35,8 @@ #include <thread> #include <tuple> --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \ +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) #include <sys/prctl.h> @@ -14,8 +14,8 @@ // Don't add any dynamic allocation in this function. This will be invoked // under a fork(), potentially in a state where the allocator lock is held. void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) { --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \ +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) // In no case we want a child process to outlive its parent process. This is diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc b/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc index 1c5e0b96b923..f5ca3a18ac08 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc @@ -1,14 +1,12 @@ ---- third_party/perfetto/src/base/thread_task_runner.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/perfetto/src/base/thread_task_runner.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/thread_task_runner.cc -@@ -27,8 +27,9 @@ +@@ -27,7 +27,8 @@ #include "perfetto/ext/base/thread_utils.h" #include "perfetto/ext/base/unix_task_runner.h" --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) #include <sys/prctl.h> #endif - diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc index 4e05242dd197..ca3f6e1890ff 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/unix_socket.cc @@ -44,7 +44,7 @@ #include <unistd.h> @@ -9,12 +9,12 @@ #include <sys/ucred.h> #endif -@@ -917,9 +917,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { - return; - PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); - --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+#if !defined(__FreeBSD__) && PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +@@ -940,9 +940,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { + int res = getpeereid(fd, &peer_uid_, nullptr); + PERFETTO_CHECK(res == 0); + // There is no pid when obtaining peer credentials for QNX +-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++#elif !defined(__FreeBSD__) && PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) +#if PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + struct sockpeercred user_cred; diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc b/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc index 73aaf36d9505..7dc533867952 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_utils.cc @@ -1,17 +1,15 @@ ---- third_party/perfetto/src/base/utils.cc.orig 2024-12-22 12:24:29 UTC +--- third_party/perfetto/src/base/utils.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/base/utils.cc -@@ -38,8 +38,9 @@ +@@ -38,7 +38,8 @@ #include <mach/vm_page_size.h> #endif --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) #include <sys/prctl.h> - #ifndef PR_GET_TAGGED_ADDR_CTRL @@ -278,14 +279,22 @@ void Daemonize(std::function<int()> parent_cb) { std::string GetCurExecutablePath() { @@ -37,15 +35,13 @@ #elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) uint32_t size = 0; PERFETTO_CHECK(_NSGetExecutablePath(nullptr, &size)); -@@ -337,8 +346,9 @@ void AlignedFree(void* ptr) { +@@ -337,7 +346,8 @@ void AlignedFree(void* ptr) { } bool IsSyncMemoryTaggingEnabled() { --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) // Compute only once per lifetime of the process. static bool cached_value = [] { - const int res = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0); diff --git a/www/iridium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc b/www/iridium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc new file mode 100644 index 000000000000..605ad1cd96cf --- /dev/null +++ b/www/iridium/files/patch-third__party_perfetto_src_trace__processor_importers_ftrace_v4l2__tracker.cc @@ -0,0 +1,56 @@ +--- third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc.orig 2025-02-22 18:06:53 UTC ++++ third_party/perfetto/src/trace_processor/importers/ftrace/v4l2_tracker.cc +@@ -62,7 +62,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, + case FtraceEvent::kV4l2QbufFieldNumber: { + V4l2QbufFtraceEvent::Decoder pb_evt(bytes); + BufferEvent evt; +- evt.device_minor = pb_evt.minor(); ++ evt.device_minor = pb_evt.gminor(); + evt.index = pb_evt.index(); + evt.type = pb_evt.type(); + evt.bytesused = pb_evt.bytesused(); +@@ -103,7 +103,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, + case FtraceEvent::kV4l2DqbufFieldNumber: { + V4l2DqbufFtraceEvent::Decoder pb_evt(bytes); + BufferEvent evt; +- evt.device_minor = pb_evt.minor(); ++ evt.device_minor = pb_evt.gminor(); + evt.index = pb_evt.index(); + evt.type = pb_evt.type(); + evt.bytesused = pb_evt.bytesused(); +@@ -149,7 +149,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, + case FtraceEvent::kVb2V4l2BufQueueFieldNumber: { + Vb2V4l2BufQueueFtraceEvent::Decoder pb_evt(bytes); + BufferEvent evt; +- evt.device_minor = pb_evt.minor(); ++ evt.device_minor = pb_evt.gminor(); + evt.index = std::nullopt; + evt.type = std::nullopt; + evt.bytesused = std::nullopt; +@@ -180,7 +180,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, + case FtraceEvent::kVb2V4l2BufDoneFieldNumber: { + Vb2V4l2BufDoneFtraceEvent::Decoder pb_evt(bytes); + BufferEvent evt; +- evt.device_minor = pb_evt.minor(); ++ evt.device_minor = pb_evt.gminor(); + evt.index = std::nullopt; + evt.type = std::nullopt; + evt.bytesused = std::nullopt; +@@ -211,7 +211,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, + case FtraceEvent::kVb2V4l2QbufFieldNumber: { + Vb2V4l2QbufFtraceEvent::Decoder pb_evt(bytes); + BufferEvent evt; +- evt.device_minor = pb_evt.minor(); ++ evt.device_minor = pb_evt.gminor(); + evt.index = std::nullopt; + evt.type = std::nullopt; + evt.bytesused = std::nullopt; +@@ -242,7 +242,7 @@ void V4l2Tracker::ParseV4l2Event(uint64_t fld_id, + case FtraceEvent::kVb2V4l2DqbufFieldNumber: { + Vb2V4l2DqbufFtraceEvent::Decoder pb_evt(bytes); + BufferEvent evt; +- evt.device_minor = pb_evt.minor(); ++ evt.device_minor = pb_evt.gminor(); + evt.index = std::nullopt; + evt.type = std::nullopt; + evt.bytesused = std::nullopt; diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc index cc8928e65199..f2b45a8e5a9e 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_ipc_memfd.cc @@ -1,12 +1,12 @@ ---- third_party/perfetto/src/tracing/ipc/memfd.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/perfetto/src/tracing/ipc/memfd.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/tracing/ipc/memfd.cc @@ -20,7 +20,8 @@ #define PERFETTO_MEMFD_ENABLED() \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) -+ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) +- PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) ++ (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX_BUT_NOT_QNX) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)) #if PERFETTO_MEMFD_ENABLED() diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc index ec267249baa8..c3d545da0d54 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/tracing/track.cc.orig 2024-12-22 12:24:29 UTC +--- third_party/perfetto/src/tracing/track.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/perfetto/src/tracing/track.cc @@ -60,8 +60,9 @@ protos::gen::TrackDescriptor ProcessTrack::Serialize() auto desc = Track::Serialize(); @@ -12,7 +12,7 @@ std::string cmdline; if (base::ReadFile("/proc/self/cmdline", &cmdline)) { // Since cmdline is a zero-terminated list of arguments, this ends up -@@ -155,7 +156,7 @@ namespace internal { +@@ -170,7 +171,7 @@ namespace internal { namespace { uint64_t GetProcessStartTime() { 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 c0cde33b91da..2d1ce1d23576 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-12-22 12:24:29 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2025-02-22 18:06:53 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.6 2024/11/26 20:44:58 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.8 2025/02/22 16:16:55 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/iridium/files/patch-third__party_sqlite_BUILD.gn b/www/iridium/files/patch-third__party_sqlite_BUILD.gn index 9e2fec1a476c..27e8650a1e5b 100644 --- a/www/iridium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/iridium/files/patch-third__party_sqlite_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/sqlite/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/sqlite/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ third_party/sqlite/BUILD.gn -@@ -142,7 +142,7 @@ config("sqlite_warnings") { +@@ -153,7 +153,7 @@ config("sqlite_warnings") { ] } } diff --git a/www/iridium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c b/www/iridium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c new file mode 100644 index 000000000000..f82cbc2dea60 --- /dev/null +++ b/www/iridium/files/patch-third__party_sqlite_src_amalgamation__dev_sqlite3.c @@ -0,0 +1,11 @@ +--- third_party/sqlite/src/amalgamation_dev/sqlite3.c.orig 2025-02-22 18:06:53 UTC ++++ third_party/sqlite/src/amalgamation_dev/sqlite3.c +@@ -14187,7 +14187,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 + diff --git a/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn b/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn index 84576dae408a..1ddc8f98df1e 100644 --- a/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn +++ b/www/iridium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/test_fonts/fontconfig/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/test_fonts/fontconfig/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ third_party/test_fonts/fontconfig/BUILD.gn @@ -26,7 +26,11 @@ if (is_linux || is_chromeos) { @@ -13,3 +13,16 @@ } if (current_toolchain == host_toolchain) { +@@ -47,7 +51,11 @@ if (is_linux || is_chromeos) { + "//third_party/test_fonts", + ] + args = [] +- inputs = [ "$root_out_dir/etc/fonts/fonts.conf" ] ++ if (is_freebsd) { ++ inputs = [ "$root_out_dir/usr/local/etc/fonts/fonts.conf" ] ++ } else { ++ inputs = [ "$root_out_dir/etc/fonts/fonts.conf" ] ++ } + outputs = [ + "$root_out_dir/fontconfig_caches/fb5c91b2895aa445d23aebf7f9e2189c-le64.cache-9", + "$root_out_dir/fontconfig_caches/CACHEDIR.TAG", 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 59a56dd04b06..e8ebea569240 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-06-25 12:08:48 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2025-02-22 18:06:53 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "rtc_base/time_utils.h" #include "system_wrappers/include/field_trial.h" @@ -9,7 +9,7 @@ #include <linux/sockios.h> #endif -@@ -74,7 +74,7 @@ typedef void* SockOptArg; +@@ -75,7 +75,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -329,7 +329,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -330,7 +330,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) { -@@ -358,7 +358,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -359,7 +359,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) { -@@ -389,7 +389,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -390,7 +390,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 -@@ -418,7 +418,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -419,7 +419,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 -@@ -697,7 +697,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -699,7 +699,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; @@ -63,7 +63,7 @@ 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 +@@ -748,7 +748,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s return -1; #endif case OPT_RECV_ECN: @@ -72,7 +72,7 @@ if (family_ == AF_INET6) { *slevel = IPPROTO_IPV6; *sopt = IPV6_RECVTCLASS; -@@ -766,10 +766,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -768,10 +768,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *sopt = SO_KEEPALIVE; break; case OPT_TCP_KEEPCNT: @@ -92,7 +92,7 @@ *slevel = IPPROTO_TCP; #if !defined(WEBRTC_MAC) *sopt = TCP_KEEPIDLE; -@@ -777,12 +786,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -779,12 +788,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *sopt = TCP_KEEPALIVE; #endif break; diff --git a/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py index 4366617a42bc..6eb9a1c5a58e 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2024-11-04 08:56:03 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2025-02-22 18:06:53 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py -@@ -145,7 +145,7 @@ class CppBundleGenerator(object): +@@ -144,7 +144,7 @@ class CppBundleGenerator(object): # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') elif platform == Platforms.LINUX: 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 f04f766a7fe6..3e2d3ca40747 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 2024-11-04 08:56:03 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2025-02-22 18:06:53 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -292,6 +292,8 @@ FEATURE_GRAMMAR = ({ +@@ -290,6 +290,8 @@ FEATURE_GRAMMAR = ({ 'linux': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', 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 b77c467604b7..eace341d2378 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,6 +1,6 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-08-27 06:28:16 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -47,7 +47,7 @@ group("telemetry_chrome_test") { +@@ -41,7 +41,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } @@ -9,7 +9,7 @@ data_deps += [ "//third_party/breakpad:dump_syms" ] # CrOS currently has issues with the locally compiled version of -@@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chrome") { +@@ -192,7 +192,7 @@ group("telemetry_chrome_test_without_chrome") { ] # Cr-Fuchsia doesn't support breakpad. diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.cc b/www/iridium/files/patch-ui_aura_screen__ozone.cc index bf52ab82620a..b461b0d0f3ca 100644 --- a/www/iridium/files/patch-ui_aura_screen__ozone.cc +++ b/www/iridium/files/patch-ui_aura_screen__ozone.cc @@ -1,11 +1,11 @@ ---- ui/aura/screen_ozone.cc.orig 2024-08-01 05:47:53 UTC +--- ui/aura/screen_ozone.cc.orig 2025-02-22 18:06:53 UTC +++ ui/aura/screen_ozone.cc @@ -107,7 +107,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone( std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender> suspender) : suspender_(std::move(suspender)) {} diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.h b/www/iridium/files/patch-ui_aura_screen__ozone.h index ec1f48370367..54debdd18237 100644 --- a/www/iridium/files/patch-ui_aura_screen__ozone.h +++ b/www/iridium/files/patch-ui_aura_screen__ozone.h @@ -1,20 +1,20 @@ ---- ui/aura/screen_ozone.h.orig 2024-08-01 05:47:53 UTC +--- ui/aura/screen_ozone.h.orig 2025-02-22 18:06:53 UTC +++ ui/aura/screen_ozone.h -@@ -45,7 +45,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( const gfx::Rect& match_rect) const override; display::Display GetPrimaryDisplay() const override; --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() override; - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -74,7 +74,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen + #endif // BUILDFLAG(IS_LINUX) +@@ -68,7 +68,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class ScreenSaverSuspenderOzone : public display::Screen::ScreenSaverSuspender { public: diff --git a/www/iridium/files/patch-ui_base_accelerators_accelerator.cc b/www/iridium/files/patch-ui_base_accelerators_accelerator.cc new file mode 100644 index 000000000000..a70970994e1f --- /dev/null +++ b/www/iridium/files/patch-ui_base_accelerators_accelerator.cc @@ -0,0 +1,11 @@ +--- ui/base/accelerators/accelerator.cc.orig 2025-02-22 18:06:53 UTC ++++ ui/base/accelerators/accelerator.cc +@@ -335,7 +335,7 @@ std::u16string Accelerator::ApplyLongFormModifiers( + result = ApplyModifierToAcceleratorString(result, IDS_APP_SEARCH_KEY); + #elif BUILDFLAG(IS_WIN) + result = ApplyModifierToAcceleratorString(result, IDS_APP_WINDOWS_KEY); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + result = ApplyModifierToAcceleratorString(result, IDS_APP_SUPER_KEY); + #else + NOTREACHED(); diff --git a/www/iridium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc b/www/iridium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc new file mode 100644 index 000000000000..35d2af346c44 --- /dev/null +++ b/www/iridium/files/patch-ui_base_accelerators_global__accelerator__listener_global__accelerator__listener__ozone.cc @@ -0,0 +1,29 @@ +--- ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc.orig 2025-02-22 18:06:53 UTC ++++ ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_ozone.cc +@@ -12,7 +12,7 @@ + #include "ui/base/accelerators/accelerator.h" + #include "ui/ozone/public/ozone_platform.h" + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS) + #include "base/feature_list.h" + #include "ui/base/accelerators/global_accelerator_listener/global_accelerator_listener_linux.h" + #endif +@@ -20,7 +20,7 @@ + using content::BrowserThread; + + namespace { +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS) + BASE_FEATURE(kGlobalShortcutsPortal, + "GlobalShortcutsPortal", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -38,7 +38,7 @@ GlobalAcceleratorListener* GlobalAcceleratorListener:: + return instance->get(); + } + +-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DBUS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DBUS) + if (base::FeatureList::IsEnabled(kGlobalShortcutsPortal)) { + static GlobalAcceleratorListenerLinux* const linux_instance = + new GlobalAcceleratorListenerLinux(nullptr); diff --git a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc index a20b1283ce94..d95e55b91136 100644 --- a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc +++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.cc @@ -1,4 +1,4 @@ ---- ui/base/clipboard/clipboard_constants.cc.orig 2024-02-04 14:46:08 UTC +--- ui/base/clipboard/clipboard_constants.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/clipboard/clipboard_constants.cc @@ -25,7 +25,7 @@ const char kMimeTypeOctetStream[] = "application/octet // Used for window dragging on some platforms. @@ -9,3 +9,12 @@ const char kMimeTypeLinuxUtf8String[] = "UTF8_STRING"; const char kMimeTypeLinuxString[] = "STRING"; const char kMimeTypeLinuxText[] = "TEXT"; +@@ -33,7 +33,7 @@ const char kMimeTypeLinuxText[] = "TEXT"; + // BUILDFLAG(IS_FUCHSIA) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + const char kMimeTypeSourceUrl[] = "chromium/x-source-url"; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h index 1e55e650bf43..f63e5c30149d 100644 --- a/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h +++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -1,6 +1,6 @@ ---- ui/base/clipboard/clipboard_constants.h.orig 2024-02-04 14:46:08 UTC +--- ui/base/clipboard/clipboard_constants.h.orig 2025-02-22 18:06:53 UTC +++ ui/base/clipboard/clipboard_constants.h -@@ -48,7 +48,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; +@@ -41,7 +41,7 @@ extern const char kMimeTypeWindowDrag[]; // ----- LINUX & CHROMEOS & FUCHSIA MIME TYPES ----- @@ -9,3 +9,12 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const char kMimeTypeLinuxUtf8String[]; COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) +@@ -53,7 +53,7 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) + // BUILDFLAG(IS_FUCHSIA) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + extern const char kMimeTypeSourceUrl[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) 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 457d56947b00..2bbfb699ac9c 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -99,7 +99,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -98,7 +98,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( std::optional<std::u16string> OSExchangeDataProviderNonBacked::GetString() const { diff --git a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc index 71abd5a7b955..46acca3c6bac 100644 --- a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc +++ b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/dummy_text_input_client.cc.orig 2024-11-04 08:56:03 UTC +--- ui/base/ime/dummy_text_input_client.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/ime/dummy_text_input_client.cc -@@ -163,7 +163,7 @@ bool DummyTextInputClient::ShouldDoLearning() { +@@ -175,7 +175,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h index 3828695a111f..b70e34a8890d 100644 --- a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h +++ b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/dummy_text_input_client.h.orig 2024-11-04 08:56:03 UTC +--- ui/base/ime/dummy_text_input_client.h.orig 2025-02-22 18:06:53 UTC +++ ui/base/ime/dummy_text_input_client.h -@@ -67,7 +67,7 @@ class DummyTextInputClient : public TextInputClient { +@@ -73,7 +73,7 @@ class DummyTextInputClient : public TextInputClient { ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; 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 d840916fc3e4..3caf69fdaf50 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 2024-11-04 08:56:03 UTC +--- ui/base/ime/fake_text_input_client.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/ime/fake_text_input_client.cc -@@ -215,7 +215,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -227,7 +227,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return should_do_learning_; } 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 465e60007c10..25dce61f990f 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 2024-11-04 08:56:03 UTC +--- ui/base/ime/fake_text_input_client.h.orig 2025-02-22 18:06:53 UTC +++ ui/base/ime/fake_text_input_client.h -@@ -101,7 +101,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -107,7 +107,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 index 50cb9fa8ce70..6848c3047d09 100644 --- 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 @@ -1,11 +1,11 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2024-06-25 12:08:48 UTC +--- ui/base/ime/init/input_method_initializer.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/ime/init/input_method_initializer.cc -@@ -10,7 +10,7 @@ - #include "build/chromeos_buildflags.h" +@@ -9,7 +9,7 @@ + #include "base/trace_event/trace_event.h" + #include "build/build_config.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)) +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || 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) @@ -18,12 +18,12 @@ GetInputMethodContextFactoryForTest() = base::BindRepeating([](LinuxInputMethodContextDelegate* delegate) -> std::unique_ptr<LinuxInputMethodContext> { -@@ -46,7 +46,7 @@ void InitializeInputMethodForTesting() { +@@ -45,7 +45,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)) +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || 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 f2b669522d85..717860944dfc 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 2024-11-04 08:56:03 UTC +--- ui/base/ime/text_input_client.h.orig 2025-02-22 18:06:53 UTC +++ ui/base/ime/text_input_client.h -@@ -268,7 +268,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { +@@ -335,7 +335,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 78daa4c04e9e..d6fda5d568fd 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 2024-11-04 08:56:03 UTC +--- ui/base/resource/resource_bundle.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/resource/resource_bundle.cc -@@ -914,7 +914,7 @@ void ResourceBundle::ReloadFonts() { +@@ -924,7 +924,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 40c4d91623a0..f6ac1306da66 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,11 +1,11 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2024-06-25 12:08:48 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -115,7 +115,7 @@ const char* GetPlatformName() { +@@ -112,7 +112,7 @@ const char* GetPlatformName() { + return "windows"; + #elif BUILDFLAG(IS_APPLE) return "macOS"; - // 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) return "linux"; - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - return "lacros"; + #elif BUILDFLAG(IS_CHROMEOS) + return "ash"; 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 7c4e4ad4c792..74ecdd5b95e5 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-06-25 12:08:48 UTC +--- ui/base/test/ui_controls.h.orig 2025-02-22 18:06:53 UTC +++ ui/base/test/ui_controls.h -@@ -186,7 +186,7 @@ bool SendTouchEventsNotifyWhenDone(int action, +@@ -184,7 +184,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 89c6a73f3b24..e3762ff2bc12 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.cc +++ b/www/iridium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2024-12-22 12:24:29 UTC +--- ui/base/ui_base_features.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/ui_base_features.cc -@@ -173,7 +173,7 @@ BASE_FEATURE(kWaylandUiScale, +@@ -133,7 +133,7 @@ BASE_FEATURE(kWaylandUiScale, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_OZONE) @@ -9,16 +9,16 @@ // If this feature is enabled, users not specify --ozone-platform-hint switch // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220. COMPONENT_EXPORT(UI_BASE_FEATURES) -@@ -275,7 +275,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -209,7 +209,7 @@ BASE_FEATURE(kUiCompositorScrollWithLayers, + // native apps on Windows. + BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", - // 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)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT -@@ -379,7 +379,7 @@ bool IsForcedColorsEnabled() { + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -291,7 +291,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__features.h b/www/iridium/files/patch-ui_base_ui__base__features.h index 53e567485e46..f38f423a47bd 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.h +++ b/www/iridium/files/patch-ui_base_ui__base__features.h @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.h.orig 2024-12-22 12:24:29 UTC +--- ui/base/ui_base_features.h.orig 2025-02-22 18:06:53 UTC +++ ui/base/ui_base_features.h -@@ -148,7 +148,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) +@@ -124,7 +124,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kWaylandUiScale); #endif // BUILDFLAG(IS_OZONE) diff --git a/www/iridium/files/patch-ui_base_ui__base__switches.cc b/www/iridium/files/patch-ui_base_ui__base__switches.cc index feb2bbe51e51..443977b20e9d 100644 --- a/www/iridium/files/patch-ui_base_ui__base__switches.cc +++ b/www/iridium/files/patch-ui_base_ui__base__switches.cc @@ -1,7 +1,7 @@ ---- ui/base/ui_base_switches.cc.orig 2024-08-27 06:28:16 UTC +--- ui/base/ui_base_switches.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/ui_base_switches.cc -@@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "show-mac-overla - const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing"; +@@ -24,13 +24,13 @@ const char kDisableModalAnimations[] = "disable-modal- + const char kShowMacOverlayBorders[] = "show-mac-overlay-borders"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-ui_base_ui__base__switches.h b/www/iridium/files/patch-ui_base_ui__base__switches.h index 6ef2d40f0530..fdab6deabad7 100644 --- a/www/iridium/files/patch-ui_base_ui__base__switches.h +++ b/www/iridium/files/patch-ui_base_ui__base__switches.h @@ -1,7 +1,7 @@ ---- ui/base/ui_base_switches.h.orig 2024-08-27 06:28:16 UTC +--- ui/base/ui_base_switches.h.orig 2025-02-22 18:06:53 UTC +++ ui/base/ui_base_switches.h -@@ -27,11 +27,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOv - COMPONENT_EXPORT(UI_BASE) extern const char kEnableResourcesFileSharing[]; +@@ -22,11 +22,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kDisableMo + COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOverlayBorders[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) 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 39aa2041373f..774c2f815eda 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-11-04 08:56:03 UTC +--- ui/base/webui/web_ui_util.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/webui/web_ui_util.cc -@@ -44,7 +44,7 @@ namespace { +@@ -43,7 +43,7 @@ namespace { constexpr float kMaxScaleFactor = 1000.0f; std::string GetFontFamilyMd() { @@ -9,12 +9,12 @@ return "Roboto, " + GetFontFamily(); #else return GetFontFamily(); -@@ -221,7 +221,7 @@ std::string GetFontFamily() { +@@ -218,7 +218,7 @@ void AppendWebUiCssTextDefaults(std::string* html) { + std::string GetFontFamily() { + std::string font_family = l10n_util::GetStringUTF8(IDS_WEB_FONT_FAMILY); - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string font_name = ui::ResourceBundle::GetSharedInstance() .GetFont(ui::ResourceBundle::BaseFont) .GetFontName(); 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 346fad013335..0edcbc58dc26 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,6 +1,6 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2024-08-27 06:28:16 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -34,7 +34,7 @@ +@@ -36,7 +36,7 @@ #include "ui/gfx/x/connection.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -59,7 +59,11 @@ std::string CursorPathFromLibXcursor() { +@@ -81,7 +81,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -170,7 +174,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -210,7 +214,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(), -@@ -359,7 +363,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -400,7 +404,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } 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 1466cf515569..450c5b51cc14 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 2024-06-25 12:08:48 UTC +--- ui/base/x/x11_shm_image_pool.cc.orig 2025-02-22 18:06:53 UTC +++ ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ #include "base/functional/callback.h" @@ -6,9 +6,9 @@ #include "base/strings/string_util.h" +#include "base/system/sys_info.h" #include "build/build_config.h" - #include "build/chromeos_buildflags.h" #include "net/base/url_util.h" -@@ -45,10 +46,14 @@ constexpr float kShmResizeShrinkThreshold = + #include "ui/events/platform/platform_event_dispatcher.h" +@@ -44,10 +45,14 @@ constexpr float kShmResizeShrinkThreshold = 1.0f / (kShmResizeThreshold * kShmResizeThreshold); std::size_t MaxShmSegmentSizeImpl() { @@ -23,10 +23,10 @@ } std::size_t MaxShmSegmentSize() { -@@ -57,14 +62,19 @@ std::size_t MaxShmSegmentSize() { +@@ -56,14 +61,19 @@ std::size_t MaxShmSegmentSize() { } - #if !BUILDFLAG(IS_CHROMEOS_ASH) + #if !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_BSD) bool IsRemoteHost(const std::string& name) { if (name.empty()) @@ -43,15 +43,15 @@ // 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 -@@ -93,6 +103,7 @@ bool ShouldUseMitShm(x11::Connection* connection) { +@@ -92,6 +102,7 @@ bool ShouldUseMitShm(x11::Connection* connection) { return false; return true; +#endif } - #endif + #endif // !BUILDFLAG(IS_CHROMEOS) -@@ -183,7 +194,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -182,7 +193,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size shmctl(state.shmid, IPC_RMID, nullptr); return false; } @@ -60,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 +213,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size +@@ -201,7 +212,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_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h index 0ff5fedea62c..348e9780872c 100644 --- a/www/iridium/files/patch-ui_color_color__id.h +++ b/www/iridium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2024-11-04 08:56:03 UTC +--- ui/color/color_id.h.orig 2025-02-22 18:06:53 UTC +++ ui/color/color_id.h -@@ -622,7 +622,7 @@ +@@ -619,7 +619,7 @@ \ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) 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 9a79c4357c88..2bfbf831d4ef 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-08-27 06:28:16 UTC +--- ui/color/color_provider_utils.cc.orig 2025-02-22 18:06:53 UTC +++ ui/color/color_provider_utils.cc -@@ -187,7 +187,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste +@@ -189,7 +189,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 index 2bdff2786040..a3ff17f0d499 100644 --- a/www/iridium/files/patch-ui_compositor_compositor.cc +++ b/www/iridium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2024-12-22 12:24:29 UTC +--- ui/compositor/compositor.cc.orig 2025-02-22 18:06:53 UTC +++ ui/compositor/compositor.cc -@@ -915,7 +915,7 @@ void Compositor::OnResume() { +@@ -910,7 +910,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/iridium/files/patch-ui_compositor_compositor.h b/www/iridium/files/patch-ui_compositor_compositor.h index 38a0c9fcee5b..a2241dac14c5 100644 --- a/www/iridium/files/patch-ui_compositor_compositor.h +++ b/www/iridium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2024-11-04 08:56:03 UTC +--- ui/compositor/compositor.h.orig 2025-02-22 18:06:53 UTC +++ ui/compositor/compositor.h -@@ -457,7 +457,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -456,7 +456,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/iridium/files/patch-ui_compositor_compositor__observer.h b/www/iridium/files/patch-ui_compositor_compositor__observer.h index 63a73c243112..423ba8a1aafa 100644 --- a/www/iridium/files/patch-ui_compositor_compositor__observer.h +++ b/www/iridium/files/patch-ui_compositor_compositor__observer.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor_observer.h.orig 2024-06-25 12:08:48 UTC +--- ui/compositor/compositor_observer.h.orig 2025-02-22 18:06:53 UTC +++ ui/compositor/compositor_observer.h -@@ -52,7 +52,7 @@ class COMPOSITOR_EXPORT CompositorObserver { +@@ -56,7 +56,7 @@ class COMPOSITOR_EXPORT CompositorObserver { // Called when a child of the compositor is resizing. virtual void OnCompositingChildResizing(Compositor* compositor) {} diff --git a/www/iridium/files/patch-ui_display_screen.cc b/www/iridium/files/patch-ui_display_screen.cc index 196de2cd70e9..78268a8e88ef 100644 --- a/www/iridium/files/patch-ui_display_screen.cc +++ b/www/iridium/files/patch-ui_display_screen.cc @@ -1,11 +1,11 @@ ---- ui/display/screen.cc.orig 2024-08-01 05:47:53 UTC +--- ui/display/screen.cc.orig 2025-02-22 18:06:53 UTC +++ ui/display/screen.cc @@ -86,7 +86,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; } --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default; std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() { diff --git a/www/iridium/files/patch-ui_display_screen.h b/www/iridium/files/patch-ui_display_screen.h index 3022c78fe1ea..d78d6080c6f5 100644 --- a/www/iridium/files/patch-ui_display_screen.h +++ b/www/iridium/files/patch-ui_display_screen.h @@ -1,20 +1,20 @@ ---- ui/display/screen.h.orig 2024-08-01 05:47:53 UTC +--- ui/display/screen.h.orig 2025-02-22 18:06:53 UTC +++ ui/display/screen.h @@ -140,7 +140,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -248,7 +248,7 @@ class DISPLAY_EXPORT Screen { +@@ -243,7 +243,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) uint32_t screen_saver_suspension_count_ = 0; - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) }; diff --git a/www/iridium/files/patch-ui_events_event.cc b/www/iridium/files/patch-ui_events_event.cc index d6276a708d7f..07cea01c2eb7 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 2024-11-04 08:56:03 UTC +--- ui/events/event.cc.orig 2025-02-22 18:06:53 UTC +++ ui/events/event.cc -@@ -366,7 +366,7 @@ std::string LocatedEvent::ToString() const { +@@ -373,7 +373,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)) { -@@ -622,7 +622,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -629,7 +629,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -882,7 +882,7 @@ void KeyEvent::InitializeNative() { +@@ -889,7 +889,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) SetFlags(flags() | EF_IS_REPEAT); diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn index bc00f5551f0c..c646c7dff2db 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-12-22 12:24:29 UTC +--- ui/gfx/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/BUILD.gn -@@ -666,7 +666,7 @@ source_set("memory_buffer_sources") { +@@ -653,7 +653,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } 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 1e23dc76ba0d..0303de128c8a 100644 --- a/www/iridium/files/patch-ui_gfx_font__render__params.h +++ b/www/iridium/files/patch-ui_gfx_font__render__params.h @@ -1,20 +1,20 @@ ---- ui/gfx/font_render_params.h.orig 2024-06-25 12:08:48 UTC +--- ui/gfx/font_render_params.h.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/font_render_params.h -@@ -115,7 +115,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( - const FontRenderParamsQuery& query, - std::string* family_out); +@@ -115,7 +115,7 @@ COMPONENT_EXPORT(GFX) + FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, + std::string* family_out); -#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(); -@@ -125,7 +125,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); - GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); + COMPONENT_EXPORT(GFX) void ClearFontRenderParamsCacheForTest(); +@@ -125,7 +125,7 @@ COMPONENT_EXPORT(GFX) void ClearFontRenderParamsCacheF + COMPONENT_EXPORT(GFX) float GetFontRenderParamsDeviceScaleFactor(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Sets the device scale factor for FontRenderParams to decide // if it should enable subpixel positioning. - GFX_EXPORT void SetFontRenderParamsDeviceScaleFactor( + COMPONENT_EXPORT(GFX) 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 8e0d51f7dcff..a810a5066f8d 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,6 +1,6 @@ ---- ui/gfx/font_render_params_linux.cc.orig 2024-06-25 12:08:48 UTC +--- ui/gfx/font_render_params_linux.cc.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/font_render_params_linux.cc -@@ -25,7 +25,7 @@ +@@ -24,7 +24,7 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/switches.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -212,7 +212,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP +@@ -211,7 +211,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP // Start with the delegate's settings, but let Fontconfig have the final say. FontRenderParams params; 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 8b102c41a250..125e449a6125 100644 --- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,15 +1,15 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2024-06-25 12:08:48 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ + #include "ui/gfx/generic_shared_memory_id.h" #include "ui/gfx/geometry/rect.h" - #include "ui/gfx/gfx_export.h" -#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_APPLE) #include "ui/gfx/mac/io_surface.h" -@@ -76,7 +76,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -76,7 +76,7 @@ struct COMPONENT_EXPORT(GFX) 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 e0dc22878d3e..3af1c2cd04d1 100644 --- a/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc +++ b/www/iridium/files/patch-ui_gfx_linux_gbm__wrapper.cc @@ -1,6 +1,6 @@ ---- ui/gfx/linux/gbm_wrapper.cc.orig 2024-11-04 08:56:03 UTC +--- ui/gfx/linux/gbm_wrapper.cc.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/linux/gbm_wrapper.cc -@@ -319,7 +319,7 @@ class Device final : public ui::GbmDevice { +@@ -318,7 +318,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_for_verification = diff --git a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h index a57d50025aa0..34f1c58d815e 100644 --- a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,15 +1,15 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2023-01-17 19:19:00 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/native_pixmap_handle.h @@ -14,7 +14,7 @@ + #include "build/build_config.h" #include "ui/gfx/buffer_types.h" - #include "ui/gfx/gfx_export.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/files/scoped_file.h" #endif -@@ -34,7 +34,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -34,7 +34,7 @@ struct COMPONENT_EXPORT(GFX) NativePixmapPlane { NativePixmapPlane(int stride, int offset, uint64_t size @@ -18,7 +18,7 @@ , base::ScopedFD fd #elif BUILDFLAG(IS_FUCHSIA) -@@ -55,7 +55,7 @@ struct GFX_EXPORT NativePixmapPlane { +@@ -55,7 +55,7 @@ struct COMPONENT_EXPORT(GFX) NativePixmapPlane { // This is necessary to map the buffers. uint64_t size; @@ -27,7 +27,7 @@ // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; #elif BUILDFLAG(IS_FUCHSIA) -@@ -78,7 +78,7 @@ struct GFX_EXPORT NativePixmapHandle { +@@ -78,7 +78,7 @@ struct COMPONENT_EXPORT(GFX) NativePixmapHandle { std::vector<NativePixmapPlane> 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 c47c956dd1ba..5e6d55b31ae6 100644 --- a/www/iridium/files/patch-ui_gfx_native__widget__types.h +++ b/www/iridium/files/patch-ui_gfx_native__widget__types.h @@ -1,20 +1,20 @@ ---- ui/gfx/native_widget_types.h.orig 2024-08-27 06:28:16 UTC +--- ui/gfx/native_widget_types.h.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/native_widget_types.h -@@ -104,7 +104,7 @@ class SkBitmap; +@@ -101,7 +101,7 @@ class ViewAndroid; + #endif + class SkBitmap; - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -219,7 +219,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -214,7 +214,7 @@ using NativeViewAccessible = id; + #else + using NativeViewAccessible = struct objc_object*; #endif - // 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) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux doesn't have a native font type. using NativeViewAccessible = AtkObject*; #else diff --git a/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc b/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc index a07c1f7b6c40..742cd454a15d 100644 --- a/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc +++ b/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text_api_fuzzer.cc.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/render_text_api_fuzzer.cc.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/render_text_api_fuzzer.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #include "ui/gfx/font_util.h" #include "ui/gfx/render_text.h" @@ -9,7 +9,7 @@ #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" #endif -@@ -47,7 +47,7 @@ struct Environment { +@@ -46,7 +46,7 @@ struct Environment { CHECK(base::i18n::InitializeICU()); diff --git a/www/iridium/files/patch-ui_gfx_switches.h b/www/iridium/files/patch-ui_gfx_switches.h index f06ff0de66d2..7e00565716c3 100644 --- a/www/iridium/files/patch-ui_gfx_switches.h +++ b/www/iridium/files/patch-ui_gfx_switches.h @@ -1,6 +1,6 @@ ---- ui/gfx/switches.h.orig 2024-06-25 12:08:48 UTC +--- ui/gfx/switches.h.orig 2025-02-22 18:06:53 UTC +++ ui/gfx/switches.h -@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersRed +@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kForcePrefersRed GFX_SWITCHES_EXPORT extern const char kForcePrefersNoReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; diff --git a/www/iridium/files/patch-ui_gfx_x_atom__cache.cc b/www/iridium/files/patch-ui_gfx_x_atom__cache.cc new file mode 100644 index 000000000000..02b1cc6d16fd --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_x_atom__cache.cc @@ -0,0 +1,10 @@ +--- ui/gfx/x/atom_cache.cc.orig 2025-02-22 18:06:53 UTC ++++ ui/gfx/x/atom_cache.cc +@@ -155,6 +155,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha + "application/octet-stream", + "application/vnd.chromium.test", + "chromium/filename", ++ "chromium/from-privileged", + "chromium/x-bookmark-entries", + "chromium/x-browser-actions", + "chromium/x-file-system-files", diff --git a/www/iridium/files/patch-ui_gl_gl__context.cc b/www/iridium/files/patch-ui_gl_gl__context.cc index 6428d36d1cdb..c13ad889f01e 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-12-22 12:24:29 UTC +--- ui/gl/gl_context.cc.orig 2025-02-22 18:06:53 UTC +++ ui/gl/gl_context.cc -@@ -517,7 +517,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -516,7 +516,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__implementation.cc b/www/iridium/files/patch-ui_gl_gl__implementation.cc index dc19e015e38f..fba398f705ff 100644 --- a/www/iridium/files/patch-ui_gl_gl__implementation.cc +++ b/www/iridium/files/patch-ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_implementation.cc.orig 2024-11-04 08:56:03 UTC +--- ui/gl/gl_implementation.cc.orig 2025-02-22 18:06:53 UTC +++ ui/gl/gl_implementation.cc -@@ -253,7 +253,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -252,7 +252,7 @@ GetRequestedGLImplementationFromCommandLine( const base::CommandLine* command_line) { bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/iridium/files/patch-ui_gl_gl__switches.cc b/www/iridium/files/patch-ui_gl_gl__switches.cc index 74106b952bb3..8816afbee13e 100644 --- a/www/iridium/files/patch-ui_gl_gl__switches.cc +++ b/www/iridium/files/patch-ui_gl_gl__switches.cc @@ -1,29 +1,29 @@ ---- ui/gl/gl_switches.cc.orig 2024-11-04 08:56:03 UTC +--- ui/gl/gl_switches.cc.orig 2025-02-22 18:06:53 UTC +++ ui/gl/gl_switches.cc -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ #include "base/android/build_info.h" #endif --#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_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -288,7 +288,7 @@ bool IsDefaultANGLEVulkan() { - base::android::SDK_VERSION_Q) +@@ -305,7 +305,7 @@ bool IsDefaultANGLEVulkan() { return false; + } #endif // BUILDFLAG(IS_ANDROID) --#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_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) angle::SystemInfo system_info; - if (!angle::GetSystemInfoVulkan(&system_info)) - return false; -@@ -300,7 +300,7 @@ bool IsDefaultANGLEVulkan() { - - const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; + { + GPU_STARTUP_TRACE_EVENT("angle::GetSystemInfoVulkan"); +@@ -353,7 +353,7 @@ bool IsDefaultANGLEVulkan() { + } + #endif // BUILDFLAG(IS_ANDROID) -#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; + // AMDVLK driver is buggy, so disable Vulkan with AMDVLK for now. + // crbug.com/1340081 + if (active_gpu.driverId == VK_DRIVER_ID_AMD_OPEN_SOURCE) 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 a367fde34ff4..f0ce86fb2e7f 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 2024-11-04 08:56:03 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2025-02-22 18:06:53 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -439,7 +439,7 @@ void PrintDialogGtk::ShowDialog( +@@ -438,7 +438,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 c5a4cd177621..67647c1f8428 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,11 +1,11 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2024-11-04 08:56:03 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2025-02-22 18:06:53 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -144,7 +144,7 @@ std::unique_ptr<views::Widget> MessagePopupView::Show( +@@ -153,7 +153,7 @@ std::unique_ptr<views::Widget> MessagePopupView::Show( + views::Widget::InitParams::CLIENT_OWNS_WIDGET, + views::Widget::InitParams::TYPE_POPUP); params.z_order = ui::ZOrderLevel::kFloatingWindow; - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Make the widget explicitly activatable as TYPE_POPUP is not activatable by // default but we need focus for the inline reply textarea. params.activatable = views::Widget::InitParams::Activatable::kYes; 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 291249c8b6ab..acbbc3665775 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme.h +++ b/www/iridium/files/patch-ui_native__theme_native__theme.h @@ -1,11 +1,11 @@ ---- ui/native_theme/native_theme.h.orig 2024-11-04 08:56:03 UTC +--- ui/native_theme/native_theme.h.orig 2025-02-22 18:06:53 UTC +++ ui/native_theme/native_theme.h -@@ -64,7 +64,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -61,7 +61,7 @@ class NATIVE_THEME_EXPORT NativeTheme { + // The part to be painted / sized. + enum Part { kCheckbox, - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) kFrameTopArea, #endif kInnerSpinButton, 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 0a25c987534a..f795c9e81527 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,11 +1,11 @@ ---- ui/native_theme/native_theme_base.cc.orig 2024-11-04 08:56:03 UTC +--- ui/native_theme/native_theme_base.cc.orig 2025-02-22 18:06:53 UTC +++ ui/native_theme/native_theme_base.cc -@@ -241,7 +241,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -238,7 +238,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, + absl::get<ButtonExtraParams>(extra), color_scheme, + accent_color_opaque); break; - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case kFrameTopArea: PaintFrameTopArea(canvas, state, rect, absl::get<FrameTopAreaExtraParams>(extra), 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 index 4209eda39975..9ed7a9413f85 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme__features.cc +++ b/www/iridium/files/patch-ui_native__theme_native__theme__features.cc @@ -1,20 +1,20 @@ ---- ui/native_theme/native_theme_features.cc.orig 2024-12-22 12:24:29 UTC +--- ui/native_theme/native_theme_features.cc.orig 2025-02-22 18:06:53 UTC +++ ui/native_theme/native_theme_features.cc -@@ -65,7 +65,7 @@ bool IsOverlayScrollbarEnabled() { +@@ -56,7 +56,7 @@ namespace ui { - 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::kFluentScrollbar) || - IsFluentOverlayScrollbarEnabled(); + return base::FeatureList::IsEnabled(features::kFluentOverlayScrollbar); #else -@@ -74,7 +74,7 @@ bool IsFluentScrollbarEnabled() { - } - bool IsFluentOverlayScrollbarEnabled() { + return false; +@@ -65,7 +65,7 @@ bool IsFluentOverlayScrollbarEnabled() { + + 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::kFluentOverlayScrollbar); + return base::FeatureList::IsEnabled(features::kFluentScrollbar) || + IsFluentOverlayScrollbarEnabled(); #else - return false; diff --git a/www/iridium/files/patch-ui_ozone_common_egl__util.cc b/www/iridium/files/patch-ui_ozone_common_egl__util.cc index 2e687c092ff9..d23d42cd860c 100644 --- a/www/iridium/files/patch-ui_ozone_common_egl__util.cc +++ b/www/iridium/files/patch-ui_ozone_common_egl__util.cc @@ -1,6 +1,6 @@ ---- ui/ozone/common/egl_util.cc.orig 2022-10-05 07:34:01 UTC +--- ui/ozone/common/egl_util.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/common/egl_util.cc -@@ -26,9 +26,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = +@@ -27,9 +27,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = FILE_PATH_LITERAL("libGLESv2.so"); #else // BUILDFLAG(IS_FUCHSIA) const base::FilePath::CharType kDefaultEglSoname[] = diff --git a/www/iridium/files/patch-ui_ozone_common_features.cc b/www/iridium/files/patch-ui_ozone_common_features.cc deleted file mode 100644 index 2d944a938b8e..000000000000 --- a/www/iridium/files/patch-ui_ozone_common_features.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/ozone/common/features.cc.orig 2024-12-22 12:24:29 UTC -+++ ui/ozone/common/features.cc -@@ -35,7 +35,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinat - // enabled. - BASE_FEATURE(kWaylandFractionalScaleV1, - "WaylandFractionalScaleV1", --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -47,7 +47,7 @@ BASE_FEATURE(kWaylandFractionalScaleV1, - // protocol is supported. - BASE_FEATURE(kWaylandXdgToplevelDrag, - "WaylandXdgToplevelDrag", --#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-ui_ozone_platform_headless_headless__surface__factory.cc b/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc index 4f575850772b..7eb09dbfae85 100644 --- a/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc +++ b/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2024-08-27 06:28:16 UTC +--- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/headless/headless_surface_factory.cc @@ -34,7 +34,7 @@ #include "ui/ozone/platform/headless/headless_window_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" #endif -@@ -280,7 +280,7 @@ std::unique_ptr<gpu::VulkanImplementation> +@@ -281,7 +281,7 @@ std::unique_ptr<gpu::VulkanImplementation> HeadlessSurfaceFactory::CreateVulkanImplementation( bool use_swiftshader, bool allow_protected_memory) { 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 5592baa6d70f..247ba6345b5b 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 2024-06-25 12:08:48 UTC +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/headless/vulkan_implementation_headless.cc -@@ -118,7 +118,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence( +@@ -116,7 +116,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; -@@ -128,7 +128,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand +@@ -126,7 +126,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) && -@@ -151,7 +151,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory +@@ -149,7 +149,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 index 24c6a9871aaf..a8307aa91d66 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-11-04 08:56:03 UTC +--- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/common/wayland_util.cc -@@ -347,7 +347,7 @@ void TransformToWlArray( +@@ -325,7 +325,7 @@ void SkColorToWlArray(const SkColor4f& color, wl_array } base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) { @@ -9,7 +9,7 @@ // TODO(crbug.com/40287874): `milliseconds` comes from Weston that // uses timestamp from libinput, which is different from TimeTicks. // Use EventTimeForNow(), for now. -@@ -389,7 +389,7 @@ bool MaybeHandlePlatformEventForDrag(const ui::Platfor +@@ -367,7 +367,7 @@ bool MaybeHandlePlatformEventForDrag(const ui::Platfor } void RecordConnectionMetrics(wl_display* display) { 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 07727c3901b3..04d8473a9a2d 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,6 +1,6 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/emulate/wayland_input_emulate.cc -@@ -284,7 +284,7 @@ void WaylandInputEmulate::EmulateUpdateDisplay(const s +@@ -281,7 +281,7 @@ void WaylandInputEmulate::EmulateUpdateDisplay(const s } #endif 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 index e7a50d7e2ec8..8514dccdb657 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-11-04 08:56:03 UTC +--- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/host/wayland_connection.cc -@@ -541,7 +541,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c +@@ -492,7 +492,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c // isn't present on any non-exo Wayland compositors. bool should_use_overlay_delegation = IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1(); 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 index 3542c2bcdcc0..23d614ce1c07 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2024-11-04 08:56:03 UTC +--- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc -@@ -60,7 +60,7 @@ namespace { +@@ -53,7 +53,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 = 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 index f7ae79b4418e..eb674fb44af7 100644 --- 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 @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_popup.cc.orig 2024-06-25 12:08:48 UTC +--- ui/ozone/platform/wayland/host/wayland_popup.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/host/wayland_popup.cc -@@ -34,7 +34,7 @@ WaylandPopup::WaylandPopup(PlatformWindowDelegate* del +@@ -31,7 +31,7 @@ WaylandPopup::WaylandPopup(PlatformWindowDelegate* del WaylandWindow* parent) : WaylandWindow(delegate, connection) { set_parent_window(parent); diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc deleted file mode 100644 index 41511c746fff..000000000000 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_screen.cc.orig 2024-12-22 12:24:29 UTC -+++ ui/ozone/platform/wayland/host/wayland_screen.cc -@@ -47,7 +47,7 @@ - #include "ui/ozone/platform/wayland/host/org_gnome_mutter_idle_monitor.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/base/ui_base_features.h" - #include "ui/linux/linux_ui.h" - #endif -@@ -135,7 +135,7 @@ WaylandScreen::WaylandScreen(WaylandConnection* connec - tablet_state_ = connection_->GetTabletState(); - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (connection_->IsUiScaleEnabled() && LinuxUi::instance()) { - OnDeviceScaleFactorChanged(); - display_scale_factor_observer_.Observe(LinuxUi::instance()); -@@ -614,7 +614,7 @@ bool WaylandScreen::VerifyOutputStateConsistentForTest - return true; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void WaylandScreen::OnDeviceScaleFactorChanged() { - CHECK(connection_->IsUiScaleEnabled()); - CHECK(LinuxUi::instance()); diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h deleted file mode 100644 index 6c77bc1c7328..000000000000 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h +++ /dev/null @@ -1,38 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_screen.h.orig 2024-12-22 12:24:29 UTC -+++ ui/ozone/platform/wayland/host/wayland_screen.h -@@ -23,7 +23,7 @@ - #include "ui/ozone/platform/wayland/host/wayland_output.h" - #include "ui/ozone/public/platform_screen.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/scoped_observation.h" - #include "ui/linux/device_scale_factor_observer.h" - #include "ui/linux/linux_ui.h" -@@ -43,7 +43,7 @@ class OrgGnomeMutterIdleMonitor; - - // A PlatformScreen implementation for Wayland. - class WaylandScreen : public PlatformScreen --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - , - public DeviceScaleFactorObserver - #endif -@@ -95,7 +95,7 @@ class WaylandScreen : public PlatformScreen - display::TabletState GetTabletState() const override; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // DeviceScaleFactorObserver: - void OnDeviceScaleFactorChanged() override; - #endif -@@ -155,7 +155,7 @@ class WaylandScreen : public PlatformScreen - display::TabletState tablet_state_; - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::ScopedObservation<ui::LinuxUi, DeviceScaleFactorObserver> - display_scale_factor_observer_{this}; - #endif 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 deleted file mode 100644 index 4ea521c6b787..000000000000 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-12-22 12:24:29 UTC -+++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -629,7 +629,7 @@ void WaylandToplevelWindow::HandleToplevelConfigureWit - const bool did_active_change = is_active_ != window_states.is_activated; - is_active_ = window_states.is_activated; - --#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 2d2f73e4a04d..3b4289deb313 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,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-12-22 12:24:29 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -262,7 +262,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -183,7 +183,7 @@ class WaylandToplevelWindow : public WaylandWindow, // The display ID to switch to in case the state is `kFullscreen`. int64_t fullscreen_display_id_ = display::kInvalidDisplayId; 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 ad7dc4e8d207..25f1ef817523 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 2024-12-22 12:24:29 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -323,7 +323,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -313,7 +313,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, AsWeakPtr(), async_cursor_)); -@@ -604,7 +604,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { +@@ -586,7 +586,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { DCHECK(platform_cursor); @@ -18,7 +18,7 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -815,7 +815,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -758,7 +758,7 @@ std::string WaylandWindow::WindowStates::ToString() co } else { base::TrimString(states, " ", &states); } @@ -27,7 +27,7 @@ states += "; tiled_edges: "; std::string tiled = ""; if (tiled_edges.left) { -@@ -1318,12 +1318,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1228,12 +1228,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 81ceeea11fce..f71437be304f 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 2024-12-22 12:24:29 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h -@@ -41,7 +41,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 -@@ -280,7 +280,7 @@ class WaylandWindow : public PlatformWindow, - bool is_snapped_secondary = false; - bool is_floated = false; - bool is_pip = false; +@@ -259,7 +259,7 @@ class WaylandWindow : public PlatformWindow, + bool is_activated = false; + bool is_minimized = false; + bool is_suspended = false; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) WindowTiledEdges tiled_edges; #endif -@@ -578,7 +578,7 @@ class WaylandWindow : public PlatformWindow, +@@ -533,7 +533,7 @@ class WaylandWindow : public PlatformWindow, void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); @@ -27,9 +27,9 @@ void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, scoped_refptr<BitmapCursor> bitmap_cursor); #endif -@@ -647,7 +647,7 @@ class WaylandWindow : public PlatformWindow, - - wl::Object<zaura_surface> aura_surface_; +@@ -603,7 +603,7 @@ class WaylandWindow : public PlatformWindow, + // the subsurface arrangement are played back by WaylandFrameManager. + base::LinkedList<WaylandSubsurface> subsurface_stack_committed_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 deleted file mode 100644 index a002be4124ff..000000000000 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2024-11-04 08:56:03 UTC -+++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -322,7 +322,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* - window_states.is_activated = - CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED); - --#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 6164cd0df7a5..cb291a895c6e 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 2024-12-22 12:24:29 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2025-02-22 18:06:53 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 -@@ -278,7 +278,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -292,7 +292,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>(); -@@ -288,7 +288,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -302,7 +302,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -34,16 +34,7 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -354,7 +354,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 -@@ -556,7 +556,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -543,7 +543,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif 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 index c8a4eb5e457f..621bf010ab9d 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2024-11-04 08:56:03 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2025-02-22 18:06:53 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1504,7 +1504,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1501,7 +1501,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; 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 fa9310bdbe3c..75d0a66651f1 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,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.cc.orig 2024-12-22 12:24:29 UTC +--- ui/platform_window/platform_window_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ ui/platform_window/platform_window_delegate.cc -@@ -66,7 +66,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD +@@ -57,7 +57,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD return gfx::Insets(); } 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 ff467783e265..225839fde7ac 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,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.h.orig 2024-12-22 12:24:29 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2025-02-22 18:06:53 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -191,7 +191,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; diff --git a/www/iridium/files/patch-ui_views_controls_prefix__selector.cc b/www/iridium/files/patch-ui_views_controls_prefix__selector.cc index 4f4b324aadb7..579142104961 100644 --- a/www/iridium/files/patch-ui_views_controls_prefix__selector.cc +++ b/www/iridium/files/patch-ui_views_controls_prefix__selector.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/prefix_selector.cc.orig 2024-11-04 08:56:03 UTC +--- ui/views/controls/prefix_selector.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/controls/prefix_selector.cc -@@ -178,7 +178,7 @@ bool PrefixSelector::ShouldDoLearning() { +@@ -192,7 +192,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; } diff --git a/www/iridium/files/patch-ui_views_controls_prefix__selector.h b/www/iridium/files/patch-ui_views_controls_prefix__selector.h index 3921293eeec6..6a38c2f25edf 100644 --- a/www/iridium/files/patch-ui_views_controls_prefix__selector.h +++ b/www/iridium/files/patch-ui_views_controls_prefix__selector.h @@ -1,6 +1,6 @@ ---- ui/views/controls/prefix_selector.h.orig 2024-11-04 08:56:03 UTC +--- ui/views/controls/prefix_selector.h.orig 2025-02-22 18:06:53 UTC +++ ui/views/controls/prefix_selector.h -@@ -85,7 +85,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp +@@ -91,7 +91,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; 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 331578fafd27..641137d15b6c 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-12-22 12:24:29 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -87,7 +87,7 @@ +@@ -86,7 +86,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" -@@ -185,7 +185,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,16 +18,16 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -763,7 +763,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event - if (!textfield) +@@ -790,7 +790,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event return handled; + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -946,7 +946,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -975,7 +975,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1997,7 +1997,7 @@ bool Textfield::ShouldDoLearning() { +@@ -2066,7 +2066,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,20 +45,21 @@ // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2503,14 +2503,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2584,7 +2584,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Only erase by line break on Linux and ChromeOS. - if (shift) + if (shift) { return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; +@@ -2592,7 +2592,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Only erase by line break on Linux and ChromeOS. - if (shift && control) + if (shift && control) { return ui::TextEditCommand::DELETE_TO_END_OF_LINE; 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 86c804421a94..c0a7b5a43793 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.h.orig 2024-12-22 12:24:29 UTC +--- ui/views/controls/textfield/textfield.h.orig 2025-02-22 18:06:53 UTC +++ ui/views/controls/textfield/textfield.h -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ #include "ui/views/view_observer.h" #include "ui/views/word_lookup_client.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -465,7 +465,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -474,7 +474,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 2825c7543375..92268c202bb2 100644 --- a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,11 +1,11 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2024-11-04 08:56:03 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -37,7 +37,7 @@ namespace { +@@ -38,7 +38,7 @@ static constexpr int kTooltipMaxWidth = 800; + + // TODO(varkha): Update if native widget can be transparent on Linux. bool CanUseTranslucentTooltipWidget() { - // 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) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return false; #else return true; 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 0cce19db3dbe..d70e60dd9754 100644 --- a/www/iridium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/iridium/files/patch-ui_views_focus_focus__manager.cc @@ -1,20 +1,20 @@ ---- ui/views/focus/focus_manager.cc.orig 2024-08-27 06:28:16 UTC +--- ui/views/focus/focus_manager.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/focus/focus_manager.cc -@@ -585,7 +585,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -603,7 +603,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi + return false; + } - // 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) ++#if BUILDFLAG(IS_LINUX) || 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 -@@ -602,7 +602,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -618,7 +618,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi + const bool accelerator_processed = + focus_manager->ProcessAccelerator(accelerator); - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Need to manually close the bubble widget on Linux. On Linux when the // bubble is shown, the main widget remains active. Because of that when // focus is set to the main widget to process accelerator, the main widget 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 9ed502db17c2..579114c0198c 100644 --- a/www/iridium/files/patch-ui_views_style_platform__style.cc +++ b/www/iridium/files/patch-ui_views_style_platform__style.cc @@ -1,6 +1,6 @@ ---- ui/views/style/platform_style.cc.orig 2024-06-25 12:08:48 UTC +--- ui/views/style/platform_style.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/style/platform_style.cc -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ #include "ui/views/controls/focusable_border.h" #include "ui/views/controls/scrollbar/scroll_bar_views.h" @@ -9,16 +9,7 @@ #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" #endif -@@ -50,7 +50,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus - // Linux clips bubble windows that extend outside their parent window - // bounds. - const bool PlatformStyle::kAdjustBubbleIfOffscreen = --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - false; - #else - true; -@@ -59,7 +59,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = +@@ -27,7 +27,7 @@ namespace views { // static std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar( ScrollBar::Orientation 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 ee84d86fec5f..65e7fc7702d3 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,8 +1,8 @@ ---- 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.orig 2025-02-22 18:06:53 UTC +++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc -@@ -296,7 +296,7 @@ void UpdateDisplaySync(const std::string& display_spec +@@ -237,7 +237,7 @@ bool SendMouseClick(MouseButton type, gfx::NativeWindo + window_hint); } - #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_views_views__delegate.cc b/www/iridium/files/patch-ui_views_views__delegate.cc index c3e250f628f5..40474e3580c3 100644 --- a/www/iridium/files/patch-ui_views_views__delegate.cc +++ b/www/iridium/files/patch-ui_views_views__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.cc.orig 2024-12-22 12:24:29 UTC +--- ui/views/views_delegate.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/views_delegate.cc -@@ -97,7 +97,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow +@@ -89,7 +89,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; } #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/iridium/files/patch-ui_views_views__delegate.h b/www/iridium/files/patch-ui_views_views__delegate.h index 15270b11de73..6fc8fd044303 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 2024-12-22 12:24:29 UTC +--- ui/views/views_delegate.h.orig 2025-02-22 18:06:53 UTC +++ ui/views/views_delegate.h -@@ -147,7 +147,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -139,7 +139,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 0cfb333b7bb7..16043183292b 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,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-12-22 12:24:29 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -204,7 +204,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -203,7 +203,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return selected_operation_; } 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 9de45f620ee2..c62cd0b2c221 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 2024-12-22 12:24:29 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -359,7 +359,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -347,7 +347,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1176,7 +1176,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1174,7 +1174,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 deleted file mode 100644 index 90d0689490fe..000000000000 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -@@ -23,7 +23,7 @@ - #include "ui/views/widget/widget_delegate.h" - #include "ui/views/window/native_frame_view.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" - #include "ui/views/widget/desktop_aura/window_event_filter_linux.h" - using DesktopWindowTreeHostPlatformImpl = views::DesktopWindowTreeHostLinux; diff --git a/www/iridium/files/patch-ui_views_widget_root__view.cc b/www/iridium/files/patch-ui_views_widget_root__view.cc index fc26ce527a15..4228349946eb 100644 --- a/www/iridium/files/patch-ui_views_widget_root__view.cc +++ b/www/iridium/files/patch-ui_views_widget_root__view.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/root_view.cc.orig 2024-12-22 12:24:29 UTC +--- ui/views/widget/root_view.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/widget/root_view.cc -@@ -110,7 +110,7 @@ class AnnounceTextView : public View { +@@ -169,7 +169,7 @@ class AnnounceTextView : public View { #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. GetViewAccessibility().SetRole(ax::mojom::Role::kStaticText); diff --git a/www/iridium/files/patch-ui_views_widget_widget.cc b/www/iridium/files/patch-ui_views_widget_widget.cc index 50fd59ff4ec1..4a6b30bbe299 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-12-22 12:24:29 UTC +--- ui/views/widget/widget.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/widget/widget.cc -@@ -59,7 +59,7 @@ +@@ -60,7 +60,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,12 +9,12 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2194,7 +2194,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const - if (parent_) +@@ -2372,7 +2372,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const return parent_->GetNativeTheme(); + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) + if (auto* linux_ui_theme = + ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) { return linux_ui_theme->GetNativeTheme(); - #endif 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 344e5ad9858d..8b6e71fc725e 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,11 +1,11 @@ ---- ui/views/window/custom_frame_view.cc.orig 2024-08-27 06:28:16 UTC +--- ui/views/window/custom_frame_view.cc.orig 2025-02-22 18:06:53 UTC +++ ui/views/window/custom_frame_view.cc -@@ -268,7 +268,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -279,7 +279,7 @@ int CustomFrameView::NonClientTopBorderHeight() const + int CustomFrameView::CaptionButtonY() const { + // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. - // 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) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return FrameBorderThickness(); #else return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness; diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index 343b3d9281a8..076bbf8d703e 100644 --- a/www/iridium/files/patch-v8_BUILD.gn +++ b/www/iridium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2024-12-22 12:24:29 UTC +--- v8/BUILD.gn.orig 2025-02-22 18:06:53 UTC +++ v8/BUILD.gn -@@ -929,6 +929,8 @@ external_v8_defines = [ +@@ -945,6 +945,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [ -@@ -1005,6 +1007,12 @@ if (target_os == "android") { +@@ -1024,6 +1026,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" ] @@ -22,7 +22,7 @@ } disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines -@@ -2563,6 +2571,12 @@ template("run_mksnapshot") { +@@ -2599,6 +2607,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } if (v8_enable_turboshaft_csa) { -@@ -6636,7 +6650,7 @@ v8_component("v8_libbase") { +@@ -6683,7 +6697,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6647,6 +6661,18 @@ v8_component("v8_libbase") { +@@ -6694,6 +6708,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 4c68ff34c511..493d35e1caba 100644 --- a/www/iridium/files/patch-v8_include_v8-internal.h +++ b/www/iridium/files/patch-v8_include_v8-internal.h @@ -1,6 +1,6 @@ ---- v8/include/v8-internal.h.orig 2024-11-04 08:56:03 UTC +--- v8/include/v8-internal.h.orig 2025-02-22 18:06:53 UTC +++ v8/include/v8-internal.h -@@ -229,7 +229,7 @@ using SandboxedPointer_t = Address; +@@ -232,7 +232,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. diff --git a/www/iridium/files/patch-v8_include_v8config.h b/www/iridium/files/patch-v8_include_v8config.h index b3050f04b2c7..49d3a4e11324 100644 --- a/www/iridium/files/patch-v8_include_v8config.h +++ b/www/iridium/files/patch-v8_include_v8config.h @@ -1,4 +1,4 @@ ---- v8/include/v8config.h.orig 2024-08-27 06:28:16 UTC +--- v8/include/v8config.h.orig 2025-02-22 18:06:53 UTC +++ v8/include/v8config.h @@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ @@ -35,13 +35,11 @@ #ifdef V8_OS_MACOS # define V8_TARGET_OS_MACOS #endif -@@ -381,7 +395,8 @@ path. Add it with -I<path> to the command line - // preserve_most in clang >= 17 (see https://reviews.llvm.org/D143425). +@@ -382,6 +396,7 @@ path. Add it with -I<path> to the command line #if (defined(_M_X64) || defined(__x86_64__) /* x64 (everywhere) */ \ || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */ \ -- && !defined(_WIN32))) /* not on windows */ \ -+ && !defined(_WIN32) /* not on windows */ \ -+ && !defined(__OpenBSD__))) /* not on OpenBSD */ \ + && !defined(_WIN32))) /* not on windows */ \ ++ && !defined(__OpenBSD__) /* not on OpenBSD */ \ && !defined(COMPONENT_BUILD) /* no component build */\ && __clang_major__ >= 17 /* clang >= 17 */ # define V8_HAS_ATTRIBUTE_PRESERVE_MOST (__has_attribute(preserve_most)) diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc index 1f43e5515b59..c5a3b05f7d05 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-12-22 12:24:29 UTC +--- v8/src/api/api.cc.orig 2025-02-22 18:06:53 UTC +++ v8/src/api/api.cc -@@ -151,7 +151,7 @@ +@@ -153,7 +153,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6559,7 +6559,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6640,7 +6640,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/iridium/files/patch-v8_src_base_small-vector.h b/www/iridium/files/patch-v8_src_base_small-vector.h deleted file mode 100644 index 658417bf89aa..000000000000 --- a/www/iridium/files/patch-v8_src_base_small-vector.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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_builtins_x64_builtins-x64.cc b/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc new file mode 100644 index 000000000000..5f22f5f4927a --- /dev/null +++ b/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -0,0 +1,11 @@ +--- v8/src/builtins/x64/builtins-x64.cc.orig 2025-02-22 18:06:53 UTC ++++ v8/src/builtins/x64/builtins-x64.cc +@@ -1836,7 +1836,7 @@ static void Generate_InterpreterEnterBytecode(MacroAss + times_system_pointer_size, 0)); + + // Jump to the interpreter entry, and call kJavaScriptCallCodeStartRegister. +- __ jmp(rbx); ++ __ jmp(rbx, /*notrack=*/true); + } + + void Builtins::Generate_InterpreterEnterAtNextBytecode(MacroAssembler* masm) { diff --git a/www/iridium/files/patch-v8_src_execution_isolate.cc b/www/iridium/files/patch-v8_src_execution_isolate.cc index 16b8b67d0020..1b5649cec565 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-12-22 12:24:29 UTC +--- v8/src/execution/isolate.cc.orig 2025-02-22 18:06:53 UTC +++ v8/src/execution/isolate.cc -@@ -168,6 +168,10 @@ +@@ -171,6 +171,10 @@ #include "src/execution/simulator-base.h" #endif @@ -11,7 +11,7 @@ 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_[]; -@@ -4995,6 +4999,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -5045,6 +5049,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); @@ -24,4 +24,4 @@ +#endif if (StickyEmbeddedBlobCode() != nullptr) { - base::MutexGuard guard(current_embedded_blob_refcount_mutex_.Pointer()); + base::SpinningMutexGuard guard( diff --git a/www/iridium/files/patch-v8_src_flags_flags.cc b/www/iridium/files/patch-v8_src_flags_flags.cc index b8813ac22e8c..c9c9267286a0 100644 --- a/www/iridium/files/patch-v8_src_flags_flags.cc +++ b/www/iridium/files/patch-v8_src_flags_flags.cc @@ -1,4 +1,4 @@ ---- v8/src/flags/flags.cc.orig 2024-11-04 08:56:03 UTC +--- v8/src/flags/flags.cc.orig 2025-02-22 18:06:53 UTC +++ v8/src/flags/flags.cc @@ -16,6 +16,10 @@ #include <set> @@ -8,10 +8,10 @@ +#include <sys/mman.h> +#endif + - #include "src/base/functional.h" + #include "src/base/hashing.h" #include "src/base/lazy-instance.h" #include "src/base/platform/platform.h" -@@ -807,6 +811,10 @@ void FlagList::FreezeFlags() { +@@ -816,6 +820,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_libsampler_sampler.cc b/www/iridium/files/patch-v8_src_libsampler_sampler.cc new file mode 100644 index 000000000000..90091a05c8de --- /dev/null +++ b/www/iridium/files/patch-v8_src_libsampler_sampler.cc @@ -0,0 +1,19 @@ +--- v8/src/libsampler/sampler.cc.orig 2025-02-22 18:06:53 UTC ++++ v8/src/libsampler/sampler.cc +@@ -519,6 +519,16 @@ void SignalHandler::FillRegisterState(void* context, R + state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]); + state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]); + state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]); ++#elif V8_HOST_ARCH_ARM64 ++#ifdef __CHERI_PURE_CAPABILITY__ ++ state->pc = reinterpret_cast<void*>(mcontext.mc_capregs.cap_elr); ++ state->sp = reinterpret_cast<void*>(mcontext.mc_capregs.cap_sp); ++ state->fp = reinterpret_cast<void*>(mcontext.mc_capregs.cap_x[29]); ++#else // !__CHERI_PURE_CAPABILITY__ ++ state->pc = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_elr); ++ state->sp = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_sp); ++ state->fp = reinterpret_cast<void*>(mcontext.mc_gpregs.gp_x[29]); ++#endif // __CHERI_PURE_CAPABILITY__ + #endif // V8_HOST_ARCH_* + #elif V8_OS_NETBSD + #if V8_HOST_ARCH_IA32 diff --git a/www/iridium/files/patch-v8_src_sandbox_sandbox.cc b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc index 474c0c5f2ef1..5c7858b2075f 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 2024-08-27 06:28:16 UTC +--- v8/src/sandbox/sandbox.cc.orig 2025-02-22 18:06:53 UTC +++ v8/src/sandbox/sandbox.cc -@@ -48,7 +48,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -60,7 +60,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h b/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h index 3be2d7659163..5fa9e2479744 100644 --- a/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h +++ b/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h @@ -1,11 +1,11 @@ ---- v8/src/trap-handler/trap-handler.h.orig 2023-07-24 14:27:53 UTC +--- v8/src/trap-handler/trap-handler.h.orig 2025-02-22 18:06:53 UTC +++ v8/src/trap-handler/trap-handler.h -@@ -20,7 +20,7 @@ namespace trap_handler { +@@ -18,7 +18,7 @@ namespace v8::internal::trap_handler { // X64 on Linux, Windows, MacOS, FreeBSD. #if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 && \ ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_DARWIN || \ - V8_OS_FREEBSD) + V8_OS_FREEBSD || V8_OS_OPENBSD) #define V8_TRAP_HANDLER_SUPPORTED true - // Arm64 (non-simulator) on Mac and Linux. + // Arm64 (non-simulator) on Linux, Windows, MacOS. #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && \ 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 d224092a7d0b..b801a1efd2cc 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-12-22 12:24:29 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2025-02-22 18:06:53 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -578,7 +578,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) { -@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -658,7 +658,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 */) { -@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -737,7 +737,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) { -@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -755,7 +755,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -825,7 +825,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); -@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -893,7 +893,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -54,7 +54,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -1008,7 +1008,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(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 -@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1104,7 +1104,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) { -@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1118,7 +1118,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) { -@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1131,7 +1131,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) { -@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1145,7 +1145,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) { -@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1159,7 +1159,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) { -@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1173,7 +1173,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 */) { -@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1188,7 +1188,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist index c7c3458c9524..00997bf65b92 100644 --- a/www/iridium/pkg-plist +++ b/www/iridium/pkg-plist @@ -3,8 +3,6 @@ bin/iridium %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/chrome_200_percent.pak %%DATADIR%%/headless_command_resources.pak -%%DATADIR%%/headless_lib_data.pak -%%DATADIR%%/headless_lib_strings.pak %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so %%DATADIR%%/libVkICD_mock_icd.so |